Index: DGModes.h
===================================================================
diff -u -r70e55d7492e44b138eb53253f0a4254dc4dce05e -r25fdafe7dd34b2c7b133b0d9fa0287388e64334e
--- DGModes.h	(.../DGModes.h)	(revision 70e55d7492e44b138eb53253f0a4254dc4dce05e)
+++ DGModes.h	(.../DGModes.h)	(revision 25fdafe7dd34b2c7b133b0d9fa0287388e64334e)
@@ -33,20 +33,20 @@
 /// Enumeration of operation modes.  These are in order of priority (highest to lowest).
 typedef enum DG_Op_Modes
 {
-    MODE_FAUL = 0,                                      ///< Fault mode.
-    MODE_SERV,                                          ///< Service mode.
-    MODE_INIT,                                          ///< Initialization & POST mode.
-    MODE_STAN,                                          ///< Standby mode - connected to HD.
-    MODE_SOLO,                                          ///< Standby Solo mode - no HD connected.
-    MODE_CIRC,                                          ///< Re-circulate mode.
-    MODE_FILL,                                          ///< Fill mode.
-    MODE_DRAI,                                          ///< Drain mode.
-    MODE_FLUS,                                          ///< Flush mode.
-    MODE_HEAT,                                          ///< Heat Disinfect mode.
-    MODE_CHEM,                                          ///< Chemical Disinfect mode.
-    MODE_NLEG,                                          ///< Not legal - an illegal mode transition occurred.
+    DG_MODE_FAUL = 0,                                   ///< Fault mode.
+    DG_MODE_SERV,                                       ///< Service mode.
+    DG_MODE_INIT,                                       ///< Initialization & POST mode.
+    DG_MODE_STAN,                                       ///< Standby mode - connected to HD.
+    DG_MODE_SOLO,                                       ///< Standby Solo mode - no HD connected.
+    DG_MODE_CIRC,                                       ///< Re-circulate mode.
+    DG_MODE_FILL,                                       ///< Fill mode.
+    DG_MODE_DRAI,                                       ///< Drain mode.
+    DG_MODE_FLUS,                                       ///< Flush mode.
+    DG_MODE_HEAT,                                       ///< Heat Disinfect mode.
+    DG_MODE_CHEM,                                       ///< Chemical Disinfect mode.
+    DG_MODE_NLEG,                                       ///< Not legal - an illegal mode transition occurred.
     NUM_OF_DG_MODES
-} DG_OP_MODE;
+} DG_OP_MODE_T;
 
 /// Enumeration of init & POST mode states.
 typedef enum DG_POST_States