Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -re48bec7b1330b195afadcbf8bc58bdb4f1d5b03e -rf6b5a627c4f735ea5f425e0804defded0d6ed224
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision e48bec7b1330b195afadcbf8bc58bdb4f1d5b03e)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision f6b5a627c4f735ea5f425e0804defded0d6ed224)
@@ -42,7 +42,7 @@
 #define BAL_CHAMBER_DATA_PUBLISH_INTERVAL               ( 250 / TASK_GENERAL_INTERVAL )                                 ///< Interval (ms/task time) at which the balancing chamber data published.
 #define BAL_CHAMBER_FILL_PRES_DROP_MS                   ( 200 / TASK_GENERAL_INTERVAL )                                 ///< Time (ms/tasktime) to confirm the balancing chamber filling started and corresponding valves opened.
 #define BAL_CHAMBER_FILL_COMPLETE_MS                    ( 300 / TASK_GENERAL_INTERVAL )                                 ///< Time (ms/tasktime) to confirm the balancing chamber fill completed and pressure is within range
-#define BAL_CHAMBER_BICARB_CHAMBER_FILL_TIMEOUT_COUNT   ( 1 * SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request.
+#define BICARB_CHAMBER_PERIODIC_FILL_TIME               ( 1 * SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request 60 sec x 20 = 1200
 
 /// Payload record structure for balancing chamber switch only request
 typedef struct
@@ -75,7 +75,7 @@
 static F32 spentDialPressure;                                                                   ///< Spent side dialysate pressure
 
 #ifdef __DRY_BICARB__
-static U32 dryBiCarbChamberFillTimeoutCount;                                                    ///< Counter for checking the timeout for drybicart chamber fill request.
+static U32 bicarbChamberPeriodicFillCounter;                                                    ///< Counter for checking the timeout for drybicart chamber fill request.
 #endif
 
 // ********** private function prototypes **********
@@ -132,7 +132,7 @@
     freshDialPressure                           = 0.0F;
     spentDialPressure                           = 0.0F;
 #ifdef __DRY_BICARB__
-    dryBiCarbChamberFillTimeoutCount            = 0;
+    bicarbChamberPeriodicFillCounter            = 0;
 #endif
 }
 
@@ -203,12 +203,12 @@
 
 #ifdef __DRY_BICARB__
     //Increment counter for dry bicarb chamber fill
-    dryBiCarbChamberFillTimeoutCount += 1;
+    bicarbChamberPeriodicFillCounter += 1;
     // Fill bicarb chamber once every 60secs.
-    if ( dryBiCarbChamberFillTimeoutCount >= BAL_CHAMBER_BICARB_CHAMBER_FILL_TIMEOUT_COUNT)
+    if ( bicarbChamberPeriodicFillCounter >= BICARB_CHAMBER_PERIODIC_FILL_TIME )
     {
         setBicarbChamberFillRequested();
-        dryBiCarbChamberFillTimeoutCount = 0;
+        bicarbChamberPeriodicFillCounter = 0;
     }
 #endif
 
@@ -536,8 +536,8 @@
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
             // start acid and bicarb pump with the expected quantity
-            setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
-            setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
+            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
+            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_MAX_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, CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
-            setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
+            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
+            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
             requestConcentratePumpOn( D11_PUMP );
             requestConcentratePumpOn( D10_PUMP );
         }