Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -rc0273c73da6b6dee4ad6f1d54cb6c6f27a262b5b
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision de5a0d43bdef611d963d11855bc958a8d8899a09)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision c0273c73da6b6dee4ad6f1d54cb6c6f27a262b5b)
@@ -229,7 +229,7 @@
 
         default:
             result = SELF_TEST_STATUS_FAILED;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_BUTTONS_INVALID_SELF_TEST_STATE, buttonSelfTestState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_BUTTONS_INVALID_SELF_TEST_STATE, buttonSelfTestState )
             break;
     }
 
@@ -415,7 +415,7 @@
         if ( TRUE == didTimeout( stopButtonPendingTimer, STOP_BUTTON_PENDING_TIMEOUT ) )
         {
             stopButtonPressPending = FALSE;
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_BUTTONS_STOP_BUTTON_NOT_CONSUMED )
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_BUTTONS_STOP_BUTTON_NOT_CONSUMED )
         }
     }
 }