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