Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rd6b09c549d14f5f7fe08484bf0e882cadf2a892b -r1b95ae077de1d01a314be8cc011662ab508fba10
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision d6b09c549d14f5f7fe08484bf0e882cadf2a892b)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1b95ae077de1d01a314be8cc011662ab508fba10)
@@ -1104,8 +1104,8 @@
                 handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE:
-                handleTestDrainPumpRPMOverrideRequest( message );
+            case MSG_ID_DRAIN_PUMP_SET_RPM:
+                handleTestSetDrainPumpRPM( message );
                 break;
 
             case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
@@ -1292,6 +1292,10 @@
                 handleStopDGRTCClock( message );
                 break;
 
+            case MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE:
+                handleSetDrainPumpMeasuredRPMOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;