Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r0c1f66a170a3a0a4324fa1a3c3bfb4c7f77139b5 -rb1dc3df084a8517ca1575bdbf741fecd96d56a12
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 0c1f66a170a3a0a4324fa1a3c3bfb4c7f77139b5)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision b1dc3df084a8517ca1575bdbf741fecd96d56a12)
@@ -115,13 +115,13 @@
 
     concentratePumpMonitorTimerCounter = 0;
 
-    concentratePumps[ CONCENTRATEPUMPS_CP1 ].control      = &setFPGACP1Control;
-    concentratePumps[ CONCENTRATEPUMPS_CP1 ].setStepSpeed = &setFPGACP1SetStepSpeed;
+    concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].control      = &setFPGACP1Control;
+    concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].setStepSpeed = &setFPGACP1SetStepSpeed;
 
-    concentratePumps[ CONCENTRATEPUMPS_CP2 ].control      = &setFPGACP2Control;
-    concentratePumps[ CONCENTRATEPUMPS_CP2 ].setStepSpeed = &setFPGACP2SetStepSpeed;
+    concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].control      = &setFPGACP2Control;
+    concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].setStepSpeed = &setFPGACP2SetStepSpeed;
 
-    for ( pumpId = CONCENTRATEPUMPS_CP1; pumpId < NUM_OF_CONCENTRATE_PUMPS; ++pumpId )
+    for ( pumpId = CONCENTRATEPUMPS_CP1_ACID; pumpId < NUM_OF_CONCENTRATE_PUMPS; ++pumpId )
     {
         concentratePumps[ pumpId ].controlTimerCounter = 0;
         concentratePumps[ pumpId ].execState = CONCENTRATE_PUMP_OFF_STATE;
@@ -149,16 +149,16 @@
     {
         CONCENTRATE_PUMP_DATA_T data;
 
-        calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP1, getFPGACP1HallSensePulseWidth() );
-        calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP2, getFPGACP2HallSensePulseWidth() );
+        calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP1_ACID, getFPGACP1HallSensePulseWidth() );
+        calcMeasuredPumpsSpeed( CONCENTRATEPUMPS_CP2_BICARB, getFPGACP2HallSensePulseWidth() );
 
-        data.cp1CurrentSpeed = concentratePumps[ CONCENTRATEPUMPS_CP1 ].currentPumpSpeed;
-        data.cp1MeasuredSpeed = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1 );
-        data.cp2CurrentSpeed = concentratePumps[ CONCENTRATEPUMPS_CP2 ].currentPumpSpeed;
-        data.cp2MeasuredSpeed = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2 );
+        data.cp1CurrentSpeed = concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
+        data.cp1MeasuredSpeed = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID );
+        data.cp2CurrentSpeed = concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
+        data.cp2MeasuredSpeed = getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB );
 
-        F32 const cp1Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1 ) - concentratePumps[ CONCENTRATEPUMPS_CP1 ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP1 ].currentPumpSpeed;
-        F32 const cp2Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2 ) - concentratePumps[ CONCENTRATEPUMPS_CP2 ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP2 ].currentPumpSpeed;
+        F32 const cp1Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) - concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP1_ACID ].currentPumpSpeed;
+        F32 const cp2Error =  fabs( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) - concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed ) / concentratePumps[ CONCENTRATEPUMPS_CP2_BICARB ].currentPumpSpeed;
 
 #ifndef DISABLE_DIALYSATE_CHECK
         checkPersistentAlarm( ALARM_ID_CP1_SPEED_CONTROL_ERROR, cp1Error > CONCENTRATE_PUMP_ERROR_TOLERANCE, cp1Error, CONCENTRATE_PUMP_ERROR_TOLERANCE );
@@ -181,7 +181,7 @@
 {
     CONCENTRATE_PUMPS_T pumpId;
 
-    for ( pumpId = CONCENTRATEPUMPS_CP1; pumpId < NUM_OF_CONCENTRATE_PUMPS; ++pumpId )
+    for ( pumpId = CONCENTRATEPUMPS_CP1_ACID; pumpId < NUM_OF_CONCENTRATE_PUMPS; ++pumpId )
     {
         switch ( concentratePumps[ pumpId ].execState )
         {