Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -r748fbe2e4347126645d229f9dfed45de55526ef7
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 748fbe2e4347126645d229f9dfed45de55526ef7)
@@ -34,11 +34,11 @@
 /// List of watchdog states.
 typedef enum Button_Self_Test_States
 {
-    WATCHDOG_SELF_TEST_STATE_START = 0,                                         ///< Watchdog self test state start
-    WATCHDOG_SELF_TEST_STATE_IN_PROGRESS,                                       ///< watchdog self test state in progress
-    WATCHDOG_SELF_TEST_STATE_RECOVER,                                           ///< Watchdog self test state recover
-    WATCHDOG_SELF_TEST_STATE_COMPLETE,                                          ///< Watchdog self test state complete
-    NUM_OF_WATCHDOG_SELF_TEST_STATES                                            ///< Number of watchdog self test states
+    WATCHDOG_SELF_TEST_STATE_START = 0,                                         ///< Watchdog self-test state start
+    WATCHDOG_SELF_TEST_STATE_IN_PROGRESS,                                       ///< watchdog self-test state in progress
+    WATCHDOG_SELF_TEST_STATE_RECOVER,                                           ///< Watchdog self-test state recover
+    WATCHDOG_SELF_TEST_STATE_COMPLETE,                                          ///< Watchdog self-test state complete
+    NUM_OF_WATCHDOG_SELF_TEST_STATES                                            ///< Number of watchdog self-test states
 } WATCHDOG_SELF_TEST_STATE_T;
 
 // ********** private data **********
@@ -47,9 +47,9 @@
 
 static OVERRIDE_U32_T watchdogTaskCheckedIn[ NUM_OF_TASKS ];                    ///< Array of flags indicating whether individual tasks have checked in with watchdog manager.
 
-static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState;                        ///< Watchdog self test current state.
-static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                       ///< Watchdog self test status.
-static U32 watchdogSelfTestTimerCount = 0;                                      ///< Watchdog self test timer count.
+static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState;                        ///< Watchdog self-test current state.
+static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                       ///< Watchdog self-test status.
+static U32 watchdogSelfTestTimerCount = 0;                                      ///< Watchdog self-test timer count.
 
 // ********** private function prototypes **********
 
@@ -146,7 +146,7 @@
  * should be called periodically until a pass or fail result is returned.
  * @details
  * Inputs : watchdogSelfTestState
- * Outputs : Executed watchdog self test
+ * Outputs : Executed watchdog self-test
  * @return in progress, passed, or failed
  *************************************************************************/
 SELF_TEST_STATUS_T execWatchdogTest( void )
@@ -187,7 +187,7 @@
             break;
 
         case WATCHDOG_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
             watchdogSelfTestStatus = SELF_TEST_STATUS_IN_PROGRESS;
             watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_START;
             break;