Index: firmware/App/Modes/ModeWaterGen.c
===================================================================
diff -u -r27852fdd669da28463818441428361d45f4b3866 -rd5574e12aa9638c933d11b9bee8d5cf024864440
--- firmware/App/Modes/ModeWaterGen.c	(.../ModeWaterGen.c)	(revision 27852fdd669da28463818441428361d45f4b3866)
+++ firmware/App/Modes/ModeWaterGen.c	(.../ModeWaterGen.c)	(revision d5574e12aa9638c933d11b9bee8d5cf024864440)
@@ -15,7 +15,6 @@
 *
 ***************************************************************************/
 
-
 #include "DDInterface.h"
 #include "Level.h"
 #include "ModeStandby.h"
@@ -51,7 +50,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,16 +112,16 @@
             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:
             genWaterState = handleGenWTankFullState();
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_GENW_STATE, genWaterState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_GENW_STATE, genWaterState )
             break;
 
     }
@@ -150,7 +149,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 );
@@ -169,7 +168,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_GENW_STATE, state )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_GENW_STATE, state )
             break;
     }
 }
@@ -193,8 +192,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 +206,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,14 +245,14 @@
 
     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;
 }
-/**
- * *******************************************************************//**
+
+/*********************************************************************//**
  * @brief
  * The getCurrentGenWaterState function returns the current state of the
  * gen water mode.
@@ -280,13 +279,14 @@
 
     return result;
 }
+
 /*********************************************************************//**
  * @brief
  * The publishGenWModeData function broadcasts the generate water
  * mode data at defined interval.
  * @details \b Inputs: genDialysateDataPublicationTimerCounter
- * @details \b Outputs: DD generate water data broadcast message sent
- * @details \b Message \Sent: MSG_ID_RO_GEN_WATER_MODE_DATA to publish the
+ * @details \b Outputs: FP generate water data broadcast message sent
+ * @details \b Message \Sent: MSG_ID_FP_GEN_WATER_MODE_DATA to publish the
  * generate water mode data.
  * @return none
  *************************************************************************/
@@ -297,9 +297,9 @@
         GEN_WATER_MODE_DATA_T data;
 
         data.genWaterExecState              = (U32)getCurrentGenWaterState();
-        data.setFlowRate                       = (F32)getDDPermeateFlowRate();
+        data.setFlowRate                    = (F32)getDDPermeateFlowRate();
 
-        broadcastData( MSG_ID_RO_GEN_WATER_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( GEN_WATER_MODE_DATA_T ) );
+        broadcastData( MSG_ID_FP_GEN_WATER_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( GEN_WATER_MODE_DATA_T ) );
 
         genWaterDataPublicationTimerCounter = 0;
     }
@@ -316,7 +316,7 @@
 {
     BOOL result = FALSE;
 
-    if ( RO_PRE_GENW_STATE_COMPLETE == getCurrentPreGenWState() )
+    if ( RO_PRE_GENW_VERIFY_WATER == getCurrentPreGenWState() )
     {
         result                 = TRUE;
         pendingStartGenRequest = TRUE;