Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r1943944469d5a9f841f366ef9d8969c3072bd7ab -rfbc0a281b094ff309dcbf83db1878818a9b384f1
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1943944469d5a9f841f366ef9d8969c3072bd7ab)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision fbc0a281b094ff309dcbf83db1878818a9b384f1)
@@ -162,9 +162,6 @@
 // MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
-void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message );
-
 // MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
@@ -211,13 +208,13 @@
 void handleConcentratePumpPublishIntervalOverride( MESSAGE_T *message );
 
 // MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE
-void handleROPumpDutyCycleOverride( MESSAGE_T *message );
+void handleTestROPumpDutyCycleOverride( MESSAGE_T *message );
 
 // MSG_ID_DG_RO_FLOW_RATE_OVERRIDE
-void handleROFlowRateOverride( MESSAGE_T *message );
+void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message );
 
 // MSG_ID_DG_RO_PUMP_TARGET_FLOW_OVERRIDE
-void handleROPumpTargetFlowOverride( MESSAGE_T *message );
+void handleTestROPumpTargetFlowOverride( MESSAGE_T *message );
 
 // MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE
 void handleROPumpTargetPressureOverride( MESSAGE_T *message );