Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rce66580e076bffa157868ff7e422556f78a95cac -r99498a5bab0a1f4c706376feceadc66df6d1c22e
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision ce66580e076bffa157868ff7e422556f78a95cac)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
@@ -133,7 +133,7 @@
         valveStateMismatchTimerCounter++; // increment valve state mismatch counter by 1
         if ( valveStateMismatchTimerCounter > MAX_VALVE_STATE_MISMATCH_TIMER_COUNT )
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_VALVE_CONTROL_FAILURE, (U32)readValvesStates, (U32)commandedValvesStates )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_VALVE_CONTROL_FAILURE, (U32)readValvesStates, (U32)commandedValvesStates )
         }
     }
     else
@@ -210,7 +210,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_STATE_NAME, (U32)valveStateName )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_STATE_NAME, (U32)valveStateName )
     }
 
     return vState;
@@ -243,12 +243,12 @@
         }
         else
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_STATE1, valveID )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_STATE1, valveID )
         }
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_ID1, valveID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_ID1, valveID )
     }
 
     return result;
@@ -287,12 +287,12 @@
         }
         else
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_STATE2, valveID )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_STATE2, valveID )
         }
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_ID2, valveID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_ID2, valveID )
     }
 
     return result;
@@ -321,7 +321,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_ID3, valveID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_ID3, valveID )
     }
 
     return name;
@@ -346,7 +346,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_ID4, valveID )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_VALVES_INVALID_VALVE_ID4, valveID )
     }
 
     return valveState;
@@ -375,7 +375,7 @@
             data.valvesSensedState[ valve ] = (U08)getValveStateName( (VALVES_T)valve );
         }
 
-        broadcastData( MSG_ID_RO_VALVES_STATES_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( RO_VALVES_DATA_T ) );
+        broadcastData( MSG_ID_FP_VALVES_STATES_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( RO_VALVES_DATA_T ) );
 
         valvesStatesPublicationTimerCounter = 0;
     }