Index: MsgDefs.h
===================================================================
diff -u -rf1bf9b68e5b701c465e1adc3e00097a6ddc976c5 -r1c5d6b5ba16fe6ff2c213e5ab0d8dc9a859226e3
--- MsgDefs.h	(.../MsgDefs.h)	(revision f1bf9b68e5b701c465e1adc3e00097a6ddc976c5)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 1c5d6b5ba16fe6ff2c213e5ab0d8dc9a859226e3)
@@ -102,10 +102,11 @@
     MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW = 0x46,                              ///< TD response to initiate/cancel treatment workflow request
     MSG_ID_UI_UF_PAUSE_RESUME_REQUEST = 0x47,                                       ///< UI ultrafiltration pause/resume request
     MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE = 0x48,                                      ///< TD response to ultrafiltration pause/resume request
-    MSG_ID_RO_GEN_PERMEATE_MODE_DATA = 0x49,                                        ///< RO Gen Permeate data broadcast
+    MSG_ID_RO_GEN_WATER_MODE_DATA = 0x49,                                        ///< RO Gen Permeate data broadcast
     MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x4A,                                  ///< DD Pre-gen dialysate mode data
     MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B,                                 ///< DD Post-gen dialysate mode data
     MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C,                                ///< DD Pre Generate dialysate request data coming from TD.
+    MSG_ID_RO_PRE_GEN_WATER_MODE_DATA = 0x4D,                                       ///< RO Pre Generate water mode data.
 #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
 #endif
Index: RODefs.h
===================================================================
diff -u -r35fc1f8fb75aba11213f3bf0fe74847e7125686c -r1c5d6b5ba16fe6ff2c213e5ab0d8dc9a859226e3
--- RODefs.h	(.../RODefs.h)	(revision 35fc1f8fb75aba11213f3bf0fe74847e7125686c)
+++ RODefs.h	(.../RODefs.h)	(revision 1c5d6b5ba16fe6ff2c213e5ab0d8dc9a859226e3)
@@ -5,7 +5,7 @@
 // ********** public definitions **********
 
 /**
- *  @addtogroup ROOperationModes
+ *  @addtogroup FPOperationModes
  *  @{
  */
 
@@ -16,16 +16,17 @@
     RO_MODE_SERV,                                           ///< Service mode
     RO_MODE_INIT,                                           ///< Initialization & POST mode
     RO_MODE_STAN,                                           ///< Standby mode
-    RO_MODE_GENP,                                           ///< Generate permeate water mode
+    RO_MODE_PGEN,                                           ///< Pre Generate permeate water mode
+    RO_MODE_GENW,                                           ///< Generate permeate water mode
     RO_MODE_NLEG,                                           ///< Not legal - an illegal mode transition occurred
-    NUM_OF_RO_MODES                                         ///< Number of TD operation modes
+    NUM_OF_RO_MODES                                         ///< Number of RO operation modes
 };
 typedef enum RO_Op_Modes RO_OP_MODE_T;  ///< Type for RO operation modes enumeration
 
 /**@}*/
 
 /**
- *  @addtogroup ROInitAndPOSTMode
+ *  @addtogroup FPInitAndPOSTMode
  *  @{
  */
 
@@ -49,7 +50,7 @@
 /**@}*/
 
 /**
- *  @addtogroup ROStandbyMode
+ *  @addtogroup FPStandbyMode
  *  @{
  */
 
@@ -64,17 +65,33 @@
 /**@}*/
 
 /**
- *  @addtogroup ROGenWaterMode
+ *  @addtogroup FPPreGenWaterMode
  *  @{
  */
 
+/// Enumeration of Pre Gen Water mode states.
+enum RO_Pre_GenW_Mode_States
+{
+    RO_PRE_GENW_STATE_START = 0,                                ///< Pre Gen Water start state
+    RO_PRE_GENW_STATE_COMPLETE,                                 ///< Pre Gen Water complete state
+    NUM_OF_RO_PRE_GENP_MODE_STATES                              ///< Number of Pre Gen Water states
+};
+typedef enum RO_Pre_GenW_Mode_States RO_PRE_GENW_MODE_STATE_T;  ///< Type for RO Gen Water mode states enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup FPGenWaterMode
+ *  @{
+ */
+
 /// Enumeration of Gen Water mode states.
 enum RO_GenW_Mode_States
 {
-    RO_GENW_STATE_START = 0,                                     ///< Gen Water start state
+    RO_GENW_STATE_START = 0,                                    ///< Gen Water start state
     RO_GENW_TANK_LOW_STATE,                                     ///< Gen Water tank low state
     RO_GENW_TANK_FULL_STATE,                                    ///< Gen Water tank full state
-    NUM_OF_RO_GENP_MODE_STATES                                   ///< Number of gen water states
+    NUM_OF_RO_GENP_MODE_STATES                                  ///< Number of gen water states
 };
 typedef enum RO_GenW_Mode_States RO_GENW_MODE_STATE_T;          ///< Type for RO Gen Water mode states enumeration