--- openflow-2014-10-22.h	2015-07-23 09:54:17.836479390 -0700
+++ openflow-2013-12-17-2.h	2015-07-23 09:54:17.840479390 -0700
@@ -2207,12 +2207,12 @@
     /* Aggregate flow statistics.
      * The request body is struct ofp_aggregate_stats_request.
      * The reply body is struct ofp_aggregate_stats_reply. */
-    OFPMP_AGGREGATE = 2,
+    OFPMP_AGGREGATE_STATS = 2,
 
     /* Flow table statistics.
      * The request body is empty.
      * The reply body is an array of struct ofp_table_stats. */
-    OFPMP_TABLE = 3,
+    OFPMP_TABLE_STATS = 3,
 
     /* Port statistics.
      * The request body is struct ofp_port_multipart_request.
@@ -2227,7 +2227,7 @@
     /* Group counter statistics.
      * The request body is struct ofp_group_multipart_request.
      * The reply is an array of struct ofp_group_stats. */
-    OFPMP_GROUP = 6,
+    OFPMP_GROUP_STATS = 6,
 
     /* Group description.
      * The request body is struct ofp_group_multipart_request.
@@ -2242,7 +2242,7 @@
     /* Meter statistics.
      * The request body is struct ofp_meter_multipart_request.
      * The reply body is an array of struct ofp_meter_stats. */
-    OFPMP_METER = 9,
+    OFPMP_METER_STATS = 9,
 
     /* Meter configuration.
      * The request body is struct ofp_meter_multipart_request.
@@ -2405,7 +2405,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_flow_stats) == 16);
 
-/* Body for ofp_multipart_request of type OFPMP_AGGREGATE. */
+/* Body for ofp_multipart_request of type OFPMP_AGGREGATE_STATS. */
 struct ofp_aggregate_stats_request {
     uint8_t table_id;         /* ID of table to read (from ofp_table_stats)
                                  OFPTT_ALL for all tables. */
@@ -2426,7 +2426,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_aggregate_stats_request) == 40);
 
-/* Body of reply to OFPMP_AGGREGATE request. */
+/* Body of reply to OFPMP_AGGREGATE_STATS request. */
 struct ofp_aggregate_stats_reply {
     struct ofp_stats stats;   /* Aggregated statistics list. Variable size. */
 };
@@ -2581,7 +2581,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_table_features) == 64);
 
-/* Body of reply to OFPMP_TABLE request. */
+/* Body of reply to OFPMP_TABLE_STATS request. */
 struct ofp_table_stats {
     uint8_t table_id;        /* Identifier of table.  Lower numbered tables
                                 are consulted first. */
@@ -2720,7 +2720,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_port_stats) == 80);
 
-/* Body of OFPMP_GROUP and OFPMP_GROUP_DESC requests. */
+/* Body of OFPMP_GROUP_STATS and OFPMP_GROUP_DESC requests. */
 struct ofp_group_multipart_request {
     uint32_t group_id;       /* All groups if OFPG_ALL. */
     uint8_t pad[4];          /* Align to 64 bits. */
@@ -2734,7 +2734,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_bucket_counter) == 16);
 
-/* Body of reply to OFPMP_GROUP request. */
+/* Body of reply to OFPMP_GROUP_STATS request. */
 struct ofp_group_stats {
     uint16_t length;         /* Length of this entry. */
     uint8_t pad[2];          /* Align to 64 bits. */
@@ -2781,7 +2781,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_group_features) == 40);
 
-/* Body of OFPMP_METER and OFPMP_METER_CONFIG requests. */
+/* Body of OFPMP_METER_STATS and OFPMP_METER_CONFIG requests. */
 struct ofp_meter_multipart_request {
     uint32_t meter_id;       /* Meter instance, or OFPM_ALL. */
     uint8_t pad[4];          /* Align to 64 bits. */
@@ -2795,7 +2795,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_meter_band_stats) == 16);
 
-/* Body of reply to OFPMP_METER request. Meter statistics. */
+/* Body of reply to OFPMP_METER_STATS request. Meter statistics. */
 struct ofp_meter_stats {
     uint32_t        meter_id;         /* Meter instance. */
     uint16_t        len;              /* Length in bytes of this stats. */