Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rb549cc9586c585902f891e1aac5e59b7de445f71 -r747bf7a404dffc263c23540a064fe2eb5014f9f7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision b549cc9586c585902f891e1aac5e59b7de445f71)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 747bf7a404dffc263c23540a064fe2eb5014f9f7)
@@ -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;