Index: firmware/App/Controllers/Switches.h
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -r9df576f7d1962f640d8d8a4b56403431c67a8639
--- firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Controllers/Switches.h	(.../Switches.h)	(revision 9df576f7d1962f640d8d8a4b56403431c67a8639)
@@ -33,20 +33,18 @@
 // ********** public definitions **********
 
 /// DG doors and caps enumeration
-typedef enum switches_names
+typedef enum cap_names
 {
     CONCENTRATE_CAP = 0,            ///< Concentrate cap
     DIALYSATE_CAP,                  ///< Dialysate cap
-    FLUID_DOOR,                     ///< Fluid door
-    NUM_OF_DOORS_AND_CAPS           ///< Number of doors and caps
-} SWITCH_T;
+    NUM_OF_CAPS                     ///< Number of caps
+} CAP_T;
 
 /// DG doors and caps data publish structure
 typedef struct
 {
     U32 concentrateCap;             ///< Concentrate cap
     U32 dialysateCap;               ///< Dialysate cap
-    U32 fluidDoor;                  ///< Fluid door
 } SWITCHES_DATA_T;
 
 // ********** public function prototypes **********
@@ -55,7 +53,7 @@
 
 void execSwitches( void );
 
-OPN_CLS_STATE_T getSwitchStatus( SWITCH_T switchId );
+OPN_CLS_STATE_T getSwitchStatus( CAP_T switchId );
 
 BOOL testSetSwitchesDataPublishIntervalOverride( U32 value );
 BOOL testResetSwitchesDataPublishIntervalOverride( void );