Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r68b7f509295fb25aead139a4391913ca05989fdc -rcc9b6f5543a7523b2173eeb5c12e81916b3e1027
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 68b7f509295fb25aead139a4391913ca05989fdc)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision cc9b6f5543a7523b2173eeb5c12e81916b3e1027)
@@ -7,8 +7,8 @@
 *
 * @file    ConcentratePumps.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      22-Mar-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      07-Apr-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  22-Oct-2020
@@ -172,8 +172,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 );
@@ -220,7 +220,7 @@
         }
         else
         {
-            resetPersistentAlarmTimer( ALARM_ID_CP1_SPEED_CONTROL_ERROR );
+            resetPersistentAlarmTimer( ALARM_ID_DG_CP1_SPEED_CONTROL_ERROR );
         }
     }
 
@@ -233,7 +233,7 @@
         }
         else
         {
-            resetPersistentAlarmTimer( ALARM_ID_CP2_SPEED_CONTROL_ERROR );
+            resetPersistentAlarmTimer( ALARM_ID_DG_CP2_SPEED_CONTROL_ERROR );
         }
     }
 
@@ -242,8 +242,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_