Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r031091f5f48c6a096ee954c5ef2633295bc0f3b6 -rab9597daa82d8e4575a8bb1fd8438ac301b85d44
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 031091f5f48c6a096ee954c5ef2633295bc0f3b6)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ab9597daa82d8e4575a8bb1fd8438ac301b85d44)
@@ -1265,14 +1265,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleStartStopDGHeatDisinfect function handles a request start or
- * stop DG heat disifect mode.
+ * The handleStartStopDGActiveCoolHeatDisinfect function handles a request start or
+ * stop DG active cool heat disifect mode.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message: a pointer to the message to handle
  * @return result
  *************************************************************************/
-BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message )
+BOOL handleStartStopDGActiveCoolHeatDisinfect( MESSAGE_T *message )
 {
     BOOL status = FALSE;
 
@@ -1284,7 +1284,7 @@
 
         if ( TRUE == startingDGHeatDisinfect )
         {
-            setNocturnalHeatDisinfectStatus( FALSE );
+            setActiveOrPassiveHeatDisinfectStatus( FALSE );
             status = startDGHeatDisinfect();
         }
         else
@@ -1971,14 +1971,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleStartStopDGNocturnalHeatDisifnect function handles a request to
- * start or stop DG nocturnal heat disinfect.
+ * The handleStartStopDGPassiveHeatDisifnect function handles a request to
+ * start or stop DG passive cool heat disinfect.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message: a pointer to the message to handle
  * @return result
  *************************************************************************/
-void handleStartStopDGNocturnalHeatDisifnect( MESSAGE_T* message )
+void handleStartStopDGPassiveCoolHeatDisifnect( MESSAGE_T* message )
 {
     BOOL status = FALSE;
 
@@ -1990,7 +1990,7 @@
 
         if ( TRUE == startingDGNocturnalHeatDisinfect )
         {
-            setNocturnalHeatDisinfectStatus( TRUE );
+            setActiveOrPassiveHeatDisinfectStatus( TRUE );
             status = startDGHeatDisinfect();
         }
         else