Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rfc11115c26447a2da7b12f5f38ff0d4af06c579b -r1f1b53030a930c542646d9d88c7db0c3a945f150
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision fc11115c26447a2da7b12f5f38ff0d4af06c579b)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 1f1b53030a930c542646d9d88c7db0c3a945f150)
@@ -32,7 +32,6 @@
 #include "NVDataMgmt.h"
 #include "Reservoirs.h"
 #include "ROPump.h"
-#include "DialysateFlow.h"
 #include "Switches.h"
 #include "TemperatureSensors.h"
 #include "Thermistors.h"
@@ -95,7 +94,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 +106,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 );
 
@@ -167,6 +163,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
@@ -200,17 +199,14 @@
 // MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
 void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message );
 
-// MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
-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 );