Index: AlarmDefs.h
===================================================================
diff -u -raa6c87589ba194305fc105811d8f6ba571c83339 -r6058ce086760b8cb84cb023869068008ed61b9e3
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision aa6c87589ba194305fc105811d8f6ba571c83339)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 6058ce086760b8cb84cb023869068008ed61b9e3)
@@ -53,6 +53,13 @@
     ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION,                 ///< HD dialysate flow invalid calibration
     ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE,                      ///< HD alarm audio failed POST
     ALARM_ID_HD_UI_POST_FAILED,                                     ///< HD UI POST failed
+    ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD,                ///< DG load cells invalid calibration record
+    ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD,                    ///< DG flow sensors invalid calibration record
+    ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD,                    ///< DG conductivity sensors invalid calibration record
+    ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD,               ///< DG drain line volume invalid calibration record
+    ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD,                      ///< DG reservoirs invalid calibration record
+    ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD,                ///< DG acid concentrate calibration record
+    ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD,              ///< DG bicarb concentrate calibration record
     ALARM_ID_HD_SOFTWARE_FAULT,                                     ///< HD Software fault. Software found itself in an unexpected state
     ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK,                           ///< Blood pump failed motor controller current check.  Too high when pump should be off or out of range when pump should be running
     ALARM_ID_BLOOD_PUMP_OFF_CHECK,                                  ///< Blood pump failed motor off check.  Measured speed while commanded off
@@ -266,13 +273,6 @@
     ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT,                 ///< DG chemical disinfect could not reach to target temperature
     ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT,       ///< DG chemical disinfect inlet pressure and temperature sensors out of range
     ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT,             ///< DG chemical disinfect inlet conductivity and temperature out of range
-    ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD,                ///< DG load cells invalid calibration record
-    ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD,                    ///< DG flow sensors invalid calibration record
-    ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD,                    ///< DG conductivity sensors invalid calibration record
-    ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD,               ///< DG drain line volume invalid calibration record
-    ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD,                      ///< DG reservoirs invalid calibration record
-    ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD,                ///< DG acid concentrate calibration record
-    ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD,              ///< DG bicarb concentrate calibration record
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
Index: MsgDefs.h
===================================================================
diff -u -re508294f3a5857c9e9ab4d7c4b0dce27c23c3b36 -r6058ce086760b8cb84cb023869068008ed61b9e3
--- MsgDefs.h	(.../MsgDefs.h)	(revision e508294f3a5857c9e9ab4d7c4b0dce27c23c3b36)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 6058ce086760b8cb84cb023869068008ed61b9e3)
@@ -155,7 +155,7 @@
     MSG_ID_HD_VOLTAGES_DATA = 0x7B,                                     ///< HD voltages data publish
     MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0x7C,                   ///< HD response to UI set alarm audio volume request
     MSG_ID_HD_ALARM_INFORMATION = 0x7D,                                 ///< HD alarm information broadcast message
-    MSG_ID_HD_STANDBY_STATE = 0x7E,                                     ///< HD broadcast of standby state
+    MSG_ID_HD_DISINFECT_STANDBY_DATA = 0x7E,                            ///< HD broadcast of standby disinfect data
     MSG_ID_UI_DISINFECT_REQUEST = 0x7F,                                 ///< UI disinfection selection
     MSG_ID_HD_DISINFECT_RESPONSE = 0x80,                                ///< HD response to disinfection selection
     MSG_ID_UI_CHEM_DISINFECT_CONFIRM = 0x81,                            ///< UI confirmation of chemical disinfection start