diff --git a/c_gen/templates/loci_show.h b/c_gen/templates/loci_show.h
index 0f91052..36a067b 100644
--- a/c_gen/templates/loci_show.h
+++ b/c_gen/templates/loci_show.h
@@ -337,10 +337,7 @@
 #define LOCI_SHOW_ipv4_value_mask(writer, cookie, val) LOCI_SHOW_ipv4(writer, cookie, val)
 #define LOCI_SHOW_u8_hybrid_enable(writer, cookie, val) LOCI_SHOW_u8(writer, cookie, val)
 #define LOCI_SHOW_u16_hybrid_version(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
-#define LOCI_SHOW_octets_expected_pdu_payload(writer, cookie, val) LOCI_SHOW_octets(writer, cookie, val)
-#define LOCI_SHOW_u32_pdu_timeout_ms(writer, cookie, val) LOCI_SHOW_u32(writer, cookie, val)
-#define LOCI_SHOW_octets_pdu_payload(writer, cookie, val) LOCI_SHOW_octets(writer, cookie, val)
-#define LOCI_SHOW_u32_pdu_tx_interval_ms(writer, cookie, val) LOCI_SHOW_u32(writer, cookie, val)
-#define LOCI_SHOW_u16_is_pdu_expected(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
+#define LOCI_SHOW_u32_timeout_ms(writer, cookie, val) LOCI_SHOW_u32(writer, cookie, val)
+#define LOCI_SHOW_u32_tx_interval_ms(writer, cookie, val) LOCI_SHOW_u32(writer, cookie, val)
 
 #endif /* _LOCI_SHOW_H_ */
diff --git a/openflow_input/bsn_pdu b/openflow_input/bsn_pdu
index 505f8fb..c2735de 100644
--- a/openflow_input/bsn_pdu
+++ b/openflow_input/bsn_pdu
@@ -30,19 +30,19 @@
 
 #version any
 
-struct of_bsn_set_port_pdu_tx_info_request : of_bsn_header {
+struct of_bsn_pdu_tx_request : of_bsn_header {
     uint8_t version;
     uint8_t type == 4;
     uint16_t length;
     uint32_t xid;
     uint32_t experimenter == 0x5c16c7;
     uint32_t subtype == 31;
-    uint32_t pdu_tx_interval_ms;
+    uint32_t tx_interval_ms;
     of_port_no_t port_no;
-    of_octets_t pdu_payload;
+    of_octets_t data;
 };
 
-struct of_bsn_set_port_pdu_tx_info_reply : of_bsn_header {
+struct of_bsn_pdu_tx_reply : of_bsn_header {
     uint8_t version;
     uint8_t type == 4;
     uint16_t length;
@@ -52,20 +52,19 @@
     uint32_t status; // 0 means success
 };
 
-struct of_bsn_set_port_pdu_expected_rx_info_request : of_bsn_header {
+struct of_bsn_pdu_rx_request : of_bsn_header {
     uint8_t version;
     uint8_t type == 4;
     uint16_t length;
     uint32_t xid;
     uint32_t experimenter == 0x5c16c7;
     uint32_t subtype == 33;
+    uint32_t timeout_ms;
     of_port_no_t port_no;
-    uint16_t is_pdu_expected; // following fields are valid only if this is 1
-    uint32_t pdu_timeout_ms;
-    of_octets_t pdu_payload;
+    of_octets_t data;
 };
 
-struct of_bsn_set_port_pdu_expected_rx_info_reply : of_bsn_header {
+struct of_bsn_pdu_rx_reply : of_bsn_header {
     uint8_t version;
     uint8_t type == 4;
     uint16_t length;
@@ -75,7 +74,7 @@
     uint32_t status; // 0 means success
 };
 
-struct of_bsn_pdu_timedout_notif : of_bsn_header {
+struct of_bsn_pdu_rx_timeout : of_bsn_header {
     uint8_t version;
     uint8_t type == 4;
     uint16_t length;
@@ -83,5 +82,4 @@
     uint32_t experimenter == 0x5c16c7;
     uint32_t subtype == 35;
     of_port_no_t port_no;
-    of_octets_t expected_pdu_payload;
 };