Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -rb2fe6bfb0b61b836c5164515c202b630c905fec7 -r9fdd42e75e67270808116d7d89f099939c13add7
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision b2fe6bfb0b61b836c5164515c202b630c905fec7)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 9fdd42e75e67270808116d7d89f099939c13add7)
@@ -45,7 +45,7 @@
     // Initialize all the switches
     for ( i = 0; i < NUM_OF_DOORS_AND_CAPS; i++ )
     {
-        switchStatus[ i ].data = (U32)CLOSED;
+        switchStatus[ i ].data = (U32)STATE_CLOSED;
     }
 }
 
@@ -60,7 +60,7 @@
 {
     if ( ++switchesFPGAStatusCheckCounter > SWITCHES_FPGA_STATUS_CHECK_INTERVAL )
     {
-        switchStatus[ FRONT_DOOR ].data = (U32)( getFPGAFrontDoorStatus() != 0 ? CLOSED : OPEN );
+        switchStatus[ FRONT_DOOR ].data = (U32)( getFPGAFrontDoorStatus() != 0 ? STATE_CLOSED : STATE_OPEN );
 
         switchesFPGAStatusCheckCounter = 0;
     }
@@ -76,7 +76,7 @@
  * @param switchId which is the switch that its status is requested
  * @return switch status
  *************************************************************************/
-SWITCH_STATUS_T getSwitchStatus( SWITCH_T switchId )
+OPN_CLS_STATE_T getSwitchStatus( SWITCH_T switchId )
 {
     U32 status;
 
@@ -89,7 +89,7 @@
         status = switchStatus[ switchId ].data;
     }
 
-    return (SWITCH_STATUS_T)status;
+    return (OPN_CLS_STATE_T)status;
 }
 
 // ********** private functions **********
Index: firmware/App/Controllers/Switches.h
===================================================================
diff -u -rd8fa48ead3336b1fe090b42030a8648264831076 -r9fdd42e75e67270808116d7d89f099939c13add7
--- firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision d8fa48ead3336b1fe090b42030a8648264831076)
+++ firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision 9fdd42e75e67270808116d7d89f099939c13add7)
@@ -22,13 +22,6 @@
     NUM_OF_DOORS_AND_CAPS           ///< Number of doors and caps
 } SWITCH_T;
 
-typedef enum switches_status
-{
-    CLOSED = 0,                     ///< Closed
-    OPEN,                           ///< Open
-    NUM_OF_SWITCH_STATUS            ///< Number of switch status
-} SWITCH_STATUS_T;
-
 /// DG doors and caps data publish structure
 typedef struct
 {
@@ -41,7 +34,7 @@
 
 void execSwitches( void );
 
-SWITCH_STATUS_T getSwitchStatus( SWITCH_T switchId );
+OPN_CLS_STATE_T getSwitchStatus( SWITCH_T switchId );
 
 BOOL testSetSwitchesDataPublishIntervalOverride( U32 value );
 BOOL testResetSwitchesDataPublishIntervalOverrid( void );
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r44a100f8e5210a02c23b8fcc4527d8e96d577381 -r9fdd42e75e67270808116d7d89f099939c13add7
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 44a100f8e5210a02c23b8fcc4527d8e96d577381)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 9fdd42e75e67270808116d7d89f099939c13add7)
@@ -155,6 +155,7 @@
     SW_FAULT_ID_INVALID_CONSUMABLE_SELF_TEST_STATE,
     SW_FAULT_ID_HD_INVALID_BUBBLE_STATE,                                // 125
     SW_FAULT_ID_HD_INVALID_BUBBLE_ID,
+    SW_FAULT_ID_HD_INVALID_SWITCH_ID,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;