Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r89e21ce50fba7e91573780b0f57b6378e3cad84a -r8457e008319c5f6b20085918dd1799a7bfe841ca
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 89e21ce50fba7e91573780b0f57b6378e3cad84a)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 8457e008319c5f6b20085918dd1799a7bfe841ca)
@@ -369,10 +369,12 @@
         // Clear alarm condition and broadcast alarm condition clear if not already cleared
         if ( TRUE == alarmIsDetected[ alarm ] )
         {
-            U32 a = (U32)alarm;
+            ALARM_NAME_DATA_T data;
 
+            data.alarmName = (U32)alarm;
+
             alarmIsDetected[ alarm ] = FALSE;
-            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&a, sizeof( U32 ) );
+            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
         }
     }
 }
@@ -398,9 +400,11 @@
             // Clear alarm and broadcast alarm clear if not already cleared
             if ( TRUE == alarmIsActive[ alarm ] )
             {
-                U32 a = (U32)alarm;
+                ALARM_NAME_DATA_T data;
+
+                data.alarmName = (U32) alarm;
 
-                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&a, sizeof( U32 ) );
+                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
                 alarmIsActive[ alarm ] = FALSE;
                 clearAlarmCondition( alarm );
 
@@ -1475,9 +1479,11 @@
             {
                 if ( TRUE == alarmIsActive[ a ] )
                 {
-                    U32 al = (U32)a;
+                    ALARM_NAME_DATA_T data;
 
-                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&al, sizeof( U32 ) );
+                    data.alarmName = (U32)a;
+
+                    broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_NAME_DATA_T ) );
                     alarmIsActive[ a ] = FALSE;
                     alarmStartedAt[ a ].data = 0;
                     // Clear FIFO if this alarm was in it