Index: firmware/App/Drivers/CPLD.c
===================================================================
diff -u -r6499ea25921fcf67826fa0c35bb03caf411ba542 -r0565c9c592a8b78978157e805269f5900f9636ce
--- firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 6499ea25921fcf67826fa0c35bb03caf411ba542)
+++ firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision 0565c9c592a8b78978157e805269f5900f9636ce)
@@ -226,7 +226,7 @@
 void broadcastCPLDStatus( void )
 {
     getCPLDStatus( &cpldStatus );
-    broadcastData( MSG_ID_DG_CPLD_STATUS, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&cpldStatus, sizeof( CPLD_STATUS_T ) );
+    broadcastData( MSG_ID_DG_CPLD_STATUS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&cpldStatus, sizeof( CPLD_STATUS_T ) );
 }
 
 /**@}*/
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r0565c9c592a8b78978157e805269f5900f9636ce
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0565c9c592a8b78978157e805269f5900f9636ce)
@@ -309,7 +309,7 @@
 
         data.safetyShutdownStatus = (U32)isSafetyShutdownActivated();
 
-        broadcastData( MSG_ID_DG_ALARM_INFO, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) );
+        broadcastData( MSG_ID_DG_ALARM_INFO_DATA, COMM_BUFFER_OUT_CAN_DG_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) );
         broadcastCPLDStatus();
         alarmInfoPublicationTimerCounter = 0;
     }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r0968c8cabe4a8185a5fc28870c6475c3d581561f -r0565c9c592a8b78978157e805269f5900f9636ce
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0968c8cabe4a8185a5fc28870c6475c3d581561f)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0565c9c592a8b78978157e805269f5900f9636ce)
@@ -824,52 +824,52 @@
             handleSetDialysateTemperatureCmd( message );
             break;
 
-        case MSG_ID_REQUEST_FW_VERSIONS:
+        case MSG_ID_FW_VERSIONS_REQUEST:
             handleFWVersionCmd( message );
             handleDGSerialNumberRequest();
             break;
 
-        case MSG_ID_DG_SWITCH_RESERVOIR_CMD:
+        case MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST:
             handleSwitchReservoirCmd( message );
             break;
 
-        case MSG_ID_DG_CHANGE_VALVE_SETTING_CMD:
+        case MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST:
             handleChangeValveSettingCmd( message );
             break;
 
-        case MSG_ID_DG_FILL_CMD:
+        case MSG_ID_DG_FILL_CMD_REQUEST:
             handleFillCmd( message );
             break;
 
-        case MSG_ID_DG_DRAIN_CMD:
+        case MSG_ID_DG_DRAIN_CMD_REQUEST:
             handleDrainCmd( message );
             break;
 
         case MSG_ID_HD_OP_MODE_DATA:
             handleSetHDOperationMode( message );
             break;
 
-        case MSG_ID_STARTING_STOPPING_TREATMENT_CMD:
+        case MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST:
             handleStartStopTreatmentMsg( message );
             break;
 
-        case MSG_ID_DG_SAMPLE_WATER_CMD:
+        case MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST:
             handleSampleWaterCmd( message );
             break;
 
-        case MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD:
+        case MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST:
             handleHDStartStopTrimmerHeaterCmd( message );
             break;
 
         case MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD:
             handleDGStartStopTrimmerHeater( message );
             break;
 
-        case MSG_ID_DG_START_STOP_FLUSH_CMD:
+        case MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST:
             handleStartStopDGFlush( message );
             break;
 
-        case MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD:
+        case MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST:
             handleStartStopDGHeatDisinfect( message );
             break;
 
@@ -889,35 +889,39 @@
             handleDGPOSTResultRequest( message );
             break;
 
-        case MSG_ID_HD_REQUEST_DG_SERVICE_RECORD:
+        case MSG_ID_HD_DG_SERVICE_RECORD_REQUEST:
             handleDGServiceScheduleRequest( message );
             break;
 
-        case MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS:
+        case MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST:
             handleDGSendConcentrateMixingRatios( message );
             break;
 
         case MSG_ID_HD_REQUEST_DG_USAGE_INFO:
             handleHDRequestDGUsageInfo( message );
             break;
 
-        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
+        case MSG_ID_HD_DG_SERVICE_MODE_REQUEST:
             handleServiceModeRequest( message );
             break;
 
-        case MSG_ID_DG_SET_SERVICE_TIME:
+        case MSG_ID_HD_DG_USAGE_INFO_REQUEST:
+            handleHDRequestDGUsageInfo( message );
+            break;
+
+        case MSG_ID_DG_SET_SERVICE_TIME_REQUEST:
             handleSetDGServiceTime( message );
             break;
 
         case MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL:
             handleStartStopDGHeatDisinfectActiveCool( message );
             break;
 
-        case MSG_ID_REQUEST_CPLD_STATUS:
+        case MSG_ID_CPLD_STATUS_REQUEST:
             handleCpldStatusRequest( message );
             break;
 
-        case MSG_ID_HD_REQUEST_DG_ALARMS:
+        case MSG_ID_HD_DG_ALARMS_REQUEST:
             handleResendAllAlarmsCommand( message );
             break;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r0968c8cabe4a8185a5fc28870c6475c3d581561f -r0565c9c592a8b78978157e805269f5900f9636ce
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0968c8cabe4a8185a5fc28870c6475c3d581561f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0565c9c592a8b78978157e805269f5900f9636ce)
@@ -526,7 +526,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_SERIAL_NUMBER;
+    msg.hdr.msgID = MSG_ID_DG_SERIAL_NUMBER_RESPONSE;
 
     // Add 1 byte for null terminator
     msg.hdr.payloadLen = MAX_TOP_LEVEL_SN_CHARS + 1;
@@ -1676,7 +1676,7 @@
     getCPLDStatus( &payload );
     // create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_CPLD_STATUS;
+    msg.hdr.msgID = MSG_ID_DG_CPLD_STATUS_DATA;
     msg.hdr.payloadLen = sizeof( CPLD_STATUS_T );
 
     // fill message payload