Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r60e80a201562fb3979eb37d0efaddb6db4e6726a -rbc79ea1fc44ed327da7efcca54af9db15b8c88cd
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 60e80a201562fb3979eb37d0efaddb6db4e6726a)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision bc79ea1fc44ed327da7efcca54af9db15b8c88cd)
@@ -171,8 +171,8 @@
         stopConcentratePump( pumpId );
     }
 
-    initPersistentAlarm( ALARM_ID_CP1_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
-    initPersistentAlarm( ALARM_ID_CP2_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_DG_CP1_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
+    initPersistentAlarm( ALARM_ID_DG_CP2_SPEED_CONTROL_ERROR, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD, CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS, CONCENTRATE_PUMP_HALL_SENSORS_OUT_OF_RANGE_TIME_MS );
     initPersistentAlarm( ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS, CONENTREATE_PUMP_PARK_FAULT_TIMEOUT_MS );
@@ -219,7 +219,7 @@
         }
         else
         {
-            resetPersistentAlarmTimer( ALARM_ID_CP1_SPEED_CONTROL_ERROR );
+            resetPersistentAlarmTimer( ALARM_ID_DG_CP1_SPEED_CONTROL_ERROR );
         }
     }
 
@@ -232,7 +232,7 @@
         }
         else
         {
-            resetPersistentAlarmTimer( ALARM_ID_CP2_SPEED_CONTROL_ERROR );
+            resetPersistentAlarmTimer( ALARM_ID_DG_CP2_SPEED_CONTROL_ERROR );
         }
     }
 
@@ -241,8 +241,8 @@
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONC_PUMPS_SPEED_ALARM ) != SW_CONFIG_ENABLE_VALUE )
 #endif
     {
-        monitorPumpSpeed( CONCENTRATEPUMPS_CP1_ACID, ALARM_ID_CP1_SPEED_CONTROL_ERROR );
-        monitorPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB, ALARM_ID_CP2_SPEED_CONTROL_ERROR );
+        monitorPumpSpeed( CONCENTRATEPUMPS_CP1_ACID, ALARM_ID_DG_CP1_SPEED_CONTROL_ERROR );
+        monitorPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB, ALARM_ID_DG_CP2_SPEED_CONTROL_ERROR );
     }
 
 #ifndef _RELEASE_