Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r96b5f969bbba7b44593c85c8ac003be0a2d87151 -r0968c8cabe4a8185a5fc28870c6475c3d581561f
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 96b5f969bbba7b44593c85c8ac003be0a2d87151)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 0968c8cabe4a8185a5fc28870c6475c3d581561f)
@@ -816,7 +816,7 @@
             handleAlarmClear( message );
             break;
 
-        case MSG_ID_RTC_EPOCH:
+        case MSG_ID_RTC_EPOCH_DATA:
             handleRTCSyncFromHD( message );
             break;
 
@@ -845,7 +845,7 @@
             handleDrainCmd( message );
             break;
 
-        case MSG_ID_HD_OP_MODE:
+        case MSG_ID_HD_OP_MODE_DATA:
             handleSetHDOperationMode( message );
             break;
 
@@ -865,11 +865,11 @@
             handleDGStartStopTrimmerHeater( message );
             break;
 
-        case MSG_ID_DG_START_STOP_FLUSH:
+        case MSG_ID_DG_START_STOP_FLUSH_CMD:
             handleStartStopDGFlush( message );
             break;
 
-        case MSG_ID_DG_START_STOP_HEAT_DISINFECT:
+        case MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD:
             handleStartStopDGHeatDisinfect( message );
             break;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r96b5f969bbba7b44593c85c8ac003be0a2d87151 -r0968c8cabe4a8185a5fc28870c6475c3d581561f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 96b5f969bbba7b44593c85c8ac003be0a2d87151)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0968c8cabe4a8185a5fc28870c6475c3d581561f)
@@ -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 ) )