Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r228773fa681489a62db5c47807a4794e5761d4f5 -ra0c144ed9f72066d7a7b1d047b01fb76ca56d667
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 228773fa681489a62db5c47807a4794e5761d4f5)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision a0c144ed9f72066d7a7b1d047b01fb76ca56d667)
@@ -163,7 +163,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, roPumpState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, roPumpState )
             roPumpState = RO_PUMP_OFF_STATE;
             break;
     }
@@ -399,7 +399,7 @@
     // Requested flow rate is out of range
     else
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_PUMP_INVALID_FLOW_RATE_SET, roFlowRate )
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_PUMP_INVALID_FLOW_RATE_SET, roFlowRate )
     }
 
     return result;
@@ -453,7 +453,7 @@
     // Requested flow rate is out of range
     else
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_PUMP_INVALID_PRESSURE_SELECTED, roPressure )
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_PUMP_INVALID_PRESSURE_SELECTED, roPressure )
     }
 
     return result;
@@ -515,7 +515,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, dutyCycle )
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, dutyCycle )
     }
 
     return result;