--- openflow-2014-03-18.h	2015-07-23 09:54:18.024479398 -0700
+++ openflow-2014-03-18-2.h	2015-07-23 09:54:18.028479398 -0700
@@ -740,7 +740,7 @@
     OFPXMT_OFB_PBB_UCA        = 41, /* PBB UCA header field. */
     OFPXMT_OFB_TCP_FLAGS      = 42, /* TCP flags. */
     OFPXMT_OFB_ACTSET_OUTPUT  = 43, /* Output port from action set metadata. */
-    OFPXMT_OFB_ROOT_TYPE      = 44, /* Root type value. */
+    OFPXMT_OFB_PACKET_TYPE    = 44, /* Packet type value. */
 };
 
 #define OFPXMT_OFB_ALL    ((UINT64_C(1) << 45) - 1)
@@ -876,7 +876,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd,
- *   or ROOT_TYPE must be either (1,0x800) or (1,0x86dd).
+ *   or PACKET_TYPE must be either (1,0x800) or (1,0x86dd).
  *
  * Format: 8-bit integer with 2 most-significant bits forced to 0.
  * Only the lower 6 bits have meaning.
@@ -889,7 +889,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd,
- *   or ROOT_TYPE must be either (1,0x800) or (1,0x86dd).
+ *   or PACKET_TYPE must be either (1,0x800) or (1,0x86dd).
  *
  * Format: 8-bit integer with 6 most-significant bits forced to 0.
  * Only the lower 2 bits have meaning.
@@ -901,7 +901,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd,
- *   or ROOT_TYPE must be either (1,0x800) or (1,0x86dd).
+ *   or PACKET_TYPE must be either (1,0x800) or (1,0x86dd).
  *
  * Format: 8-bit integer.
  *
@@ -912,7 +912,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x0800 exactly,
- *   or ROOT_TYPE must match (1,0x800) exactly.
+ *   or PACKET_TYPE must match (1,0x800) exactly.
  *
  * Format: 32-bit integer in network byte order.
  *
@@ -927,7 +927,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd,
- *   or ROOT_TYPE must be either (1,0x800) or (1,0x86dd),
+ *   or PACKET_TYPE must be either (1,0x800) or (1,0x86dd),
  *   OXM_OF_IP_PROTO must match 6 exactly.
  *
  * Format: 16-bit integer in network byte order.
@@ -952,7 +952,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match either 0x0800 or 0x86dd,
- *   or ROOT_TYPE must be either (1,0x800) or (1,0x86dd),
+ *   or PACKET_TYPE must be either (1,0x800) or (1,0x86dd),
  *   OXM_OF_IP_PROTO must match 17 exactly.
  *
  * Format: 16-bit integer in network byte order.
@@ -965,7 +965,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match either 0x0800 or 0x86dd,
- *   or ROOT_TYPE must be either (1,0x800) or (1,0x86dd),
+ *   or PACKET_TYPE must be either (1,0x800) or (1,0x86dd),
  *   OXM_OF_IP_PROTO must match 132 exactly.
  *
  * Format: 16-bit integer in network byte order.
@@ -978,7 +978,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x0800 exactly,
- *   or ROOT_TYPE must match (1,0x800) exactly.
+ *   or PACKET_TYPE must match (1,0x800) exactly.
  *   OXM_OF_IP_PROTO must match 1 exactly.
  *
  * Format: 8-bit integer.
@@ -1028,7 +1028,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x86dd exactly,
- *   or ROOT_TYPE must match (1,0x86dd) exactly.
+ *   or PACKET_TYPE must match (1,0x86dd) exactly.
  *
  * Format: 128-bit IPv6 address.
  *
@@ -1043,7 +1043,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x86dd exactly,
- *   or ROOT_TYPE must match (1,0x86dd) exactly.
+ *   or PACKET_TYPE must match (1,0x86dd) exactly.
  *
  * Format: 32-bit integer with 12 most-significant bits forced to 0.
  * Only the lower 20 bits have meaning.
@@ -1057,7 +1057,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x86dd exactly,
- *   or ROOT_TYPE must match (1,0x86dd) exactly,
+ *   or PACKET_TYPE must match (1,0x86dd) exactly,
  *   OXM_OF_IP_PROTO must match 58 exactly.
  *
  * Format: 8-bit integer.
@@ -1070,7 +1070,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x86dd exactly,
- *   or ROOT_TYPE must match (1,0x86dd) exactly,
+ *   or PACKET_TYPE must match (1,0x86dd) exactly,
  *   OXM_OF_IP_PROTO must match 58 exactly.
  *   OXM_OF_ICMPV6_TYPE must be either 135 or 136.
  *
@@ -1084,7 +1084,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x86dd exactly,
- *   or ROOT_TYPE must match (1,0x86dd) exactly,
+ *   or PACKET_TYPE must match (1,0x86dd) exactly,
  *   OXM_OF_IP_PROTO must match 58 exactly.
  *   OXM_OF_ICMPV6_TYPE must be exactly 135.
  *
@@ -1098,7 +1098,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x86dd exactly,
- *   or ROOT_TYPE must match (1,0x86dd) exactly,
+ *   or PACKET_TYPE must match (1,0x86dd) exactly,
  *   OXM_OF_IP_PROTO must match 58 exactly.
  *   OXM_OF_ICMPV6_TYPE must be exactly 136.
  *
@@ -1177,7 +1177,7 @@
  *
  * Prereqs:
  *   either OXM_OF_ETH_TYPE must match 0x86dd exactly,
- *   or ROOT_TYPE must match (1,0x86dd) exactly.
+ *   or PACKET_TYPE must match (1,0x86dd) exactly.
  *
  * Format: 16-bit integer with 7 most-significant bits forced to 0.
  * Only the lower 9 bits have meaning.
@@ -1228,9 +1228,9 @@
  * Masking: Not maskable. */
 #define OXM_OF_ACTSET_OUTPUT OXM_HEADER  (0x8000, OFPXMT_OFB_ACTSET_OUTPUT, 4)
 
-/* Root type.
+/* Packet type.
  *
- * Root type to identify packets. This is the canonical header type of
+ * Packet type to identify packets. This is the canonical header type of
  * the outermost header.
  * If not specified, default to Ethernet header type.
  *
@@ -1239,7 +1239,7 @@
  * Format: 16-bit integer for namespace followed by 16 bit interget for ns_type.
  *
  * Masking: Not maskable. */
-#define OXM_OF_ROOT_TYPE  OXM_HEADER  (0x8000, OFPXMT_OFB_ROOT_TYPE, 4)
+#define OXM_OF_PACKET_TYPE  OXM_HEADER  (0x8000, OFPXMT_OFB_PACKET_TYPE, 4)
 
 /* Header for OXM experimenter match fields.
  * The experimenter class should not use OXM_HEADER() macros for defining
@@ -2633,7 +2633,7 @@
     OFPTFPT_WRITE_COPYFIELD_MISS   = 19, /* Write Copy-Field for table-miss. */
     OFPTFPT_APPLY_COPYFIELD        = 20, /* Apply Copy-Field property. */
     OFPTFPT_APPLY_COPYFIELD_MISS   = 21, /* Apply Copy-Field for table-miss. */
-    OFPTFPT_ROOT_TYPES             = 22, /* Root types property. */
+    OFPTFPT_PACKET_TYPES           = 22, /* Packet types property. */
     OFPTFPT_EXPERIMENTER           = 0xFFFE, /* Experimenter property. */
     OFPTFPT_EXPERIMENTER_MISS      = 0xFFFF, /* Experimenter for table-miss. */
 };
@@ -2724,9 +2724,9 @@
 };
 OFP_ASSERT(sizeof(struct ofp_table_feature_prop_oxm) == 4);
 
-/* Root types property */
+/* Packet types property */
 struct ofp_table_feature_prop_oxm_values {
-    uint16_t         type;    /* OFPTFPT_ROOT_TYPES. */
+    uint16_t         type;    /* OFPTFPT_PACKET_TYPES. */
     uint16_t         length;  /* Length in bytes of this property. */
     /* Followed by:
      *   - Exactly (length - 4) bytes containing the oxm_ids, then