Index: AlarmDefs.h
===================================================================
diff -u -r47aa510e1aa15d3d71c3c40c829628fd69a02fd3 -ra42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision 47aa510e1aa15d3d71c3c40c829628fd69a02fd3)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision a42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9)
@@ -670,7 +670,7 @@
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_COMPATIBILITY_ERROR,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DG_COMPATIBILITY_ERROR,                        0,              ALARM_ID_NO_ALARM },
     { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT,                        0,              ALARM_ID_NO_ALARM },
-    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DG_COMPATIBILITY_ERROR,                        0,              ALARM_ID_NO_ALARM },
+    { ALARM_PRIORITY_HIGH,     3,  TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT,                        0,              ALARM_ID_NO_ALARM },
 };  //   Priority            Rank  Fault DGFault Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  NoRcr  UsrAck TxLog  ID                                                        Escalate In     Escalate To
 
 /// Table of alarms and their rank.
Index: DGDefs.h
===================================================================
diff -u -r5797b65b3af9e0d039c596354bdc59e7caa7ec01 -ra42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9
--- DGDefs.h	(.../DGDefs.h)	(revision 5797b65b3af9e0d039c596354bdc59e7caa7ec01)
+++ DGDefs.h	(.../DGDefs.h)	(revision a42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9)
@@ -185,6 +185,24 @@
 };
 typedef enum DG_Drain_States DG_DRAIN_STATE_T;  ///< Type for DG drain mode states enumeration
 
+/**@}*/
+
+/**
+ *  @addtogroup HDDisinfectStates
+ *  @{
+ */
+
+/// Sub-mode states while in standby mode disinfect
+enum DG_Disinfect_States
+{
+    DG_DISINFECT_FLUSH_STATE = 0,                       ///< DG disinfect flush
+    DG_DISINFECT_HEAT_STATE,                            ///< DG disinfect heat
+    DG_DISINFECT_CHEM_STATE,                            ///< DG disinfect chemical
+    DG_DISINFECT_NOT_RUNNING_STATE,                     ///< DG disinfect not running
+    NUM_OF_DG_DISINFECT_STATES                          ///< Number of DG disinfect states
+};
+typedef enum DG_Disinfect_States DG_DISINFECT_STATE_T;  ///< Type for DG disinfect states that are broadcast to UI
+
 /**@}*/
 
 /**
Index: HDDefs.h
===================================================================
diff -u -rc6f10dab0825623948cbc8139bc8b9fe4a4024c8 -ra42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9
--- HDDefs.h	(.../HDDefs.h)	(revision c6f10dab0825623948cbc8139bc8b9fe4a4024c8)
+++ HDDefs.h	(.../HDDefs.h)	(revision a42b3f3ff1f46c0e63d2ebcf7e6a37cc9ba2e1e9)
@@ -101,25 +101,14 @@
 {
     STANDBY_START_STATE = 0,                            ///< Start standby
     STANDBY_WAIT_FOR_TREATMENT_STATE,                   ///< Wait for treatment
-    STANDBY_WAIT_FOR_DISINFECT_STATE,                   ///< Wait for UI to send disinfection option
+    STANDBY_WAIT_FOR_DISINFECT_STATE,                   ///< Wait for UI to send disinfect option
     STANDBY_DG_FLUSH_IN_PROGRESS_STATE,                 ///< DG flush operation is in progress
-    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,        ///< DG heat disinfection operation is in progress
-    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,        ///< DG chemical disinfection operation is in progress
+    STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,        ///< DG heat disinfect operation is in progress
+    STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,        ///< DG chemical disinfect operation is in progress
     NUM_OF_STANDBY_STATES                               ///< Number of standby states (sub-modes)
 };
 typedef enum HD_Standby_States HD_STANDBY_STATE_T;      ///< Type for HD standby states enumeration
 
-/// Sub-mode states while in standby mode disinfect
-enum DG_Disinfect_States
-{
-    DG_DISINFECT_FLUSH_STATE = 0,                       ///< DG disinfect flush
-    DG_DISINFECT_HEAT_STATE,                            ///< DG disinfect heat
-    DG_DISINFECT_CHEM_STATE,                            ///< DG disinfect chemical
-    DG_DISINFECT_NOT_RUNNING_STATE,                     ///< DG disinfect not running
-    NUM_OF_DG_DISINFECT_STATES                          ///< Number of DG disinfect states
-};
-typedef enum DG_Disinfect_States DG_DISINFECT_STATE_T;  ///< Type for DG disinfect states that are broadcast to UI
-
 /**@}*/
 
 /**