Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r47f6ff71b7ca3037c673e21f11b0b2a9dd1558bf -r3cce4a1a163637a8a7e01018dc466cc73abe3985
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 47f6ff71b7ca3037c673e21f11b0b2a9dd1558bf)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 3cce4a1a163637a8a7e01018dc466cc73abe3985)
@@ -922,7 +922,7 @@
     // Handle any messages from other sub-systems
     switch ( msgID )
     {
-        case MSG_ID_OFF_BUTTON_PRESS:
+        case MSG_ID_OFF_BUTTON_PRESS_REQUEST:
             handleOffButtonConfirmMsgFromUI( message );
             break;
 
@@ -934,19 +934,15 @@
             handleAlarmCleared( message );
             break;
 
-        case MSG_ID_UI_ALARM_USER_ACTION:
+        case MSG_ID_UI_ALARM_USER_ACTION_REQUEST:
             handleAlarmUserAction( message );
-            break;
-
-        case MSG_ID_DG_CHECK_IN:
-            handleDGCheckIn( message );
             break;
 
         case MSG_ID_UI_CHECK_IN:
             handleUICheckIn( message );
             break;
 
-        case MSG_ID_LOAD_CELL_READINGS:
+        case MSG_ID_LOAD_CELL_READINGS_DATA:
             handleLoadCellReadingsFromDG( message );
             break;
 
@@ -962,7 +958,7 @@
             handleSalineBolusRequest( message );
             break;
 
-        case MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE:
+        case MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST:
             handleChangeUFSettingsConfirmation( message );
             break;
 
@@ -974,12 +970,12 @@
             handleChangeBloodDialysateRateChangeRequest( message );
             break;
 
-        case MSG_ID_REQUEST_FW_VERSIONS:
+        case MSG_ID_FW_VERSIONS_REQUEST:
             handleFWVersionRequest( message );
             handleHDSerialNumberRequest();
             break;
 
-        case MSG_ID_DG_VERSION:
+        case MSG_ID_DG_VERSION_REPONSE:
             handleDGVersionResponse( message );
             break;
 
@@ -995,27 +991,27 @@
             handleDialysateFlowData( message );
             break;
 
-        case MSG_ID_DG_OP_MODE:
+        case MSG_ID_DG_OP_MODE_DATA:
             handleDGOpMode( message );
             break;
 
         case MSG_ID_DG_RESERVOIRS_DATA:
             handleDGReservoirData( message );
             break;
 
-        case MSG_ID_USER_REQUEST_ALARM_SILENCE:
+        case MSG_ID_USER_ALARM_SILENCE_REQUEST:
             handleUIAlarmSilenceRequest( message );
             break;
 
-        case MSG_ID_UI_NEW_TREATMENT_PARAMS:
+        case MSG_ID_UI_NEW_TREATMENT_PARAMS_REQUEST:
             handleTreatmentParametersFromUI( message );
             break;
 
         case MSG_ID_UI_INITIATE_TREATMENT_REQUEST:
             handleInitiateTreatmentRequest( message );
             break;
 
-        case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
+        case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST:
             handleUIUserConfirmTreatmentParameters( message );
             break;
 
@@ -1027,27 +1023,27 @@
             handleHeparinCommandRequest( message );
             break;
 
-        case MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD:
+        case MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST:
             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;
 
         case MSG_ID_UI_SAMPLE_WATER_RESULT:
             handleSampleWaterResult( message );
             break;
 
-        case MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM:
+        case MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST:
             handleConsumableInstallConfirm( message );
             break;
 
-        case MSG_ID_UI_INSTALLATION_CONFIRM:
+        case MSG_ID_UI_INSTALLATION_CONFIRM_REQUEST:
             handleInstallationConfirm( message );
             break;
 
@@ -1059,31 +1055,31 @@
             handleContinueToTreatmentCmd( message );
             break;
 
-        case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM:
+        case MSG_ID_UI_PATIENT_CONNECTION_CONFIRM_REQUEST:
             handlePatientConnectionConfirmCmd( message );
             break;
 
         case MSG_ID_UI_START_TREATMENT_REQUEST:
             handleStartTreatmentRequest( message );
             break;
 
-        case MSG_ID_UI_RINSEBACK_CMD:
+        case MSG_ID_UI_RINSEBACK_CMD_REQUEST:
             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:
+        case MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM_REQUEST:
             handlePatientDisconnectionConfirmCmd( message );
             break;
 
-        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM:
+        case MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST:
             handleDisposableRemovalConfirmCmd( message );
             break;
 
@@ -1123,7 +1119,7 @@
             handleUIPOSTFinalResult( message );
             break;
 
-        case MSG_ID_HD_UI_VERSION_INFO_RESPONSE:
+        case MSG_ID_UI_VERSION_INFO_RESPONSE:
             handleUIVersionResponse( message );
             break;
 
@@ -1135,19 +1131,19 @@
             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;
 
         case MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA:
             handleDGMixingRatios( message );
             break;
 
-        case MSG_ID_UI_REQUEST_SERVICE_MODE:
+        case MSG_ID_UI_SERVICE_MODE_REQUEST:
             handleUIServiceModeRequest( message );
             break;
 
@@ -1159,11 +1155,11 @@
             handleDGUsageInfoData( message );
             break;
 
-        case MSG_ID_UI_CONFIRMATION_RESULT:
+        case MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE:
             handleUIConfirmationResponse( message );
             break;
 
-        case MSG_ID_HD_SET_SERVICE_TIME:
+        case MSG_ID_HD_SET_SERVICE_TIME_REQUEST:
             handleSetHDServiceTime( message );
             break;