Index: firmware/App/Monitors/Switches.c
===================================================================
diff -u -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd -r961784c895cb8f551a2623cd02dcbfe42d04b7c2
--- firmware/App/Monitors/Switches.c	(.../Switches.c)	(revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd)
+++ firmware/App/Monitors/Switches.c	(.../Switches.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
@@ -89,7 +89,7 @@
     OPN_CLS_STATE_T currentSwitchStates[ NUM_OF_SWITCHES ];
 
     // Get current state of each switch
-    currentSwitchStates[ FRONT_DOOR ] = ( FALSE == getFPGAFrontDoorClosedStatus() ? STATE_OPEN : STATE_CLOSED );
+    currentSwitchStates[ H9_SWCH ] = ( FALSE == getFPGAFrontDoorClosedStatus() ? STATE_OPEN : STATE_CLOSED );
 
     // Debounce each switch
     for ( i = 0; i < NUM_OF_SWITCHES; i++ )
@@ -150,14 +150,14 @@
         // Check for door closed alarm
         if ( TRUE == requireDoorClosed )
         {
-            if ( getSwitchState( FRONT_DOOR ) != STATE_CLOSED )
+            if ( getSwitchState( H9_SWCH ) != STATE_CLOSED )
             {
                 activateAlarmNoData( ALARM_ID_TD_CARTRIDGE_DOOR_OPENED );
             }
         }
 
         // Handle clearing alarm conditions
-        if ( STATE_CLOSED == getSwitchState( FRONT_DOOR ) )
+        if ( STATE_CLOSED == getSwitchState( H9_SWCH ) )
         {
             clearAlarmCondition( ALARM_ID_TD_CARTRIDGE_DOOR_OPENED );
         }
@@ -225,7 +225,7 @@
         SWITCHES_DATA_T data;
 
         switchesDataPublicationCounter = 0;
-        data.frontDoor                 = (U32)getSwitchState( FRONT_DOOR );
+        data.h9Door                    = (U32)getSwitchState( H9_SWCH );
         broadcastData( MSG_ID_TD_SWITCHES_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( SWITCHES_DATA_T ) );
     }
 }