Index: firmware/App/Modes/ModeWaterGen.c
===================================================================
diff -u -r27852fdd669da28463818441428361d45f4b3866 -r99498a5bab0a1f4c706376feceadc66df6d1c22e
--- firmware/App/Modes/ModeWaterGen.c	(.../ModeWaterGen.c)	(revision 27852fdd669da28463818441428361d45f4b3866)
+++ firmware/App/Modes/ModeWaterGen.c	(.../ModeWaterGen.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
@@ -122,7 +122,7 @@
             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;
 
     }
@@ -169,7 +169,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;
     }
 }
@@ -299,7 +299,7 @@
         data.genWaterExecState              = (U32)getCurrentGenWaterState();
         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;