diff --git a/tools/munger/scripts/message_gen.py b/tools/munger/scripts/message_gen.py
index 9fc3851..113cda0 100644
--- a/tools/munger/scripts/message_gen.py
+++ b/tools/munger/scripts/message_gen.py
@@ -541,7 +541,7 @@
         ofp_stats_request.__init__(self)
         ofp_--TYPE--_stats_request.__init__(self)
         self.header.type = OFPT_STATS_REQUEST
-        self.type = --STATS_NAME--
+        self.stats_type = --STATS_NAME--
         for (k, v) in kwargs.items():
             if hasattr(self, k):
                 setattr(self, k, v)
diff --git a/tools/pylibopenflow/include/openflow.h b/tools/pylibopenflow/include/openflow.h
index bfbc2f7..e5d8424 100644
--- a/tools/pylibopenflow/include/openflow.h
+++ b/tools/pylibopenflow/include/openflow.h
@@ -735,7 +735,7 @@
 
 struct ofp_stats_request {
     struct ofp_header header;
-    uint16_t type;              /* One of the OFPST_* constants. */
+    uint16_t stats_type;              /* One of the OFPST_* constants. */
     uint16_t flags;             /* OFPSF_REQ_* flags (none yet defined). */
     uint8_t body[0];            /* Body of the request. */
 };
@@ -747,7 +747,7 @@
 
 struct ofp_stats_reply {
     struct ofp_header header;
-    uint16_t type;              /* One of the OFPST_* constants. */
+    uint16_t stats_type;              /* One of the OFPST_* constants. */
     uint16_t flags;             /* OFPSF_REPLY_* flags. */
     uint8_t body[0];            /* Body of the reply. */
 };