Index: firmware/App/Controllers/PistonPumpControl.c
===================================================================
diff -u -r35d43df882155ef8b9174eb16c7021f06050433b -rf5baeac6a5f000705cd51e4779a967acf4088981
--- firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision 35d43df882155ef8b9174eb16c7021f06050433b)
+++ firmware/App/Controllers/PistonPumpControl.c	(.../PistonPumpControl.c)	(revision f5baeac6a5f000705cd51e4779a967acf4088981)
@@ -185,20 +185,20 @@
     {
         case PISTONPUMPS_ACID:
             // TODO : Valves assocaited to Acid concentrate Pumps
-            setValveState( VHO, inletValveState );
-            setValveState( VTD, outletValveState );
+            setValveState( D14_VALV, inletValveState );
+            setValveState( D52_VALV, outletValveState );
             break;
 
         case PISTONPUMPS_BICARB:
             // TODO: Valves assocaited to Bicarb concentrate Pumps
-            setValveState( VHB, inletValveState );
-            setValveState( VRP, outletValveState );
+            setValveState( D8_VALV, inletValveState );
+            setValveState( D54_VALV, outletValveState );
             break;
 
         case PISTONPUMPS_UF:
             // TODO: Valves assocaited to Ultrafilteration
-            setValveState( VDR, inletValveState );
-            setValveState( VDB2, outletValveState );
+            setValveState( D53_VALV, inletValveState );
+            setValveState( D34_VALV, outletValveState );
             break;
 
         default: