--- openflow-2013-03-26.h	2015-07-23 09:54:17.232479365 -0700
+++ openflow-2013-03-26-2.h	2015-07-23 09:54:17.236479366 -0700
@@ -2282,17 +2282,17 @@
 
 /* Configures the "role" of the sending controller.  The default role is:
  *
- *    - Equal (NX_ROLE_EQUAL), which allows the controller access to all
+ *    - Equal (OFPCR_ROLE_EQUAL), which allows the controller access to all
  *      OpenFlow features. All controllers have equal responsibility.
  *
  * The other possible roles are a related pair:
  *
- *    - Master (NX_ROLE_MASTER) is equivalent to Equal, except that there may
- *      be at most one Master controller at a time: when a controller
+ *    - Master (OFPCR_ROLE_MASTER) is equivalent to Equal, except that there
+ *      may be at most one Master controller at a time: when a controller
  *      configures itself as Master, any existing Master is demoted to the
  *      Slave role.
  *
- *    - Slave (NX_ROLE_SLAVE) allows the controller read-only access to
+ *    - Slave (OFPCR_ROLE_SLAVE) allows the controller read-only access to
  *      OpenFlow features.  In particular attempts to modify the flow table
  *      will be rejected with an OFPBRC_EPERM error.
  *
@@ -2311,7 +2311,7 @@
 /* Role request and reply message. */
 struct ofp_role_request {
     struct ofp_header header;   /* Type OFPT_ROLE_REQUEST/OFPT_ROLE_REPLY. */
-    uint32_t role;              /* One of NX_ROLE_*. */
+    uint32_t role;              /* One of OFPCR_ROLE_*. */
     uint8_t pad[4];             /* Align to 64 bits. */
     uint64_t generation_id;     /* Master Election Generation Id */
 };