Index: firmware/App/Modes/ModeWaterPreGen.c
===================================================================
diff -u -r12c4f28723f9af89ae693df771039da1bc7ffc80 -r99498a5bab0a1f4c706376feceadc66df6d1c22e
--- firmware/App/Modes/ModeWaterPreGen.c	(.../ModeWaterPreGen.c)	(revision 12c4f28723f9af89ae693df771039da1bc7ffc80)
+++ firmware/App/Modes/ModeWaterPreGen.c	(.../ModeWaterPreGen.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
@@ -98,12 +98,12 @@
             preGenWState = handlePreGenWStartState();
             break;
 
-        case RO_PRE_GENW_STATE_COMPLETE:
+        case RO_PRE_GENW_VERIFY_WATER:
             preGenWState = handlePreGenWCompleteState();
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_PGEN_STATE, preGenWState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_PGEN_STATE, preGenWState )
             break;
     }
     //Publish pre Gen water mode data
@@ -130,12 +130,12 @@
             // TODO: handler function of state start
             break;
 
-        case RO_PRE_GENW_STATE_COMPLETE:
+        case RO_PRE_GENW_VERIFY_WATER:
             // TODO: handler function of state complete
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_PGEN_STATE, state )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_PGEN_STATE, state )
             break;
     }
 }
@@ -148,9 +148,9 @@
  *************************************************************************/
 static RO_PRE_GENW_MODE_STATE_T handlePreGenWStartState( void )
 {
-    RO_PRE_GENW_MODE_STATE_T state = RO_PRE_GENW_STATE_COMPLETE;
+    RO_PRE_GENW_MODE_STATE_T state = RO_PRE_GENW_VERIFY_WATER;
 
-    setModePreGenWTransition( RO_PRE_GENW_STATE_COMPLETE );
+    setModePreGenWTransition( RO_PRE_GENW_VERIFY_WATER );
 
     return state;
 }
@@ -164,7 +164,7 @@
  *************************************************************************/
 static RO_PRE_GENW_MODE_STATE_T handlePreGenWCompleteState( void )
 {
-    RO_PRE_GENW_MODE_STATE_T state = RO_PRE_GENW_STATE_COMPLETE;
+    RO_PRE_GENW_MODE_STATE_T state = RO_PRE_GENW_VERIFY_WATER;
 
     if ( TRUE == pendingStartPreGenRequest )
     {
@@ -234,7 +234,7 @@
 
         data.preGenWExecState = (U32)getCurrentPreGenWState();
 
-        broadcastData( MSG_ID_RO_PRE_GEN_WATER_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( PRE_GENW_MODE_DATA_T ) );
+        broadcastData( MSG_ID_FP_PRE_GEN_WATER_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( PRE_GENW_MODE_DATA_T ) );
 
         preGenWDataPublicationTimerCounter = 0;
     }