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;