Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r67731d57db9a620418b3b848d8f75ff204902c36 -r200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 67731d57db9a620418b3b848d8f75ff204902c36)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 200dfbd12ee14a4dbe5ee1daaece7bfce9e8a104)
@@ -65,7 +65,7 @@
 
 static void publishValvesStates( void );
 static void readCommandedValveStates( void );
-static BOOL checkValveStateName( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName );
+static BOOL checkValveStateName( DD_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName );
 static U32 convertValveStateNameToValveState( VALVE_STATE_NAMES_T valveStateName );
 static U32 getValveState( U32 valveID );
 
@@ -219,7 +219,7 @@
  * @param valveStateName valve state name to check for given valve ID
  * @return TRUE if given valveStateName is appropriate for given valve ID, FALSE if not.
  *************************************************************************/
-static BOOL checkValveStateName( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName )
+static BOOL checkValveStateName( DD_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName )
 {
     BOOL result = FALSE; // initialize result flag to FALSE
 
@@ -291,7 +291,7 @@
  * @param valveStateName name of valve state to set given valve to
  * @return TRUE if new valve state is set for given valve ID, FALSE if not.
  *************************************************************************/
-BOOL setValveState( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName )
+BOOL setValveState( DD_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName )
 {
     BOOL result = FALSE; // initialize result flag to FALSE
 
@@ -326,7 +326,7 @@
  * @param delayMs delay duration (in ms) before actuation
  * @return TRUE if new valve state is set for given valve ID, FALSE if not.
  *************************************************************************/
-BOOL setValveStateDelayed( VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName, U32 delayMs )
+BOOL setValveStateDelayed( DD_VALVES_T valveID, VALVE_STATE_NAMES_T valveStateName, U32 delayMs )
 {
     BOOL result = FALSE; // initialize result flag to FALSE
 
@@ -362,7 +362,7 @@
  * @param valveID ID of valve to get state for
  * @return the current valve state for given valve in enum
  *************************************************************************/
-VALVE_STATE_NAMES_T getValveStateName( VALVES_T valveID )
+VALVE_STATE_NAMES_T getValveStateName( DD_VALVES_T valveID )
 {
     // Initialized per CppCheck.
     VALVE_STATE_NAMES_T name = NUM_OF_VALVE_STATES;
@@ -416,7 +416,7 @@
  *************************************************************************/
 void setHydValvesStatetoClosedState( void )
 {
-    VALVES_T valve;
+    DD_VALVES_T valve;
 
     // Set all Hydraulics valves to closed state
     for ( valve = FIRST_HYD_VALVE; valve < LAST_HYD_VALVE; valve++ )
@@ -435,7 +435,7 @@
  *************************************************************************/
 void setUFValvesStatetoClosedState( void )
 {
-    VALVES_T valve;
+    DD_VALVES_T valve;
 
     // Set all UF valves to closed state
     for ( valve = FIRST_UF_VALVE; valve <= LAST_UF_VALVE; valve++ )
@@ -466,7 +466,7 @@
 
         for ( i = 0; i < DD_NUM_OF_VALVES; i++ )
         {
-            data.valvesSensedState[ i ] = (U08)getValveStateName( (VALVES_T)i );
+            data.valvesSensedState[ i ] = (U08)getValveStateName( (DD_VALVES_T)i );
         }
 
         broadcastData( MSG_ID_DD_VALVES_STATES_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( DD_VALVES_DATA_T ) );
@@ -529,7 +529,7 @@
 BOOL testBCValveStatesOverride( MESSAGE_T *message )
 {
     DD_BC_VALVE_OVERRIDE_PAYLOAD_T payload;
-    VALVES_T valve;
+    DD_VALVES_T valve;
     BOOL result = FALSE;
 
     memcpy( (U08*)(&payload), message->payload, sizeof( DD_BC_VALVE_OVERRIDE_PAYLOAD_T ) );
@@ -585,10 +585,10 @@
 
             memcpy( &payload, message->payload, sizeof(VALVE_CMD_PAYLOAD_T) );
 
-            if ( ( (VALVES_T)payload.valveID < DD_NUM_OF_VALVES ) &&
+            if ( ( (DD_VALVES_T)payload.valveID < DD_NUM_OF_VALVES ) &&
                     ( (VALVE_STATE_NAMES_T)payload.valveState < NUM_OF_VALVE_STATES ) )
             {
-                setValveState( (VALVES_T)payload.valveID, (VALVE_STATE_NAMES_T)payload.valveState );
+                setValveState( (DD_VALVES_T)payload.valveID, (VALVE_STATE_NAMES_T)payload.valveState );
                 result = TRUE;
             }
         }