Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r184ee0c5527af35d34c29bd4f80cf8b1959ffd35 -re0413e662822f3ccc8b4fe9d969efef7eedb05ad
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 184ee0c5527af35d34c29bd4f80cf8b1959ffd35)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision e0413e662822f3ccc8b4fe9d969efef7eedb05ad)
@@ -7,8 +7,8 @@
 *
 * @file    ModeStandby.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Feb-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      01-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -268,7 +268,7 @@
         data.countdown = data.timeout - ( calcTimeSince( filterFlushStartTime ) / MS_PER_SECOND );
         filterFlushPublishTimerCounter = 0;
 
-        broadcastData( MSG_ID_DG_FILTER_FLUSH_PROGRESS, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( STANDBY_MODE_DATA_T ) );
+        broadcastData( MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( STANDBY_MODE_DATA_T ) );
     }
 
     if ( TRUE == endSampleWaterRequest )
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r184ee0c5527af35d34c29bd4f80cf8b1959ffd35 -re0413e662822f3ccc8b4fe9d969efef7eedb05ad
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 184ee0c5527af35d34c29bd4f80cf8b1959ffd35)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision e0413e662822f3ccc8b4fe9d969efef7eedb05ad)
@@ -8,7 +8,7 @@
 * @file    OperationModes.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      06-Feb-2023
+* @date    (last)      01-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -400,7 +400,7 @@
         data.currentMode    = (U32)currentMode;
         data.currentSubMode = currentSubMode;
 
-        broadcastData( MSG_ID_DG_OP_MODE, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( OP_MODES_DATA_T ) );
+        broadcastData( MSG_ID_DG_OP_MODE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( OP_MODES_DATA_T ) );
 
         dataPublishCounter = 0;
     }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r2e56064726838bfb626ec3ea40132c4e3681639a -re0413e662822f3ccc8b4fe9d969efef7eedb05ad
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2e56064726838bfb626ec3ea40132c4e3681639a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision e0413e662822f3ccc8b4fe9d969efef7eedb05ad)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      13-Feb-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      17-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -816,60 +816,60 @@
             handleAlarmClear( message );
             break;
 
-        case MSG_ID_RTC_EPOCH:
+        case MSG_ID_RTC_EPOCH_DATA:
             handleRTCSyncFromHD( message );
             break;
 
         case MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS:
             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:
+        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:
+        case MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST:
             handleStartStopDGFlush( message );
             break;
 
-        case MSG_ID_DG_START_STOP_HEAT_DISINFECT:
+        case MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST:
             handleStartStopDGHeatDisinfect( message );
             break;
 
@@ -889,31 +889,31 @@
             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 );
+        case MSG_ID_HD_DG_SERVICE_MODE_REQUEST:
+            handleServiceModeRequest( message );
             break;
 
-        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
-            handleServiceModeRequest( message );
+        case MSG_ID_HD_DG_USAGE_INFO_REQUEST:
+            handleHDRequestDGUsageInfo( message );
             break;
 
-        case MSG_ID_DG_SET_SERVICE_TIME:
+        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_HD_REQUEST_DG_ALARMS:
+        case MSG_ID_HD_DG_ALARMS_REQUEST:
             handleResendAllAlarmsCommand( message );
             break;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd731f3fda9d25e0d63100f648510e9c8cdd21f89 -re0413e662822f3ccc8b4fe9d969efef7eedb05ad
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d731f3fda9d25e0d63100f648510e9c8cdd21f89)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e0413e662822f3ccc8b4fe9d969efef7eedb05ad)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      15-Feb-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      08-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -484,7 +484,7 @@
 
     // create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_VERSION;
+    msg.hdr.msgID = MSG_ID_DG_VERSION_REPONSE;
     msg.hdr.payloadLen = sizeof( DG_VERSIONS_T );
 
     if ( message->hdr.payloadLen == sizeof( U08 ) + sizeof( U08 ) + sizeof( U08 ) + sizeof( U16 ) + sizeof( U32 ) )
@@ -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;