Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -re0c913b397af3122889433d855c5c5fb328f9865 -re9deced3b66bd69f32293144dbf6e3f21d5258ca
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision e0c913b397af3122889433d855c5c5fb328f9865)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision e9deced3b66bd69f32293144dbf6e3f21d5258ca)
@@ -536,8 +536,8 @@
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
             // start acid and bicarb pump with the expected quantity
-            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
-            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
+            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, acidVolume );
+            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, bicarbVolume );
             requestConcentratePumpOn( D11_PUMP );
             requestConcentratePumpOn( D10_PUMP );
         }
@@ -750,8 +750,8 @@
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
             // start acid and bicarb pump with the expected quantity
-            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
-            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
+            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, acidVolume );
+            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, bicarbVolume );
             requestConcentratePumpOn( D11_PUMP );
             requestConcentratePumpOn( D10_PUMP );
         }
Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rf6b5a627c4f735ea5f425e0804defded0d6ed224 -re9deced3b66bd69f32293144dbf6e3f21d5258ca
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision f6b5a627c4f735ea5f425e0804defded0d6ed224)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision e9deced3b66bd69f32293144dbf6e3f21d5258ca)
@@ -590,7 +590,7 @@
         }
         else
         {
-            pumpTargetSpeed[ pumpId ].data = DOSING_CONCENTRATE_PUMP_MAX_SPEED;
+            pumpTargetSpeed[ pumpId ].data = DOSING_CONCENTRATE_PUMP_SPEED;
         }
     }
     else
@@ -1427,7 +1427,7 @@
             {
                 // Handle start command
                 if ( ( TRUE == payload.startStop ) &&
-                      ( ( payload.speed >= CONCENTRATE_PUMP_MIN_SPEED ) && ( payload.speed <= DOSING_CONCENTRATE_PUMP_MAX_SPEED ) ) &&
+                      ( ( payload.speed >= CONCENTRATE_PUMP_MIN_SPEED ) && ( payload.speed <= DOSING_CONCENTRATE_PUMP_SPEED ) ) &&
                       ( payload.volume > 0.0 ) )
                 {
                     setConcentratePumpTargetSpeed( (CONCENTRATE_PUMPS_T)payload.pumpID, payload.speed, payload.volume );
Index: firmware/App/Controllers/ConcentratePumps.h
===================================================================
diff -u -rf6b5a627c4f735ea5f425e0804defded0d6ed224 -re9deced3b66bd69f32293144dbf6e3f21d5258ca
--- firmware/App/Controllers/ConcentratePumps.h	(.../ConcentratePumps.h)	(revision f6b5a627c4f735ea5f425e0804defded0d6ed224)
+++ firmware/App/Controllers/ConcentratePumps.h	(.../ConcentratePumps.h)	(revision e9deced3b66bd69f32293144dbf6e3f21d5258ca)
@@ -32,8 +32,8 @@
 // ********** public definitions **********
 // For 150 RPM, Diener pump delivers 60ml/min
 #define CONCENTRATE_PUMP_MAX_SPEED              200.0F              ///< Maximum Diener pump speed for concentrate pump in mL/min
-#define DOSING_CONCENTRATE_PUMP_MAX_SPEED       60.0F               ///< Maximum Diener pump speed for concentrate pump in mL/min
-#define DRAIN_CONCENTRATE_PUMP_MAX_SPEED        200.0F              ///< Maximum Diener pump speed for concentrate pump in mL/min
+#define DOSING_CONCENTRATE_PUMP_SPEED           60.0F               ///< Diener pump speed for acid and bicarb dosing pump speed in mL/min
+#define DRAIN_BICART_PUMP_SPEED                 200.0F              ///< Diener pump speed for cartridge drains at maximum speed in mL/min 
 
 #define DEFAULT_ACID_VOLUME_ML                  0.67F               ///< Acid concentrate volume in ml.
 #define DEFAULT_BICARB_VOLUME_ML                1.15F               ///< Bicarb concentrate volume in ml.
Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -rae350bdf4c84996718c02b337afdf92b29f00122 -re9deced3b66bd69f32293144dbf6e3f21d5258ca
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision ae350bdf4c84996718c02b337afdf92b29f00122)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision e9deced3b66bd69f32293144dbf6e3f21d5258ca)
@@ -688,17 +688,17 @@
     // TODO: open iofp drain valve
     setValveState( M12_VALV, VALVE_STATE_OPEN );
 
-    // Open balancing chamber pressure valves
+    // Open balancing chamber valves
     valveControlForBCOpenState();
 
     //Close D14 valve
     setValveState( D14_VALV, VALVE_STATE_CLOSED );
 
     // Run D10 In Open loop mode(max speed 200ml/min)
-    setConcentratePumpTargetSpeed( D10_PUMP, DRAIN_CONCENTRATE_PUMP_MAX_SPEED, DOSING_CONT_VOLUME );
+    setConcentratePumpTargetSpeed( D10_PUMP, DRAIN_BICART_PUMP_SPEED, DOSING_CONT_VOLUME );
     requestConcentratePumpOn( D10_PUMP );
 
-    // Run D48, 2300 rpm
+    // Run D48 at 2300 rpm
     setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, TRUE );
 
     dryBiCartDrainStartTime          = getMSTimerCount();
Index: firmware/App/Controllers/SpentChamberFill.c
===================================================================
diff -u -rf6b5a627c4f735ea5f425e0804defded0d6ed224 -re9deced3b66bd69f32293144dbf6e3f21d5258ca
--- firmware/App/Controllers/SpentChamberFill.c	(.../SpentChamberFill.c)	(revision f6b5a627c4f735ea5f425e0804defded0d6ed224)
+++ firmware/App/Controllers/SpentChamberFill.c	(.../SpentChamberFill.c)	(revision e9deced3b66bd69f32293144dbf6e3f21d5258ca)
@@ -228,8 +228,8 @@
         //Valve control for state 1 spent chamber fill
         valveControlForSCFillState1FillStart();
         // start acid and bicarb pump with the expected quantity
-        setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, acidDoseVolume );
-        setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, bicarbDoseVolume );
+        setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, acidDoseVolume );
+        setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, bicarbDoseVolume );
         requestConcentratePumpOn( D11_PUMP );
         requestConcentratePumpOn( D10_PUMP );
 
@@ -317,8 +317,8 @@
         // Valve control for state 2 fill
         valveControlForSCFillState2FillStart();
         // start acid and bicarb pump with the expected quantity
-        setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, acidDoseVolume );
-        setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, bicarbDoseVolume );
+        setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, acidDoseVolume );
+        setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, bicarbDoseVolume );
         requestConcentratePumpOn( D11_PUMP );
         requestConcentratePumpOn( D10_PUMP );