Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -r1abaeb395cb7ffb2cb0ea9c1ba65c353d9c416f8 -r2fea76e972a450a97c74b2a9f627095032a3b586
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 1abaeb395cb7ffb2cb0ea9c1ba65c353d9c416f8)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 2fea76e972a450a97c74b2a9f627095032a3b586)
@@ -145,12 +145,10 @@
                             DRAIN_PUMP_MIN_DAC, DRAIN_PUMP_MAX_DAC );
 
     // Initialize the persistent alarm for open loop RPM out of range
-    initPersistentAlarm( PERSISTENT_ALARM_DRAIN_PUMP_RPM_OUT_OF_RANGE, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, TRUE,
-                         OPEN_LOOP_RPM_OUT_OF_RANGE_TIME_OUT, OPEN_LOOP_RPM_OUT_OF_RANGE_TIME_OUT );
+    initPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, OPEN_LOOP_RPM_OUT_OF_RANGE_TIME_OUT, OPEN_LOOP_RPM_OUT_OF_RANGE_TIME_OUT );
 
     // Initialize the persistent alarm for RPM not to be less than the min RPM when the pump is off
-    initPersistentAlarm( PERSISTENT_ALARM_DRAIN_PUMP_OFF_ERROR, ALARM_ID_DRAIN_PUMP_OFF_FAULT, TRUE,
-                         SAFETY_SHUTDOWN_TIMEOUT, SAFETY_SHUTDOWN_TIMEOUT );
+    initPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, SAFETY_SHUTDOWN_TIMEOUT, SAFETY_SHUTDOWN_TIMEOUT );
 }
 
 /*********************************************************************//**
@@ -265,15 +263,15 @@
         // Check if RPM is out of range. Using fabs since the read RPM can be above or below the target.
         BOOL isRPMOutOfRange = fabs( targetRPM - currentDrainPumpRPM ) > threshold;
 
-        checkPersistentAlarm( PERSISTENT_ALARM_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, currentDrainPumpRPM, threshold );
+        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE, isRPMOutOfRange, currentDrainPumpRPM, threshold );
     }
 
     // Check if the pump is in off state and the RPM is greater than the minimum RPM
     if ( drainPumpState == DRAIN_PUMP_OFF_STATE )
     {
         BOOL isRPMTooHigh = currentDrainPumpRPM > MIN_DRAIN_PUMP_RPM;
 
-        checkPersistentAlarm( PERSISTENT_ALARM_DRAIN_PUMP_OFF_ERROR, isRPMTooHigh, currentDrainPumpRPM, MIN_DRAIN_PUMP_RPM );
+        checkPersistentAlarm( ALARM_ID_DRAIN_PUMP_OFF_FAULT, isRPMTooHigh, currentDrainPumpRPM, MIN_DRAIN_PUMP_RPM );
 
         // If the off fault alarm has become active, trigger the safety shutdown
         if ( isAlarmActive( ALARM_ID_DRAIN_PUMP_OFF_FAULT ) )