Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -re2bd38bf5191fc10c058fa922b477322e6707a94 -r7a878f735bf78937f6d55f4b9a45618ac8eef4f3
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision e2bd38bf5191fc10c058fa922b477322e6707a94)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 7a878f735bf78937f6d55f4b9a45618ac8eef4f3)
@@ -371,12 +371,12 @@
         // Clear alarm condition and broadcast alarm condition clear if not already cleared
         if ( TRUE == alarmIsDetected[ alarm ] )
         {
-            ALARM_NAME_DATA_T data;
+            ALARM_ID_DATA_PUBLISH_T data;
 
-            data.alarmName = (U32)alarm;
+            data.alarmID = (U32)alarm;
 
             alarmIsDetected[ alarm ] = FALSE;
-            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
+            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
         }
     }
 }
@@ -402,11 +402,11 @@
             // Clear alarm and broadcast alarm clear if not already cleared
             if ( TRUE == alarmIsActive[ alarm ] )
             {
-                ALARM_NAME_DATA_T data;
+                ALARM_ID_DATA_PUBLISH_T data;
 
-                data.alarmName = (U32) alarm;
+                data.alarmID = (U32) alarm;
 
-                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
+                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
                 alarmIsActive[ alarm ] = FALSE;
                 clearAlarmCondition( alarm );
 
@@ -1481,11 +1481,11 @@
             {
                 if ( TRUE == alarmIsActive[ a ] )
                 {
-                    ALARM_NAME_DATA_T data;
+                    ALARM_ID_DATA_PUBLISH_T data;
 
-                    data.alarmName = (U32)a;
+                    data.alarmID = (U32)a;
 
-                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
+                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
                     alarmIsActive[ a ] = FALSE;
                     alarmStartedAt[ a ].data = 0;
                     // Clear FIFO if this alarm was in it
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -r7a878f735bf78937f6d55f4b9a45618ac8eef4f3
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 7a878f735bf78937f6d55f4b9a45618ac8eef4f3)
@@ -154,11 +154,11 @@
 } ALARM_COMP_STATUS_PAYLOAD_T;
 #pragma pack(pop)
 
-/// Alarm name data publish
+/// Alarm ID data publish
 typedef struct
 {
-    U32 alarmName;                              ///< Alarm name.
-} ALARM_NAME_DATA_T;
+    U32 alarmID;                                ///< Alarm ID.
+} ALARM_ID_DATA_PUBLISH_T;
 
 // ********** public function prototypes **********