--- openflow-2014-03-11-2.h	2015-07-23 09:54:17.696479384 -0700
+++ openflow-2014-03-11-3.h	2015-07-23 09:54:17.700479385 -0700
@@ -1210,17 +1210,17 @@
 
 /* OXS flow stat field types for OpenFlow basic class. */
 enum oxs_ofb_stat_fields {
-    OFPXST_OFB_DURATION        = 0,  /* Time flow has been alive. */
-    OFPXST_OFB_IDLE_TIME       = 1,  /* Time flow has been idle. */
-    OFPXST_OFB_FLOW_COUNT      = 3,  /* Number of aggregated flows. */
-    OFPXST_OFB_PACKET_COUNT    = 4,  /* Number of packets in flow. */
-    OFPXST_OFB_BYTE_COUNT      = 5,  /* Number of bytes in flow. */
+    OFPXST_OFB_DURATION        = 0,  /* Time flow entry has been alive. */
+    OFPXST_OFB_IDLE_TIME       = 1,  /* Time flow entry has been idle. */
+    OFPXST_OFB_FLOW_COUNT      = 3,  /* Number of aggregated flow entries. */
+    OFPXST_OFB_PACKET_COUNT    = 4,  /* Number of packets in flow entry. */
+    OFPXST_OFB_BYTE_COUNT      = 5,  /* Number of bytes in flow entry. */
 };
 
 #define OFPXST_OFB_ALL    ((UINT64_C(1) << 3) - 1)
 
 /* OpenFlow flow duration.
- * Time flow has been alive in seconds and nanoseconds.
+ * Time flow entry has been alive in seconds and nanoseconds.
  *
  * Format: A pair of 32-bit integer in network byte order.
  *    First 32-bit number is duration in seconds.
@@ -1230,7 +1230,8 @@
 #define OXS_OF_DURATION      OXS_HEADER  (0x8002, OFPXST_OFB_DURATION, 8)
 
 /* OpenFlow flow idle time.
- * Time flow has been idle (no packets matched) in seconds and nanoseconds.
+ * Time flow entry has been idle (no packets matched) in seconds
+ * and nanoseconds.
  *
  * Format: A pair of 32-bit integer in network byte order.
  *    First 32-bit number is idle time in seconds.
@@ -1239,23 +1240,23 @@
  */
 #define OXS_OF_IDLE_TIME      OXS_HEADER  (0x8002, OFPXST_OFB_IDLE_TIME, 8)
 
-/* OpenFlow flow count.
- * Number of aggregated flows.
- * Required in \verb|OFPMP_AGGREGATE| replies, undefined in other context.
+/* OpenFlow flow entry count.
+ * Number of aggregated flow entries.
+ * Required in OFPMP_AGGREGATE replies, undefined in other context.
  *
  * Format: 32-bit integer in network byte order.
  */
 #define OXS_OF_FLOW_COUNT    OXS_HEADER  (0x8002, OFPXST_OFB_FLOW_COUNT, 4)
 
-/* OpenFlow flow packet count.
- * Number of packets in flow.
+/* OpenFlow flow entry packet count.
+ * Number of packets matched by a flow entry.
  *
  * Format: 64-bit integer in network byte order.
  */
 #define OXS_OF_PACKET_COUNT  OXS_HEADER  (0x8002, OFPXST_OFB_PACKET_COUNT, 8)
 
-/* OpenFlow flow packet count.
- * Number of bytes in flow.
+/* OpenFlow flow entry packet count.
+ * Number of bytes matched by a flow entry.
  *
  * Format: 64-bit integer in network byte order.
  */