Index: firmware/App/Modes/ModeWaterGen.c
===================================================================
diff -u -rcd1aa72cf45af72e12e47f61df2b218e5683cd64 -r97bcc8f47271e4d3ef06729f3b017f8fc372092e
--- firmware/App/Modes/ModeWaterGen.c	(.../ModeWaterGen.c)	(revision cd1aa72cf45af72e12e47f61df2b218e5683cd64)
+++ firmware/App/Modes/ModeWaterGen.c	(.../ModeWaterGen.c)	(revision 97bcc8f47271e4d3ef06729f3b017f8fc372092e)
@@ -51,7 +51,7 @@
 static void publishGenWModeData( void );
 static RO_GENW_MODE_STATE_T handleGenWStartState( void );
 static RO_GENW_MODE_STATE_T handleGenWTankFullState( void );
-static RO_GENW_MODE_STATE_T handleGenWTankLowState( void );
+static RO_GENW_MODE_STATE_T handleGenWTankFillState( void );
 static void setModeGenWTransition( RO_GENW_MODE_STATE_T state );
 
 /*********************************************************************//**
@@ -113,8 +113,8 @@
             genWaterState = handleGenWStartState();
             break;
 
-        case RO_GENW_TANK_LOW_STATE:
-            genWaterState = handleGenWTankLowState();
+        case RO_GENW_TANK_FILL_STATE:
+            genWaterState = handleGenWTankFillState();
             break;
 
         case RO_GENW_TANK_FULL_STATE:
@@ -150,7 +150,7 @@
             // Do nothing
             break;
 
-        case RO_GENW_TANK_LOW_STATE:
+        case RO_GENW_TANK_FILL_STATE:
             setValveState( M4_VALV,VALVE_STATE_OPEN );
             setValveState( M7_VALV,VALVE_STATE_CLOSED );
             setValveState( P6_VALV,VALVE_STATE_CLOSED );
@@ -193,8 +193,8 @@
 
     else if ( ( LEVEL_STATE_MEDIUM == level ) || ( LEVEL_STATE_LOW == level ) )
     {
-        setModeGenWTransition( RO_GENW_TANK_LOW_STATE );
-        state = RO_GENW_TANK_LOW_STATE;
+        setModeGenWTransition( RO_GENW_TANK_FILL_STATE );
+        state = RO_GENW_TANK_FILL_STATE;
     }
 
     return state;
@@ -207,9 +207,9 @@
  * @details \b Outputs: none
  * @return the next state of gen water mode
  *************************************************************************/
-static RO_GENW_MODE_STATE_T handleGenWTankLowState( void )
+static RO_GENW_MODE_STATE_T handleGenWTankFillState( void )
 {
-    RO_GENW_MODE_STATE_T state = RO_GENW_TANK_LOW_STATE;
+    RO_GENW_MODE_STATE_T state = RO_GENW_TANK_FILL_STATE;
     LEVEL_STATE_T level = getLevelStatus();
 
     if ( LEVEL_STATE_HIGH == level )
@@ -246,8 +246,8 @@
 
     else if ( ( level >= LEVEL_STATE_MEDIUM ) && ( TRUE == didTimeout( stateDelayTime, GEN_WATER_TIMEOUT_MS ) ) )
     {
-        setModeGenWTransition( RO_GENW_TANK_LOW_STATE );
-        state = RO_GENW_TANK_LOW_STATE;
+        setModeGenWTransition( RO_GENW_TANK_FILL_STATE );
+        state = RO_GENW_TANK_FILL_STATE;
     }
 
     return state;