Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r688bd3abbe26cdde15368c8769511d8cf152a721 -r70654c8e042da0dd7ee7dc37c21bd8f4d54544e7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 688bd3abbe26cdde15368c8769511d8cf152a721)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 70654c8e042da0dd7ee7dc37c21bd8f4d54544e7)
@@ -875,9 +875,9 @@
         {
             result = signalUserInitiateFlushMode();
         }
-        else if ( DG_DISINFECT_HEAT_STATE == cmd )    // Command 1 = Heat disinfect
+        else if ( DG_DISINFECT_HEAT_STATE_ACTIVE_COOL == cmd )    // Command 1 = Heat disinfect
         {
-            result = signalUserInitiateHeatDisinfectMode();
+            result = signalUserInitiateHeatDisinfectActiveCoolMode();
         }
         else if ( DG_DISINFECT_CHEM_STATE == cmd )   // Command 2 = chemical disinfect
         {
@@ -891,13 +891,13 @@
         {
             result = signalUserInitiateROPermeateSampleMode();
         }
-        else if ( DG_DISINFECT_NOCTURNAL_HEAT_STATE == cmd ) // Command 5 nocturnal heat disinfect
+        else if ( DG_DISINFECT_HEAT_STATE_PASSIVE_COOL == cmd ) // Command 5 nocturnal heat disinfect
         {
-            result = signalUserInitiateNocturnalHeatDisinfectMode();
+            result = signalUserInitiateHeatDisinfectPassiveCoolMode();
         }
         else if ( DG_DISINFECT_ACTIVE_COOL == cmd )  // Command 6 heat disinfect active cool
         {
-            result = signalUserInitiateHeatDisinfectActiveCoolMode();
+            result = signalUserInitiateActiveCoolMode();
         }
     }
 
@@ -1814,16 +1814,16 @@
 
 /*********************************************************************//**
  * @brief
- * The sendDGStartHeatDisinfectModeCommand function constructs a DG start/stop
- * heat disinfect mode command message and queues the msg for transmit on
- * the appropriate CAN channel.
+ * The sendDGStartHeatDisinfectActiveCoolModeCommand function constructs a
+ * DG start/stop heat disinfect with active coolmode command message and
+ * queues the msg for transmit on the appropriate CAN channel.
  * @details Inputs: none
  * @details Outputs: DG start heat disinfect mode command msg constructed
  * and queued.
  * @param start TRUE indicates start heat disinfect mode
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL sendDGStartHeatDisinfectModeCommand( BOOL start )
+BOOL sendDGStartHeatDisinfectActiveCoolModeCommand( BOOL start )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -3725,14 +3725,14 @@
 
 /*********************************************************************//**
  * @brief
- * The sendDGStartNocturnalHeatDisinfectModeCommand function handles the send
+ * The sendDGStartHeatDisinfectPassiveCoolModeCommand function handles the send
  * request to start or stop nocturnal heat disinfect.
  * @details Inputs: none
  * @details Outputs: none
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-BOOL sendDGStartNocturnalHeatDisinfectModeCommand( BOOL start )
+BOOL sendDGStartHeatDisinfectPassiveCoolModeCommand( BOOL start )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -3742,7 +3742,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_START_STOP_NOCTURNAL_HEAT_DISINFECT;
+    msg.hdr.msgID = MSG_ID_DG_START_STOP_PASSIVE_COOL_HEAT_DISINFECT;
     msg.hdr.payloadLen = sizeof( DG_HEAT_DISINFECTION_MODE_CMD_T );
 
     memcpy( &msg.payload, &cmd, sizeof( DG_HEAT_DISINFECTION_MODE_CMD_T ) );