Index: App/Services/WatchdogMgmt.c
===================================================================
diff -u -r614cd0625ac1f98edea2fe3ab2c3d0005f6fc8e0 -r9e98c5d52930c1830ab5dee5b4e927ab693eca04
--- App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 614cd0625ac1f98edea2fe3ab2c3d0005f6fc8e0)
+++ App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 9e98c5d52930c1830ab5dee5b4e927ab693eca04)
@@ -28,18 +28,18 @@
     WATCHDOG_SELF_TEST_STATE_START = 0,
     WATCHDOG_SELF_TEST_STATE_IN_PROGRESS,
     WATCHDOG_SELF_TEST_STATE_COMPLETE,
-    NUM_OF_BUTTON_SELF_TEST_STATES
-} BUTTON_SELF_TEST_STATE_T;
+    NUM_OF_WATCHDOG_SELF_TEST_STATES
+} WATCHDOG_SELF_TEST_STATE_T;
 
 #define WATCHDOG_POST_TIMEOUT_MS            100 // ms
 
 // ********** private data **********
 
 static BOOL watchdogExpired = FALSE;
-static BOOL lastWatchdogPetTime = 0;
+static U32  lastWatchdogPetTime = 0;
 static BOOL watchdogTaskCheckedIn[NUM_OF_TASKS];
 
-static BUTTON_SELF_TEST_STATE_T watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_START;
+static WATCHDOG_SELF_TEST_STATE_T watchdogSelfTestState = WATCHDOG_SELF_TEST_STATE_START;
 static U32 watchdogSelfTestTimerCount = 0;
 
 // ********** private function prototypes **********