Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r72ba5f3c63325b00306b544b2513c03500919d06 -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 72ba5f3c63325b00306b544b2513c03500919d06)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d)
@@ -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;
 
@@ -889,6 +889,7 @@
             break;
 
         case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
+            handleHDRequestDGUsageInfo( message );
             break;
 
         // NOTE: This case must be last
@@ -943,16 +944,16 @@
                 handleTestROMeasuredFlowOverrideRequest( message );
                 break;
 
-            case MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
-                handleTestDialysateMeasuredFlowOverrideRequest( message );
+            case MSG_ID_MEASURED_FLOW_SENSORS_OVERRIDE:
+                handleTestMeasuredFlowOverrideRequest( 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: