Index: firmware/App/Services/AlarmMgmtRO.c
===================================================================
diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98
--- firmware/App/Services/AlarmMgmtRO.c	(.../AlarmMgmtRO.c)	(revision 533272e6ef2873fcfe7a41338a6c88c7a601605d)
+++ firmware/App/Services/AlarmMgmtRO.c	(.../AlarmMgmtRO.c)	(revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98)
@@ -97,14 +97,14 @@
                 if ( TRUE == isTransitionToFaultRequired() )
                 {
                     // If alarm is a DD fault and the alarm manager can transition to fault immediately, go to fault mode
-                    requestNewOperationMode( MODE_FAUL );
+                    requestNewOperationMode( RO_MODE_FAUL );
                 }
             }
         }
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm )
     }
 }
 
@@ -156,8 +156,6 @@
  *************************************************************************/
 void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2, BOOL outside )
 {
-
-
     // broadcast alarm and data if alarm not already active
     if ( ( FALSE == isAlarmActive( alarm ) ) && ( TRUE == isDDCommunicating() ) )
     {
@@ -217,7 +215,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm )
     }
 }
 
@@ -251,7 +249,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm )
     }
 }
 
@@ -287,7 +285,7 @@
 
         data.safetyShutdownStatus = (U32)isSafetyShutdownActivated();
 
-        broadcastData( MSG_ID_DD_ALARM_INFO_DATA, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) );
+        broadcastData( MSG_ID_RO_ALARM_INFO_DATA, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) );
         alarmInfoPublicationTimerCounter = 0;
     }
 }