Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r852675b1a6166e7670c36c5427a8a03467cbac36 -re7e9ea67b63911dc9d8d46166fdd09e102111e3f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 852675b1a6166e7670c36c5427a8a03467cbac36)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e7e9ea67b63911dc9d8d46166fdd09e102111e3f)
@@ -525,7 +525,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;
@@ -1675,7 +1675,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