Index: firmware/App/Modes/BalancingChamber.c
===================================================================
diff -u -r015acf2ae3ec46adbdd2f1028f01831418f1733d -rf49295a21525d5d1b88ec52eb4fcac72e7a526b7
--- firmware/App/Modes/BalancingChamber.c	(.../BalancingChamber.c)	(revision 015acf2ae3ec46adbdd2f1028f01831418f1733d)
+++ firmware/App/Modes/BalancingChamber.c	(.../BalancingChamber.c)	(revision f49295a21525d5d1b88ec52eb4fcac72e7a526b7)
@@ -379,10 +379,10 @@
     if ( FALSE == getBalChamberSwitchingOnlyStatus() )
     {
         // start acid and bicarb pump with the expected quantity
-        setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONCENTRATE_PUMP_MAX_SPEED, TEST_ACID_VOLUME_ML );
-        setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONCENTRATE_PUMP_MAX_SPEED, TEST_BICARB_VOLUME_ML );
-        requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
+        setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, TEST_ACID_VOLUME_ML );
+        setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, TEST_BICARB_VOLUME_ML );
+        requestConcentratePumpOn( D11_PUMP );
+        requestConcentratePumpOn( D10_PUMP );
     }
 
     // On triggering of dosing, transition to next state based on the current switching state
@@ -434,8 +434,8 @@
         valveControlForBCState1FillEnd();
 
         //Stop the concentrate pumps
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
+        requestConcentratePumpOff( D11_PUMP, NO_PARK_CONC_PUMPS );
+        requestConcentratePumpOff( D10_PUMP, NO_PARK_CONC_PUMPS );
     }
 
     // On completion of cycle time, transition to next state
@@ -539,8 +539,8 @@
         valveControlForBCState2FillEnd();
 
         //Stop the concentrate pumps
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
+        requestConcentratePumpOff( D11_PUMP, NO_PARK_CONC_PUMPS );
+        requestConcentratePumpOff( D10_PUMP, NO_PARK_CONC_PUMPS );
     }
 
     // On completion of cycle time, transition to next state