Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -r8af2673f6c9142c9a16bb676447916ea788ae53d -rd27dcf1fbbc9651636f211028917a1c0702bb56a
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 8af2673f6c9142c9a16bb676447916ea788ae53d)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision d27dcf1fbbc9651636f211028917a1c0702bb56a)
@@ -179,19 +179,19 @@
                 // Verify 24V is down when w.d. expired
                 if ( v24 > MAX_24V_LEVEL_ON_WATCHDOG_EXPIRED )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_WATCHDOG_POST_TEST_FAILED, 2.0, v24 );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 2.0, v24 );
                     watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
                 // Verify backup alarm audio is on when w.d. expired
                 else if ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA )
                 {
-                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent );
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 3.0, audioCurrent );
                     watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                 }
             }
             else
             {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_WATCHDOG_POST_TEST_FAILED, 1 );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 1 );
                 watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
             }
             watchdogSelfTestTimerCount = getMSTimerCount();
@@ -209,13 +209,13 @@
                     // Verify 24V is down when w.d. recovered
                     if ( v24 < MIN_24V_LEVEL_ON_WATCHDOG_RECOVER )
                     {
-                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_WATCHDOG_POST_TEST_FAILED, 4.0, v24 );
+                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 4.0, v24 );
                         watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                     }
                     // Verify backup alarm audio is on when w.d. recovered
                     else if ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA )
                     {
-                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent );
+                        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_WATCHDOG_POST_TEST_FAILED, 5.0, audioCurrent );
                         watchdogSelfTestStatus = SELF_TEST_STATUS_FAILED;
                     }
                     else