Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rdc9ecb820b528f944ebde398daf34944aeb0cfdb -r557164394770b436f89735d3ffc91feda2ec7aac
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision dc9ecb820b528f944ebde398daf34944aeb0cfdb)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 557164394770b436f89735d3ffc91feda2ec7aac)
@@ -50,8 +50,8 @@
 
 // ********** private function prototypes **********
 
-static BOOL checkValveStateName( VALVES_T valve, VALVE_STATE_NAMES_T valveState );                                  ///< check validity of requested valve state name for given valve
-static U32 convertValveStateNameToValveState(VALVE_STATE_NAMES_T valveState);                                       ///< Convert valve state name to de-/energized valve state
+static BOOL checkValveStateName( VALVES_T valve, VALVE_STATE_NAMES_T valveStateName );                              ///< check validity of requested valve state name for given valve
+static U32 convertValveStateNameToValveState(VALVE_STATE_NAMES_T valveStateName);                                   ///< Convert valve state name to de-/energized valve state
 static 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 );
@@ -121,15 +121,15 @@
  * The checkValveStateName function checks the validity of requested valve \n
  * state name for given valve.
  * @details
- * Inputs : valve, valveState
+ * Inputs : valve, valveStateName
  * Outputs : none
  * @return none
  *************************************************************************/
-static BOOL checkValveStateName( VALVES_T valve, VALVE_STATE_NAMES_T valveState )
+static BOOL checkValveStateName( VALVES_T valve, VALVE_STATE_NAMES_T valveStateName )
 {
     BOOL result = FALSE; // initialize result flag to FALSE
 
-    switch ( valveState )
+    switch ( valveStateName )
     {
         case VALVE_STATE_OPEN:
             if ( ( valve == VPI ) || ( valve == VBF ) || ( valve == VSP ) )
@@ -345,13 +345,13 @@
  * Outputs : none
  * @return TRUE if new valve state is set for given valve
  *************************************************************************/
-BOOL setValveState( VALVES_T valve, VALVE_STATE_NAMES_T valveState )
+BOOL setValveState( VALVES_T valve, VALVE_STATE_NAMES_T valveStateName )
 {
     BOOL result = FALSE; // initialize result flag to FALSE
 
-    if ( checkValveStateName ( valve, valveState ) )
+    if ( checkValveStateName ( valve, valveStateName ) )
     {
-        valves[ valve ].data = convertValveStateNameToValveState( valveState ); // not done on override to allow DG state machine to set valves states back to real values
+        valves[ valve ].data = convertValveStateNameToValveState( valveStateName ); // not done on override to allow DG state machine to set valves states back to real values
         result = TRUE;
     }