Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r194cc4e5fbe048bd60b137c33e68e96a1ae39dc5 -ra3a01327c8fe80f65f6658ae6cbef4910a4a8033
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 194cc4e5fbe048bd60b137c33e68e96a1ae39dc5)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision a3a01327c8fe80f65f6658ae6cbef4910a4a8033)
@@ -32,14 +32,14 @@
 #define WATCHDOG_POST_TIMEOUT_MS            100                                             ///< Watchdog POST test timeout (in ms).
 #define WATCHDOG_RECOVERY_TIME_MS           250                                             ///< After watchdog POST test, wait this long (in ms) before moving on.
 
-/// Enumeration of watchdog self test states.
+/// Enumeration of watchdog self-test states.
 typedef enum Watchdog_Self_Test_States
 {
-    WATCHDOG_SELF_TEST_STATE_START = 0,                                                     ///< Watchdog self test start state
-    WATCHDOG_SELF_TEST_STATE_IN_PROGRESS,                                                   ///< Watchdog self test in progress state
-    WATCHDOG_SELF_TEST_STATE_RECOVER,                                                       ///< Watchdog self test recovery state
-    WATCHDOG_SELF_TEST_STATE_COMPLETE,                                                      ///< Watchdog self test completed state
-    NUM_OF_WATCHDOG_SELF_TEST_STATES                                                        ///< Number of watchdog self test states
+    WATCHDOG_SELF_TEST_STATE_START = 0,                                                     ///< Watchdog self-test start state
+    WATCHDOG_SELF_TEST_STATE_IN_PROGRESS,                                                   ///< Watchdog self-test in progress state
+    WATCHDOG_SELF_TEST_STATE_RECOVER,                                                       ///< Watchdog self-test recovery state
+    WATCHDOG_SELF_TEST_STATE_COMPLETE,                                                      ///< Watchdog self-test completed state
+    NUM_OF_WATCHDOG_SELF_TEST_STATES                                                        ///< Number of watchdog self-test states
 } WATCHDOG_SELF_TEST_STATE_T;
 
 // ********** private data **********
@@ -48,8 +48,8 @@
 
 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_STATE_START;   ///< Current watchdog self test state.
-static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                                   ///< Watchdog self test state timer counter.
+static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_START;   ///< Current watchdog self-test state.
+static SELF_TEST_STATUS_T         watchdogSelfTestStatus;                                   ///< Watchdog self-test state timer counter.
 static U32 watchdogSelfTestTimerCount = 0;
 
 // ********** private function prototypes **********
@@ -195,7 +195,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;