--- openflow-2012-03-21.h	2015-07-23 09:54:17.132479361 -0700
+++ openflow-2012-03-22-3.h	2015-07-23 09:54:17.136479362 -0700
@@ -2065,7 +2065,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_group_features) == 40);
 
-/* Body of OFPST_METER request. */
+/* Body of OFPMP_METER request. */
 struct ofp_meter_stats_request {
     uint32_t meter_id;       /* Meter instance, or OFPM_ALL. */
     uint8_t pad[4];          /* Align to 64 bits. */
@@ -2079,7 +2079,7 @@
 };
 OFP_ASSERT(sizeof(struct ofp_meter_band_stats) == 16);
 
-/* Body of reply to OFPST_METER request. Meter statistics. */
+/* Body of reply to OFPMP_METER request. Meter statistics. */
 struct ofp_meter_stats {
     uint32_t        meter_id;         /* Meter instance. */
     uint16_t        len;              /* Length in bytes of this stats. */
@@ -2095,18 +2095,18 @@
 };
 OFP_ASSERT(sizeof(struct ofp_meter_stats) == 40);
 
-/* Body of reply to OFPST_METER_CONFIG request. Meter configuration. */
-struct ofp_meter_config_stats {
+/* Body of reply to OFPMP_METER_CONFIG request. Meter configuration. */
+struct ofp_meter_config {
     uint16_t        length;           /* Length of this entry. */
     uint16_t        flags;            /* All OFPMC_* that apply. */
     uint32_t        meter_id;         /* Meter instance. */
     struct ofp_meter_band_header bands[0]; /* The bands length is
                                          inferred from the length field. */
 };
-OFP_ASSERT(sizeof(struct ofp_meter_config_stats) == 8);
+OFP_ASSERT(sizeof(struct ofp_meter_config) == 8);
 
-/* Body of reply to OFPST_METER_FEATURES request. Meter features. */
-struct ofp_meter_features_stats {
+/* Body of reply to OFPMP_METER_FEATURES request. Meter features. */
+struct ofp_meter_features {
     uint32_t    max_meter;    /* Maximum number of meters. */
     uint32_t    band_types;   /* Bitmaps of OFPMBT_* values supported. */
     uint32_t    capabilities; /* Bitmaps of "ofp_meter_flags". */
@@ -2114,7 +2114,7 @@
     uint8_t     max_color;    /* Maximum color value */
     uint8_t     pad[2];
 };
-OFP_ASSERT(sizeof(struct ofp_meter_features_stats) == 16);
+OFP_ASSERT(sizeof(struct ofp_meter_features) == 16);
 
 /* Body for ofp_multipart_request/reply of type OFPMP_EXPERIMENTER. */
 struct ofp_experimenter_multipart_header {