Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r957988f97f3bea03c4141408cdbb555fc8a140ce -raf9a457aa1380e50bd883071c058792c71c9f6eb
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 957988f97f3bea03c4141408cdbb555fc8a140ce)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision af9a457aa1380e50bd883071c058792c71c9f6eb)
@@ -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;
@@ -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