Index: firmware/App/Controllers/FluidLeak.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/FluidLeak.c	(.../FluidLeak.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -136,7 +136,7 @@
 
         data.fluidLeakState = (U32)getFluidLeakState();
 
-        broadcastData( MSG_ID_HD_FLUID_LEAK_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( FLUID_LEAK_DATA_T ) );
+        broadcastData( MSG_ID_HD_FLUID_LEAK_STATE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( FLUID_LEAK_DATA_T ) );
         fluidLeakStatePublicationTimerCounter = 0;
     }
 }
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -raa8b9687b9396b4878cf0d5327d72a5d67477761 -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision aa8b9687b9396b4878cf0d5327d72a5d67477761)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -2146,7 +2146,7 @@
         volData.syringePumpVolumeRequired = syringePumpVolumeRequired;
 
         broadcastData( MSG_ID_HD_SYRINGE_PUMP_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SYRINGE_PUMP_DATA_PAYLOAD_T ) );
-        broadcastData( MSG_ID_HD_HEPARIN_DATA_BROADCAST, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&volData, sizeof( SYRINGE_PUMP_VOLUME_DATA_T ) );
+        broadcastData( MSG_ID_HD_HEPARIN_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&volData, sizeof( SYRINGE_PUMP_VOLUME_DATA_T ) );
         syringePumpDataPublicationTimerCounter = 0;
     }
 }
Index: firmware/App/Modes/BloodPrime.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Modes/BloodPrime.c	(.../BloodPrime.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -296,7 +296,7 @@
         bloodPrimePublishTimerCtr = 0;
         data.targetBloodPrimeVolumeMl = bloodPrimeTargetVolume_mL;
         data.deliveredBloodPrimeVolumeMl = MAX( 0.0, getBloodPrimeVolume() );
-        broadcastData( MSG_ID_HD_BLOOD_PRIME_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( BLOOD_PRIME_DATA_PAYLOAD_T ) );
+        broadcastData( MSG_ID_HD_BLOOD_PRIME_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( BLOOD_PRIME_DATA_PAYLOAD_T ) );
     }
 }
 
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -208,7 +208,7 @@
         data.currentPostTreatmentState = (U32)currentPostTreatmentState;
         data.currentPostTxDrainState   = (U32)currentDrainReservoirState;
 
-        broadcastData( MSG_ID_HD_POST_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( POST_TREATMENT_STATE_DATA_T ) );
+        broadcastData( MSG_ID_HD_POST_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( POST_TREATMENT_STATE_DATA_T ) );
         postTreatmentPublishTimerCounter = 0;
     }
 
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rb3034747b23029d9ab2b63cf5029f0bf54cf7bb9 -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision b3034747b23029d9ab2b63cf5029f0bf54cf7bb9)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -594,7 +594,7 @@
         preTreatmentData.wetSelfTestsState        = getWetSelfTestState();
         preTreatmentData.preTreatmentRsrvrState   = currentReservoirMgmtState;
 
-        broadcastData( MSG_ID_PRE_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&preTreatmentData, sizeof( PRE_TREATMENT_STATE_DATA_T ) );
+        broadcastData( MSG_ID_PRE_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&preTreatmentData, sizeof( PRE_TREATMENT_STATE_DATA_T ) );
         preTreatmentPublishTimerCounter = 0;
     }
 }
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -re5d6674fbf4b6ddd8057385babac0a085ce18f42 -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e5d6674fbf4b6ddd8057385babac0a085ce18f42)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -1405,7 +1405,7 @@
             data.treatmentTimeElapsedinSec = elapsedTreatmentTimeInSecs;
             data.treatmentTimeRemaininginSec = presTreatmentTimeSecs - elapsedTreatmentTimeInSecs;
         }
-        broadcastData( MSG_ID_TREATMENT_TIME, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( TREATMENT_TIME_DATA_T ) );
+        broadcastData( MSG_ID_TREATMENT_TIME_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( TREATMENT_TIME_DATA_T ) );
         treatmentTimeBroadcastTimerCtr = 0;
     }
     // Broadcast treatment state data at interval
@@ -1424,7 +1424,7 @@
         payload.heparinState = getHeparinState();
         payload.dialysisState = getDialysisState();
 
-        broadcastData( MSG_ID_TREATMENT_STATE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( TREATMENT_STATE_DATA_T ) );
+        broadcastData( MSG_ID_TREATMENT_STATE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&payload, sizeof( TREATMENT_STATE_DATA_T ) );
         treatmentStateBroadcastTimerCtr = 0;
     }
 }
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r9576fd573a9dfefb502da5668841ea5f7fe072f1 -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 9576fd573a9dfefb502da5668841ea5f7fe072f1)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -423,7 +423,7 @@
         broadcastModeIntervalCtr = 0;
         data.opMode = (U32)currentMode;
         data.subMode = currentSubMode;
-        broadcastData( MSG_ID_HD_OP_MODE, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( OP_MODE_PAYLOAD_T ) );
+        broadcastData( MSG_ID_HD_OP_MODE_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( OP_MODE_PAYLOAD_T ) );
     }
 }
 
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -re5d6674fbf4b6ddd8057385babac0a085ce18f42 -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e5d6674fbf4b6ddd8057385babac0a085ce18f42)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -357,7 +357,7 @@
 
             data.timeout   = MAX_NO_CARTRIDGE_SELF_TEST_TIME;
             data.countdown = ( MAX_NO_CARTRIDGE_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
+            broadcastData( MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_NO_CARTRIDGE_PAYLOAD_T ) );
         }
         else
         {
@@ -526,7 +526,7 @@
 
             data.timeout   = MAX_DRY_SELF_TEST_TIME;
             data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-            broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
+            broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
         }
         else
         {
Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -r1f91b5a53bda942b0967817bbd5e68a499dbf816 -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 1f91b5a53bda942b0967817bbd5e68a499dbf816)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -491,7 +491,7 @@
         data.countdown = ( recircTimerCtr >= RECIRC_TIMEOUT ? 0 : ( RECIRC_TIMEOUT - recircTimerCtr ) / ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) );
 
         recircPublishTimerCtr = 0;
-        broadcastData( MSG_ID_HD_RECIRC_PROGRESS, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( TREATMENT_RECIRC_PAYLOAD_T ) );
+        broadcastData( MSG_ID_HD_RECIRC_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( TREATMENT_RECIRC_PAYLOAD_T ) );
     }
 }
 
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rceeba51c01b896855eb03ab81281a2b0f48c75d2 -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision ceeba51c01b896855eb03ab81281a2b0f48c75d2)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -1302,7 +1302,7 @@
         data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ]      = (U08)alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_RINSEBACK ];
         data.uiAlarmButtonBlocks[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ]  = (U08)alarmButtonBlockers[ ALARM_BUTTON_STATE_BLOCK_END_TREATMENT ];
 
-        broadcastData( MSG_ID_HD_ALARM_INFORMATION, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( ALARM_INFO_PAYLOAD_T ) );
+        broadcastData( MSG_ID_HD_ALARM_INFORMATION_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( ALARM_INFO_PAYLOAD_T ) );
         alarmInfoPublicationTimerCounter = 0;
     }
 }
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r2ef6269801df1d8323d807c4e56d39e129c8ad4b -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2ef6269801df1d8323d807c4e56d39e129c8ad4b)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -946,7 +946,7 @@
             handleUICheckIn( message );
             break;
 
-        case MSG_ID_LOAD_CELL_READINGS:
+        case MSG_ID_LOAD_CELL_READINGS_DATA:
             handleLoadCellReadingsFromDG( message );
             break;
 
@@ -962,7 +962,7 @@
             handleSalineBolusRequest( message );
             break;
 
-        case MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE:
+        case MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST:
             handleChangeUFSettingsConfirmation( message );
             break;
 
@@ -979,7 +979,7 @@
             handleHDSerialNumberRequest();
             break;
 
-        case MSG_ID_DG_VERSION:
+        case MSG_ID_DG_VERSION_REPONSE:
             handleDGVersionResponse( message );
             break;
 
@@ -995,7 +995,7 @@
             handleDialysateFlowData( message );
             break;
 
-        case MSG_ID_DG_OP_MODE:
+        case MSG_ID_DG_OP_MODE_DATA:
             handleDGOpMode( message );
             break;
 
@@ -1007,7 +1007,7 @@
             handleUIAlarmSilenceRequest( message );
             break;
 
-        case MSG_ID_UI_NEW_TREATMENT_PARAMS:
+        case MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST:
             handleTreatmentParametersFromUI( message );
             break;
 
@@ -1031,11 +1031,11 @@
             handleAlarmAudioVolumeSetCmd( message );
             break;
 
-        case MSG_ID_UI_SET_UF_VOLUME_PARAMETER:
+        case MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST:
             handleUFVolumeSetRequest( message );
             break;
 
-        case MSG_ID_UI_SAMPLE_WATER_CMD:
+        case MSG_ID_UI_SAMPLE_WATER_CMD_REQUEST:
             handleSampleWaterCmd( message );
             break;
 
@@ -1059,7 +1059,7 @@
             handleContinueToTreatmentCmd( message );
             break;
 
-        case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM:
+        case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST:
             handlePatientConnectionConfirmCmd( message );
             break;
 
@@ -1071,19 +1071,19 @@
             handlRinsebackCmd( message );
             break;
 
-        case MSG_ID_UI_RECIRC_CMD:
+        case MSG_ID_UI_RECIRC_CMD_REQUEST:
             handleTreatmentRecircCmd( message );
             break;
 
-        case MSG_ID_UI_TX_END_CMD:
+        case MSG_ID_UI_TX_END_CMD_REQUEST:
             handleTreatmentEndCmd( message );
             break;
 
         case MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM:
             handlePatientDisconnectionConfirmCmd( message );
             break;
 
-        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM:
+        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST:
             handleDisposableRemovalConfirmCmd( message );
             break;
 
@@ -1135,11 +1135,11 @@
             handleSetHDStandbyDisinfectSubmodeRequest( message );
             break;
 
-        case MSG_ID_UI_REQUEST_SERVICE_INFO:
+        case MSG_ID_UI_SERVICE_INFO_REQUEST:
             handleHDServiceScheduleRequest( message );
             break;
 
-        case MSG_ID_REQUEST_HD_USAGE_INFO:
+        case MSG_ID_HD_USAGE_INFO_REQUEST:
             handleHDUsageInfoRequest( message );
             break;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2ef6269801df1d8323d807c4e56d39e129c8ad4b -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2ef6269801df1d8323d807c4e56d39e129c8ad4b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -675,7 +675,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_TREATMENT_PARAM_CHANGE_RANGES;
+    msg.hdr.msgID = MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA;
     msg.hdr.payloadLen = sizeof( TREATMENT_PARAM_BROADCAST_PAYLOAD_T );
     memcpy( &msg.payload, &paramRanges, sizeof( TREATMENT_PARAM_BROADCAST_PAYLOAD_T ) );
 
@@ -1715,7 +1715,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_START_STOP_FLUSH;
+    msg.hdr.msgID = MSG_ID_DG_START_STOP_FLUSH_CMD;
     msg.hdr.payloadLen = sizeof( BOOL );
 
     memcpy( msg.payload, &start, sizeof( BOOL ) );
@@ -3074,7 +3074,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_VERSION;
+    msg.hdr.msgID = MSG_ID_HD_VERSION_REPONSE;
     msg.hdr.payloadLen = sizeof( HD_VERSIONS_T );
 
     if ( message->hdr.payloadLen == sizeof( UI_VERSIONS_T ) )
@@ -3165,7 +3165,7 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_HD_SERIAL_NUMBER;
+    msg.hdr.msgID = MSG_ID_HD_SERIAL_NUMBER_RESPONSE;
 
     // Add 1 byte for null terminator
     msg.hdr.payloadLen = MAX_TOP_LEVEL_SN_CHARS + 1;