Index: firmware/App/Services/AlarmMgmtRO.c
===================================================================
diff -u -r28b6e281605c1a944c982d0ec7dcdb6f28aac82b -r99498a5bab0a1f4c706376feceadc66df6d1c22e
--- firmware/App/Services/AlarmMgmtRO.c	(.../AlarmMgmtRO.c)	(revision 28b6e281605c1a944c982d0ec7dcdb6f28aac82b)
+++ firmware/App/Services/AlarmMgmtRO.c	(.../AlarmMgmtRO.c)	(revision 99498a5bab0a1f4c706376feceadc66df6d1c22e)
@@ -121,7 +121,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
     }
 }
 
@@ -232,7 +232,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
     }
 }
 
@@ -266,7 +266,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm )
     }
 }
 
@@ -302,7 +302,7 @@
 
         data.safetyShutdownStatus = (U32)isSafetyShutdownActivated();
 
-        broadcastData( MSG_ID_RO_ALARM_INFO_DATA, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) );
+        broadcastData( MSG_ID_FP_ALARM_INFO_DATA, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) );
         alarmInfoPublicationTimerCounter = 0;
     }
 }