Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r28b6e281605c1a944c982d0ec7dcdb6f28aac82b -r99498a5bab0a1f4c706376feceadc66df6d1c22e
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 28b6e281605c1a944c982d0ec7dcdb6f28aac82b)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
@@ -164,7 +164,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
             currentMode = RO_MODE_FAUL;
             currentSubMode = 0;
             break;
@@ -203,7 +203,7 @@
     }
     else
     {  // Invalid mode requested
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, newMode )
     }
 }
 
@@ -322,7 +322,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode )
             break;
     }
 }
@@ -344,7 +344,7 @@
         broadcastModeIntervalCtr = 0;
         data.opMode = (U32)currentMode;
         data.subMode = currentSubMode;
-        broadcastData( MSG_ID_RO_OP_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( OP_MODE_PAYLOAD_T ) );
+        broadcastData( MSG_ID_FP_OP_MODE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( OP_MODE_PAYLOAD_T ) );
     }
 }