diff --git a/openflow_input/bsn_get_interfaces b/openflow_input/bsn_get_interfaces
index ba1508c..01902bc 100644
--- a/openflow_input/bsn_get_interfaces
+++ b/openflow_input/bsn_get_interfaces
@@ -40,8 +40,8 @@
     of_mac_addr_t hw_addr;
     pad(2);
     of_port_name_t name;
-    uint32_t ipv4_addr;
-    uint32_t ipv4_netmask;
+    of_ipv4_t ipv4_addr;
+    of_ipv4_t ipv4_netmask;
 };
 
 struct of_bsn_get_interfaces_reply {
diff --git a/openflow_input/oxm-1.2 b/openflow_input/oxm-1.2
index b18c6fb..01af6c6 100644
--- a/openflow_input/oxm-1.2
+++ b/openflow_input/oxm-1.2
@@ -227,24 +227,24 @@
 
 struct of_oxm_ipv4_dst {
     uint32_t type_len == 0x80001804;
-    uint32_t value;
+    of_ipv4_t value;
 };
 
 struct of_oxm_ipv4_dst_masked {
     uint32_t type_len == 0x80001908;
-    uint32_t value;
-    uint32_t value_mask;
+    of_ipv4_t value;
+    of_ipv4_t value_mask;
 };
 
 struct of_oxm_ipv4_src {
     uint32_t type_len == 0x80001604;
-    uint32_t value;
+    of_ipv4_t value;
 };
 
 struct of_oxm_ipv4_src_masked {
     uint32_t type_len == 0x80001708;
-    uint32_t value;
-    uint32_t value_mask;
+    of_ipv4_t value;
+    of_ipv4_t value_mask;
 };
 
 struct of_oxm_ipv6_dst {
diff --git a/openflow_input/standard-1.0 b/openflow_input/standard-1.0
index 5d4405c..e9cb6f0 100644
--- a/openflow_input/standard-1.0
+++ b/openflow_input/standard-1.0
@@ -563,8 +563,8 @@
     uint8_t ip_dscp;
     uint8_t ip_proto;
     pad(2);
-    uint32_t ipv4_src;
-    uint32_t ipv4_dst;
+    of_ipv4_t ipv4_src;
+    of_ipv4_t ipv4_dst;
     uint16_t tcp_src;
     uint16_t tcp_dst;
 };
diff --git a/openflow_input/standard-1.1 b/openflow_input/standard-1.1
index a477d55..553e665 100644
--- a/openflow_input/standard-1.1
+++ b/openflow_input/standard-1.1
@@ -779,10 +779,10 @@
     uint16_t eth_type;
     uint8_t ip_dscp;
     uint8_t ip_proto;
-    uint32_t ipv4_src;
-    uint32_t ipv4_src_mask;
-    uint32_t ipv4_dst;
-    uint32_t ipv4_dst_mask;
+    of_ipv4_t ipv4_src;
+    of_ipv4_t ipv4_src_mask;
+    of_ipv4_t ipv4_dst;
+    of_ipv4_t ipv4_dst_mask;
     uint16_t tcp_src;
     uint16_t tcp_dst;
     uint32_t mpls_label;