Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r4df8828df03ee996540084c57f9b46c0febc1e03 -r7dc4bb045389ac95e6658602f2659f6071542361
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 4df8828df03ee996540084c57f9b46c0febc1e03)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 7dc4bb045389ac95e6658602f2659f6071542361)
@@ -182,27 +182,27 @@
         {
             if ( getSwitchStatus( FRONT_DOOR ) != STATE_CLOSED )
             {
-                activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+                activateAlarmNoData( ALARM_ID_HD_CARTRIDGE_DOOR_OPENED );
             }
         }
         // Check for pump track unlocked alarm
         if ( TRUE == requirePumpTrackLocked )
         {
             if ( getSwitchStatus( PUMP_TRACK_SWITCH ) != STATE_CLOSED )
             {
-                activateAlarmNoData( ALARM_ID_PUMP_TRACK_LATCH_OPENED );
+                activateAlarmNoData( ALARM_ID_HD_PUMP_TRACK_LATCH_OPENED );
             }
         }
 
         // Handle clearing alarm conditions
         if ( ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) || ( requireDoorClosed != TRUE ) )
         {
-            clearAlarmCondition( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+            clearAlarmCondition( ALARM_ID_HD_CARTRIDGE_DOOR_OPENED );
         }
 
         if ( ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) ) || ( requirePumpTrackLocked != TRUE ) )
         {
-            clearAlarmCondition( ALARM_ID_PUMP_TRACK_LATCH_OPENED );
+            clearAlarmCondition( ALARM_ID_HD_PUMP_TRACK_LATCH_OPENED );
         }
     }
 }