Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -rc8c60f543b53cd96008914a01145f5b08426903e -r986147effa2865d32f37c8c4c2b8b396eda847e0
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision c8c60f543b53cd96008914a01145f5b08426903e)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 986147effa2865d32f37c8c4c2b8b396eda847e0)
@@ -46,8 +46,8 @@
     NUM_OF_VALVE_STATES      ///< Number of valve states
 } VALVE_STATES_T;
 
-/// Enumeration of valve IDs
-typedef enum ValveIds
+/// Enumeration of valves
+typedef enum Valves
 {
     VRF = 0,          ///< Valve Reservoir Fill
     VRI,              ///< Valve Reservoir Inlet
@@ -60,8 +60,8 @@
     VPI,              ///< Valve Pressure inlet
     VSP,              ///< Valve Sampling Port
     VPD,              ///< Valve Production Drain
-    NUM_OF_VALVE_IDS ///< Number of valves
-} VALVE_IDS_T;
+    NUM_OF_VALVES     ///< Number of valves
+} VALVES_T;
 
 // ********** public function prototypes **********
 
@@ -70,12 +70,12 @@
 
 // SELF_TEST_STATUS_T execValvesTest( void ); // TODO: Add back in for POST on DG valves
 
-BOOL setValveState( VALVE_IDS_T valveID, VALVE_STATES_T valveState ); // Set valveID's state to valveState
+BOOL setValveState( VALVES_T valve, VALVE_STATES_T valveState ); // Set valve's state to valveState
 
-DATA_ARRAY_GET_PROTOTYPE( VALVE_STATES_T, getValveState, valveID );   // Get valveID's state
+DATA_ARRAY_GET_PROTOTYPE( F32, getValveState, valveID );   // Get valveID's state
 
-BOOL testSetValveStatePublishIntervalOverride( U32 value );
-BOOL testResetValveStatePublishIntervalOverride( void );
+BOOL testSetValvesStatesPublishIntervalOverride( U32 value );
+BOOL testResetValvesStatesPublishIntervalOverride( void );
 BOOL testSetValveStateOverride( U32 valve, F32 state );
 BOOL testResetValveStateOverride( U32 valveID );