Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r2ef6269801df1d8323d807c4e56d39e129c8ad4b -r4ddf1777acc4298a9ed034e56b66916256d22c18
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2ef6269801df1d8323d807c4e56d39e129c8ad4b)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
@@ -946,7 +946,7 @@
             handleUICheckIn( message );
             break;
 
-        case MSG_ID_LOAD_CELL_READINGS:
+        case MSG_ID_LOAD_CELL_READINGS_DATA:
             handleLoadCellReadingsFromDG( message );
             break;
 
@@ -962,7 +962,7 @@
             handleSalineBolusRequest( message );
             break;
 
-        case MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE:
+        case MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST:
             handleChangeUFSettingsConfirmation( message );
             break;
 
@@ -979,7 +979,7 @@
             handleHDSerialNumberRequest();
             break;
 
-        case MSG_ID_DG_VERSION:
+        case MSG_ID_DG_VERSION_REPONSE:
             handleDGVersionResponse( message );
             break;
 
@@ -995,7 +995,7 @@
             handleDialysateFlowData( message );
             break;
 
-        case MSG_ID_DG_OP_MODE:
+        case MSG_ID_DG_OP_MODE_DATA:
             handleDGOpMode( message );
             break;
 
@@ -1007,7 +1007,7 @@
             handleUIAlarmSilenceRequest( message );
             break;
 
-        case MSG_ID_UI_NEW_TREATMENT_PARAMS:
+        case MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST:
             handleTreatmentParametersFromUI( message );
             break;
 
@@ -1031,11 +1031,11 @@
             handleAlarmAudioVolumeSetCmd( message );
             break;
 
-        case MSG_ID_UI_SET_UF_VOLUME_PARAMETER:
+        case MSG_ID_UI_SET_UF_VOLUME_PARAMETER_REQUEST:
             handleUFVolumeSetRequest( message );
             break;
 
-        case MSG_ID_UI_SAMPLE_WATER_CMD:
+        case MSG_ID_UI_SAMPLE_WATER_CMD_REQUEST:
             handleSampleWaterCmd( message );
             break;
 
@@ -1059,7 +1059,7 @@
             handleContinueToTreatmentCmd( message );
             break;
 
-        case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM:
+        case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST:
             handlePatientConnectionConfirmCmd( message );
             break;
 
@@ -1071,19 +1071,19 @@
             handlRinsebackCmd( message );
             break;
 
-        case MSG_ID_UI_RECIRC_CMD:
+        case MSG_ID_UI_RECIRC_CMD_REQUEST:
             handleTreatmentRecircCmd( message );
             break;
 
-        case MSG_ID_UI_TX_END_CMD:
+        case MSG_ID_UI_TX_END_CMD_REQUEST:
             handleTreatmentEndCmd( message );
             break;
 
         case MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM:
             handlePatientDisconnectionConfirmCmd( message );
             break;
 
-        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM:
+        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST:
             handleDisposableRemovalConfirmCmd( message );
             break;
 
@@ -1135,11 +1135,11 @@
             handleSetHDStandbyDisinfectSubmodeRequest( message );
             break;
 
-        case MSG_ID_UI_REQUEST_SERVICE_INFO:
+        case MSG_ID_UI_SERVICE_INFO_REQUEST:
             handleHDServiceScheduleRequest( message );
             break;
 
-        case MSG_ID_REQUEST_HD_USAGE_INFO:
+        case MSG_ID_HD_USAGE_INFO_REQUEST:
             handleHDUsageInfoRequest( message );
             break;