Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r0968c8cabe4a8185a5fc28870c6475c3d581561f -r0565c9c592a8b78978157e805269f5900f9636ce
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0968c8cabe4a8185a5fc28870c6475c3d581561f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0565c9c592a8b78978157e805269f5900f9636ce)
@@ -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