Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rfc11115c26447a2da7b12f5f38ff0d4af06c579b -r1f1b53030a930c542646d9d88c7db0c3a945f150
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fc11115c26447a2da7b12f5f38ff0d4af06c579b)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1f1b53030a930c542646d9d88c7db0c3a945f150)
@@ -876,7 +876,7 @@
             handleDGPOSTResultRequest( message );
             break;
 
-        case MSG_ID_UI_REQUEST_SERVICE_INFO:
+        case MSG_ID_HD_REQUEST_DG_SERVICE_RECORD:
             handleDGServiceScheduleRequest( message );
             break;
 
@@ -893,6 +893,7 @@
             break;
 
         case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
+            handleHDRequestDGUsageInfo( message );
             break;
 
         // NOTE: This case must be last
@@ -943,20 +944,16 @@
                 handleTestPressureDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
-                handleTestROMeasuredFlowOverrideRequest( message );
+            case MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE:
+                handleTestMeasuredFlowOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
-                handleTestDialysateMeasuredFlowOverrideRequest( message );
-                break;
-
             case MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
                 handleTestROPumpDataBroadcastIntervalOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
-                handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( message );
+            case MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( message );
                 break;
 
             case MSG_ID_DRAIN_PUMP_SET_RPM:
@@ -1067,10 +1064,6 @@
                 handleTestROPumpDutyCycleOverride( message );
                 break;
 
-            case MSG_ID_DG_RO_FLOW_RATE_OVERRIDE:
-                handleTestROMeasuredFlowOverrideRequest( message );
-                break;
-
             case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW:
                 handleTestROPumpTargetFlowOverride( message );
                 break;