Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r88b3f1f9ca21db9f584070b38acba76b959a68fb -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -1726,7 +1726,7 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
     {
         if ( chemDisinfectState != DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH )
         {
Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -r88b3f1f9ca21db9f584070b38acba76b959a68fb -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -1094,7 +1094,7 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
     {
         if ( chemDisinfectFlushState != DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH )
         {
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r88b3f1f9ca21db9f584070b38acba76b959a68fb -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -1130,7 +1130,7 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
     {
         if ( flushState != DG_FLUSH_STATE_CANCEL_WATER_PATH )
         {
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r88b3f1f9ca21db9f584070b38acba76b959a68fb -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -1976,7 +1976,7 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
     {
         if ( heatDisinfectState != DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH )
         {
Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r88b3f1f9ca21db9f584070b38acba76b959a68fb -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -782,7 +782,7 @@
         }
     }
 
-    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyInletWaterConditionActive() ) )
+    if ( ( TRUE == isDGFaultAlarmActive() ) || ( TRUE == isAnyCleaningModeInletWaterConditionActive() ) )
     {
         if ( heatDisinfectActiveCoolState != DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE )
         {
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r88b3f1f9ca21db9f584070b38acba76b959a68fb -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -351,13 +351,13 @@
 
 /*********************************************************************//**
  * @brief
-* The isAnyInletWaterConditionActive function returns the status of any of
-* the inlet water conditions is active or not
+* The isAnyCleaningModeInletWaterConditionActive function returns the status
+* of any of the inlet water conditions is active or not in a cleaning mode
 * @details Inputs: none
 * @details Outputs: none
 * @return TRUE if any of the inlet water conditions is active otherwise, FALSE
 *************************************************************************/
-BOOL isAnyInletWaterConditionActive( void )
+BOOL isAnyCleaningModeInletWaterConditionActive( void )
 {
     BOOL status = FALSE;
 
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r88b3f1f9ca21db9f584070b38acba76b959a68fb -r4ee60d5c6265f29ff84368ee870404b55718a57a
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 88b3f1f9ca21db9f584070b38acba76b959a68fb)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 4ee60d5c6265f29ff84368ee870404b55718a57a)
@@ -103,7 +103,7 @@
 BOOL isAlarmConditionActive( ALARM_ID_T alarm );
 void handleResendActiveAlarmsRequest( void );
 
-BOOL isAnyInletWaterConditionActive( void );
+BOOL isAnyCleaningModeInletWaterConditionActive( void );
 
 BOOL testSetAlarmStateOverride( U32 alarmID, BOOL value );
 BOOL testResetAlarmStateOverride( U32 alarmID );