Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r72ba5f3c63325b00306b544b2513c03500919d06 -rcb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 72ba5f3c63325b00306b544b2513c03500919d06)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision cb4d35cc50df2d3cc9e828cd92e53cf456ca9b9d)
@@ -95,7 +95,7 @@
 // MSG_ID_REQUEST_FW_VERSIONS
 void handleDGSerialNumberRequest( void );
 
-// MSG_ID_UI_REQUEST_SERVICE_INFO
+// MSG_ID_HD_REQUEST_DG_SERVICE_RECORD
 void handleDGServiceScheduleRequest( MESSAGE_T *message );
 
 // MSG_ID_HD_REQUEST_DG_CONCENTRATE_RATIOS
@@ -107,9 +107,6 @@
 // MSG_ID_DG_CHANGE_VALVE_SETTING_CMD
 void handleChangeValveSettingCmd( MESSAGE_T *message );
 
-// MSG_ID_HD_REQUEST_DG_USAGE_INFO
-//void handleDGSend
-
 // MSG_ID_DG_FILL_CMD
 void handleFillCmd( MESSAGE_T *message );
 
@@ -161,6 +158,9 @@
 // MSG_ID_HD_OP_MODE
 BOOL handleSetHDOperationMode( MESSAGE_T *message );
 
+// MSG_ID_HD_REQUEST_DG_USAGE_INFO
+void handleHDRequestDGUsageInfo( MESSAGE_T * message );
+
 // *********** public test support message functions **********
 
 // MSG_TESTER_LOG_IN
@@ -198,13 +198,13 @@
 void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DIALYSATE_MEASURED_FLOW_OVERRIDE:
-void handleTestDialysateMeasuredFlowOverrideRequest( MESSAGE_T *message );
+void handleTestMeasuredFlowOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
 void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DIALYSATE_FLOW_SEND_INTERVAL_OVERRIDE:
-void handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
+void handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DRAIN_PUMP_SET_RPM_OVERRIDE
 void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message );