Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -r4459be59bdc2896b44bcf6cd42d2762190e23c16 -ra3a01327c8fe80f65f6658ae6cbef4910a4a8033
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 4459be59bdc2896b44bcf6cd42d2762190e23c16)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision a3a01327c8fe80f65f6658ae6cbef4910a4a8033)
@@ -47,18 +47,18 @@
     LAMP_STATE_T red[ NUM_OF_ALARM_LAMP_PATTERN_SEQUENCE_STEPS ];       ///< Lamp color state of the 2 step alarm lamp pattern sequence for red.
 };
 
-/// Enumeration of alarm lamp self test states.
+/// Enumeration of alarm lamp self-test states.
 typedef enum Alarm_Lamp_Self_Test_States
 {
-    ALARM_LAMP_SELF_TEST_STATE_START = 0,                               ///< Start state of alarm lamp self test.
-    ALARM_LAMP_SELF_TEST_STATE_RED,                                     ///< Red state of alarm lamp self test.
-    ALARM_LAMP_SELF_TEST_STATE_YELLOW,                                  ///< Yellow state of alarm lamp self test.
-    ALARM_LAMP_SELF_TEST_STATE_GREEN,                                   ///< Green state of alarm lamp self test.
-    ALARM_LAMP_SELF_TEST_STATE_COMPLETE,                                ///< Completed state of alarm lamp self test.
-    NUM_OF_ALARM_LAMP_SELF_TEST_STATES                                  ///< Number of states in alarm lamp self test.
+    ALARM_LAMP_SELF_TEST_STATE_START = 0,                               ///< Start state of alarm lamp self-test.
+    ALARM_LAMP_SELF_TEST_STATE_RED,                                     ///< Red state of alarm lamp self-test.
+    ALARM_LAMP_SELF_TEST_STATE_YELLOW,                                  ///< Yellow state of alarm lamp self-test.
+    ALARM_LAMP_SELF_TEST_STATE_GREEN,                                   ///< Green state of alarm lamp self-test.
+    ALARM_LAMP_SELF_TEST_STATE_COMPLETE,                                ///< Completed state of alarm lamp self-test.
+    NUM_OF_ALARM_LAMP_SELF_TEST_STATES                                  ///< Number of states in alarm lamp self-test.
 } ALARM_LAMP_SELF_TEST_STATE_T;
 
-#define POST_LAMP_STEP_TIME_MS      1000                                ///< Duration (in ms) for each alarm lamp self test step.
+#define POST_LAMP_STEP_TIME_MS      1000                                ///< Duration (in ms) for each alarm lamp self-test step.
 
 // ********** private data **********
 
@@ -79,8 +79,8 @@
     { { 0, 0 },       { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } }   // LAMP_PATTERN_MANUAL
 };
 
-static ALARM_LAMP_SELF_TEST_STATE_T alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_START;  ///< Current alarm lamp self test state.
-static U32 alarmLampSelfTestStepTimerCount = 0;                         ///< timer counter for current alarm lamp self test state.
+static ALARM_LAMP_SELF_TEST_STATE_T alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_START;  ///< Current alarm lamp self-test state.
+static U32 alarmLampSelfTestStepTimerCount = 0;                         ///< timer counter for current alarm lamp self-test state.
 
 // ********** private function prototypes **********
 
@@ -241,7 +241,7 @@
             break;
 
         case ALARM_LAMP_SELF_TEST_STATE_COMPLETE:
-            // if we get called in this state, assume we're doing self test again
+            // if we get called in this state, assume we're doing self-test again
             alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_START;
             break;