Index: firmware/App/Controllers/FluidLeak.c
===================================================================
diff -u -r6499ea25921fcf67826fa0c35bb03caf411ba542 -r747bf7a404dffc263c23540a064fe2eb5014f9f7
--- firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 6499ea25921fcf67826fa0c35bb03caf411ba542)
+++ firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 747bf7a404dffc263c23540a064fe2eb5014f9f7)
@@ -137,7 +137,7 @@
 
         data.fluidLeakState = (U32)getFluidLeakState();
 
-        broadcastData( MSG_ID_DG_FLUID_LEAK_STATE, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( FLUID_LEAK_DATA_T ) );
+        broadcastData( MSG_ID_DG_FLUID_LEAK_STATE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( FLUID_LEAK_DATA_T ) );
         fluidLeakStatePublicationTimerCounter = 0;
     }
 }
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r4c7ef2a9a07569d02844f58b74c4fbdc96a06999 -r747bf7a404dffc263c23540a064fe2eb5014f9f7
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 4c7ef2a9a07569d02844f58b74c4fbdc96a06999)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 747bf7a404dffc263c23540a064fe2eb5014f9f7)
@@ -281,7 +281,7 @@
         loadCellData.loadCellB2inGram = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_BACKUP );
 
         // Broadcast small filtered load cell data
-        broadcastData( MSG_ID_LOAD_CELL_READINGS, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&loadCellData, sizeof( LOAD_CELL_DATA_T ) );
+        broadcastData( MSG_ID_LOAD_CELL_READINGS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&loadCellData, sizeof( LOAD_CELL_DATA_T ) );
 
         loadCellDataPublicationTimerCounter = 0;
     }
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r6499ea25921fcf67826fa0c35bb03caf411ba542 -r747bf7a404dffc263c23540a064fe2eb5014f9f7
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 6499ea25921fcf67826fa0c35bb03caf411ba542)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 747bf7a404dffc263c23540a064fe2eb5014f9f7)
@@ -525,7 +525,7 @@
             data.valvesSensedState[ i ] = (U08)getValveStateName( (VALVES_T)i );
         }
 
-        broadcastData( MSG_ID_DG_VALVES_STATES, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( DG_VALVES_DATA_T ) );
+        broadcastData( MSG_ID_DG_VALVES_STATES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( DG_VALVES_DATA_T ) );
 
         valvesStatesPublicationTimerCounter = 0;
     }
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r56ba1b163b0cbf6953638065b2108f745b17ec8f -r747bf7a404dffc263c23540a064fe2eb5014f9f7
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 56ba1b163b0cbf6953638065b2108f745b17ec8f)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 747bf7a404dffc263c23540a064fe2eb5014f9f7)
@@ -270,7 +270,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 -r3603cf10bb798c6ccd50899383b1c42965a93cc9 -r747bf7a404dffc263c23540a064fe2eb5014f9f7
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 3603cf10bb798c6ccd50899383b1c42965a93cc9)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 747bf7a404dffc263c23540a064fe2eb5014f9f7)
@@ -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 -rb549cc9586c585902f891e1aac5e59b7de445f71 -r747bf7a404dffc263c23540a064fe2eb5014f9f7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b549cc9586c585902f891e1aac5e59b7de445f71)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 747bf7a404dffc263c23540a064fe2eb5014f9f7)
@@ -816,7 +816,7 @@
             handleAlarmClear( message );
             break;
 
-        case MSG_ID_RTC_EPOCH:
+        case MSG_ID_RTC_EPOCH_DATA:
             handleRTCSyncFromHD( message );
             break;
 
@@ -845,7 +845,7 @@
             handleDrainCmd( message );
             break;
 
-        case MSG_ID_HD_OP_MODE:
+        case MSG_ID_HD_OP_MODE_DATA:
             handleSetHDOperationMode( message );
             break;
 
@@ -865,11 +865,11 @@
             handleDGStartStopTrimmerHeater( message );
             break;
 
-        case MSG_ID_DG_START_STOP_FLUSH:
+        case MSG_ID_DG_START_STOP_FLUSH_CMD:
             handleStartStopDGFlush( message );
             break;
 
-        case MSG_ID_DG_START_STOP_HEAT_DISINFECT:
+        case MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD:
             handleStartStopDGHeatDisinfect( message );
             break;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r686acb428a08c632526ca35c8a0102ab22836bd0 -r747bf7a404dffc263c23540a064fe2eb5014f9f7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 686acb428a08c632526ca35c8a0102ab22836bd0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 747bf7a404dffc263c23540a064fe2eb5014f9f7)
@@ -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 ) )