Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r376e3ff1ca14aab7fa40e4a634f2cba85526910d -r51fa142977df9fbfdc2db8ea00903e1568ef9a08
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 376e3ff1ca14aab7fa40e4a634f2cba85526910d)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 51fa142977df9fbfdc2db8ea00903e1568ef9a08)
@@ -50,7 +50,7 @@
 
 // ********** private function prototypes **********
 
-static BOOL checkValves( VALVES_T valve, VALVE_STATES_NAMES_T valveState );                                               ///< check validity of requested valve state
+static BOOL checkValves( VALVES_T valve, VALVE_STATE_NAMES_T valveState );                                               ///< check validity of requested valve state
 U16 fromU32ArrayToU16( OVERRIDE_U32_T array[ NUM_OF_VALVES ] );                                                     ///< convert array of U32 to U16 for statesValves preparation
 static void publishValvesStates( void );
 static DATA_GET_PROTOTYPE( U32, getPublishValvesStatesInterval );
@@ -118,7 +118,7 @@
  * Outputs : none
  * @return none
  *************************************************************************/
-static BOOL checkValves( VALVES_T valve, VALVE_STATES_NAMES_T valveState )
+static BOOL checkValves( VALVES_T valve, VALVE_STATE_NAMES_T valveState )
 {
     BOOL result = FALSE; // initialize checkValves result flag to FALSE
 
@@ -275,7 +275,7 @@
  * Outputs : none
  * @return converted U32 vState
  *************************************************************************/
-U32 convertToValveState(VALVE_STATES_NAMES_T valveState)
+U32 convertToValveState(VALVE_STATE_NAMES_T valveState)
 {
     U32 vState = 0; // initialize state to 0
 
@@ -344,7 +344,7 @@
  * Outputs : none
  * @return TRUE if new valve state is set for given valve
  *************************************************************************/
-BOOL setValveState( VALVES_T valve, VALVE_STATES_NAMES_T valveState )
+BOOL setValveState( VALVES_T valve, VALVE_STATE_NAMES_T valveState )
 {
     BOOL result = FALSE; // initialize result flag to FALSE
 
Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r512ff1bb2b4493965ca5d208349c85c500d3f4d0 -r51fa142977df9fbfdc2db8ea00903e1568ef9a08
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 512ff1bb2b4493965ca5d208349c85c500d3f4d0)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 51fa142977df9fbfdc2db8ea00903e1568ef9a08)
@@ -30,8 +30,8 @@
 
 // ********** public definitions **********
 
-/// Enumeration of available valve states per valve type (from SA and DG SRS documents)
-typedef enum ValveStates
+/// Enumeration of available valve state names per valve type (from SA and DG SRS documents)
+typedef enum ValveStateNames
 {
     VALVE_STATE_OPEN = 0,       ///< Open valve state, used only for VPi, VBf, and VSP
     VALVE_STATE_CLOSED,         ///< Closed valve state, used only for VPi, VBf, and VSP
@@ -46,7 +46,7 @@
     VALVE_STATE_R2_C_TO_NO,     ///< Reservoir 2 Common to Normally Open valve state, used only for VRd and VRf
     VALVE_STATE_R2_C_TO_NC,     ///< Reservoir 2 Common to Normally Closed valve state, used only for VRo and VRi
     NUM_OF_VALVE_STATES         ///< number of valve states
-} VALVE_STATES_NAMES_T;
+} VALVE_STATE_NAMES_T;
 
 /// Enumeration of valves
 typedef enum Valves
@@ -70,7 +70,7 @@
 void initValves( void );                                              // initialize the valves driver
 void execValves( void );                                              // execute the valves driver
 
-BOOL setValveState( VALVES_T valve, VALVE_STATES_NAMES_T valveState );      // set valve's state to valveState
+BOOL setValveState( VALVES_T valve, VALVE_STATE_NAMES_T valveState );      // set valve's state to valveState
 DATA_ARRAY_GET_PROTOTYPE( U32, getValveState, valveID );              // get valve state for given valve
 
 BOOL testSetValvesStatesPublishIntervalOverride( U32 value );