Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r863f8f88c73ee5dd285242f6e131a14862b4f5c4 -r410afd26b3ae5e372310c696c82f58c59235e10d
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 410afd26b3ae5e372310c696c82f58c59235e10d)
@@ -17,7 +17,7 @@
 
 //#include <math.h>
 
-#include "FlowSensor.h"
+#include "Flow.h"
 //#include "NVDataMgmt.h"
 #include "Messaging.h"
 #include "MessageSupport.h"
@@ -171,7 +171,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_PUMP_DUTY_CYCLE_SELECTED, roPumpState )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, roPumpState )
             roPumpState = RO_PUMP_OFF_STATE;
             break;
     }
@@ -371,7 +371,7 @@
     // Requested flow rate is out of range
     else
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_PUMP_INVALID_FLOW_RATE_SET, roFlowRate )
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_PUMP_INVALID_FLOW_RATE_SET, roFlowRate )
     }
 
     return result;
@@ -414,7 +414,7 @@
     // Requested flow rate is out of range
     else
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_PUMP_INVALID_PRESSURE_SELECTED, roPressure )
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_PUMP_INVALID_PRESSURE_SELECTED, roPressure )
     }
 
     return result;
@@ -455,7 +455,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_RO_INVALID_PUMP_DUTY_CYCLE_SELECTED, dutyCycle )
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, dutyCycle )
     }
 
     return status;
@@ -602,7 +602,7 @@
         pumpData.p12TargetFlow          = getTargetROPumpFlowRateMLPM();
         pumpData.p12TargetDutyCycle     = roPumpOpenLoopTargetDutyCycle;
 
-        broadcastData( MSG_ID_FP_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) );
+        broadcastData( MSG_ID_FP_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) );
         roPumpDataPublicationTimerCounter = 0;
     }
 }