--- openflow-2009-07-01-2.h	2015-07-23 09:54:15.708479303 -0700
+++ openflow-2009-07-02.h	2015-07-23 09:54:15.712479303 -0700
@@ -534,7 +534,8 @@
 #define OFP_DEFAULT_PRIORITY 0x8000
 
 enum ofp_flow_mod_flags {
-    OFPFF_SEND_FLOW_REM = 1 << 0,  /* Send expiration message when flow expires. */
+    OFPFF_SEND_FLOW_REM = 1 << 0,  /* Send flow removed message when flow
+                                    * expires or is deleted. */
     OFPFF_CHECK_OVERLAP = 1 << 1,  /* Check for overlapping entries first. */
     OFPFF_EMERG         = 1 << 2   /* Ramark this is for emergency. */
 };
@@ -563,14 +564,14 @@
 };
 OFP_ASSERT(sizeof(struct ofp_flow_mod) == 64);
 
-/* Why did this flow expire? */
+/* Why was this flow removed? */
 enum ofp_flow_removed_reason {
     OFPRR_IDLE_TIMEOUT,         /* Flow idle time exceeded idle_timeout. */
     OFPRR_HARD_TIMEOUT,         /* Time exceeded hard_timeout. */
     OFPRR_DELETE                /* Evicted by a DELETE flow mod. */
 };
 
-/* Flow expiration (datapath -> controller). */
+/* Flow removed (datapath -> controller). */
 struct ofp_flow_removed {
     struct ofp_header header;
     struct ofp_match match;   /* Description of fields. */