--- openflow-2010-10-15-2.h	2015-07-23 09:54:16.408479332 -0700
+++ openflow-2010-10-21.h	2015-07-23 09:54:16.412479332 -0700
@@ -819,8 +819,8 @@
 /* Group types.  Values in the range [128, 255] are reserved for experimental
  * use. */
 enum ofp_group_type {
-    OFPGT_FLOOD,    /* Flood group.  */
-    OFPGT_MPATH,    /* Multipath group. */
+    OFPGT_ALL,      /* All (multicast/broadcast) group.  */
+    OFPGT_SELECT,   /* Select group. */
     OFPGT_INDIRECT, /* Indirect group. */
     OFPGT_FF        /* Fast failover group. */
 };
@@ -831,7 +831,7 @@
                                        this header and any padding to make it
                                        64-bit aligned. */
     uint16_t weight;                /* Relative weight of bucket.  Only
-                                       defined for multipath groups. */
+                                       defined for select groups. */
     uint32_t watch_port;            /* Port whose state affects whether this
                                        bucket is live.  Only required for fast
                                        failover groups. */
@@ -964,7 +964,7 @@
     OFPGMFC_INVALID_GROUP,            /* Group not added because Group specified
                                        * is invalid. */
     OFPGMFC_WEIGHT_UNSUPPORTED,       /* Switch does not support unequal load
-                                       * sharing with multipath groups. */
+                                       * sharing with select groups. */
     OFPGMFC_OUT_OF_GROUPS,            /* The group table is full. */
     OFPGMFC_OUT_OF_BUCKETS,           /* The maximum number of action buckets
                                        * for a group has been exceeded. */