Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r090cfb22a7c0b4738299c3fb411ca77aaba8d968 -r4fb1e15d35f6b968bab5620909c30baec98bfd4e
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 090cfb22a7c0b4738299c3fb411ca77aaba8d968)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 4fb1e15d35f6b968bab5620909c30baec98bfd4e)
@@ -17,7 +17,6 @@
 
 #include "gio.h"
 
-#include "MessageSupport.h"
 //#include "ModeChemicalDisinfect.h"
 //#include "ModeChemicalDisinfectFlush.h"
 //#include "ModeDrain.h"
@@ -37,6 +36,7 @@
 //#include "ROPump.h"
 #include "Messaging.h"
 #include "TaskGeneral.h"
+#include "MessageSupport.h"
 
 /**
  *  @addtogroup DDOperationModes
@@ -248,7 +248,7 @@
 #endif
     {
         sendOperationStatusEvent();
-        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
+        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
     }
 
     // publish op mode on interval
@@ -365,7 +365,7 @@
 {
     U32 priorSubMode = currentSubMode;
 
-    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_OP_MODE_CHANGE, lastMode, newMode )
+    SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_OP_MODE_CHANGE, lastMode, newMode )
 
     // setup for new operating mode
     switch ( newMode )
@@ -420,7 +420,7 @@
     // Send sub-mode change event when appropriate
     if ( priorSubMode != currentSubMode )
     {
-        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
+        SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
     }
 }
 
@@ -502,7 +502,7 @@
     dat1.dataType = EVENT_DATA_TYPE_U32;
     dat1.data.uInt.data = opData;
 
-    sendEvent( DG_EVENT_OPERATION_STATUS, dat1, dat2 );
+    sendEvent( DD_EVENT_OPERATION_STATUS, dat1, dat2 );
 }
 
 /*********************************************************************//**