Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -r4459be59bdc2896b44bcf6cd42d2762190e23c16 -ra3a01327c8fe80f65f6658ae6cbef4910a4a8033
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 4459be59bdc2896b44bcf6cd42d2762190e23c16)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision a3a01327c8fe80f65f6658ae6cbef4910a4a8033)
@@ -29,13 +29,13 @@
 
 // ********** private definitions **********
 
-/// Enumeration of button self test states.
+/// Enumeration of button self-test states.
 typedef enum Button_Self_Test_States
 {
-    BUTTON_SELF_TEST_STATE_START = 0,                       ///< Button self test start state
-    BUTTON_SELF_TEST_STATE_IN_PROGRESS,                     ///< Button self test in progress state
-    BUTTON_SELF_TEST_STATE_COMPLETE,                        ///< Button self test completed state
-    NUM_OF_BUTTON_SELF_TEST_STATES                          ///< Number of button self test states
+    BUTTON_SELF_TEST_STATE_START = 0,                       ///< Button self-test start state
+    BUTTON_SELF_TEST_STATE_IN_PROGRESS,                     ///< Button self-test in progress state
+    BUTTON_SELF_TEST_STATE_COMPLETE,                        ///< Button self-test completed state
+    NUM_OF_BUTTON_SELF_TEST_STATES                          ///< Number of button self-test states
 } BUTTON_SELF_TEST_STATE_T;
 
 /// Enumeration of hardware buttons.
@@ -92,8 +92,8 @@
 static BOOL stopButtonPressPending = FALSE;                         ///< Flag indicates a stop button press is pending consumption.
 static U32  stopButtonPendingTimer = 0;                             ///< Timer counter for pending stop button press.
 
-static BUTTON_SELF_TEST_STATE_T buttonSelfTestState = BUTTON_SELF_TEST_STATE_START; ///< Current state of button self test.
-static U32 buttonSelfTestTimerCount = 0;                            ///< Timer counter for button self test states.
+static BUTTON_SELF_TEST_STATE_T buttonSelfTestState = BUTTON_SELF_TEST_STATE_START; ///< Current state of button self-test.
+static U32 buttonSelfTestTimerCount = 0;                            ///< Timer counter for button self-test states.
 
 // ********** private function prototypes **********
 
@@ -250,7 +250,7 @@
             break;
 
         case BUTTON_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
             buttonSelfTestState = BUTTON_SELF_TEST_STATE_START;
             break;