Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rf5f37b1e2865bc495f11bc2d6532c15059ae2f37 -r9e611165fe4a2eaeccd7b2a37c8e4dfc8498b526
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision f5f37b1e2865bc495f11bc2d6532c15059ae2f37)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9e611165fe4a2eaeccd7b2a37c8e4dfc8498b526)
@@ -82,7 +82,7 @@
 } ALARM_PRIORITY_RANKS_T;
 
 /// Enumeration of alarm audio self-test states.
-typedef enum Alarm_Lamp_Self_Test_States
+typedef enum Alarm_Audio_Self_Test_States
 {
     ALARM_AUDIO_SELF_TEST_STATE_START = 0,      ///< Start state of alarm audio self-test.
     ALARM_AUDIO_SELF_TEST_STATE_PRIMARY,        ///< Test tone state of alarm audio self-test.
@@ -120,16 +120,18 @@
 
 /// Interval (in task intervals) at which to publish alarm status to CAN bus.
 static OVERRIDE_U32_T alarmStatusPublishInterval = { ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, ALARM_STATUS_PUBLISH_INTERVAL, 0 };
+
 /// Interval (in task intervals) at which to publish alarm information to CAN bus.
 static OVERRIDE_U32_T alarmInfoPublishInterval = { ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, 0 };
+
 /// Alarm audio attenuation level (0..4 where 0 = max volume and 4 = min volume).
 static OVERRIDE_U32_T alarmAudioVolumeLevel = { MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, 0 };
 
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };            /// Alarm audio current (high gain) measured at ADC.
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };            ///< Alarm audio current (high gain) measured at ADC.
 
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };            /// Alarm audio current (low gain) measured at ADC.
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };            ///< Alarm audio current (low gain) measured at ADC.
 
-static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };               /// Alarm backup audio current measured at ADC.
+static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };               ///< Alarm backup audio current measured at ADC.
 
 static COMP_ALARM_STATUS_T alarmStatus;                                             ///< Record for the current composite alarm status.
 static ALARM_PRIORITY_RANKS_T alarmPriorityFIFO[ NUM_OF_ALARM_PRIORITIES ];         ///< FIFO - first activated or highest sub-rank alarm in each alarm priority category.