Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r9ff5152e2757533507945ac27aa0019f214f738b -r336cb4935bf768db17bd6b7a02668510289b712e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9ff5152e2757533507945ac27aa0019f214f738b)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 336cb4935bf768db17bd6b7a02668510289b712e)
@@ -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;
 
@@ -974,7 +974,7 @@
             handleChangeBloodDialysateRateChangeRequest( message );
             break;
 
-        case MSG_ID_REQUEST_FW_VERSIONS:
+        case MSG_ID_FW_VERSIONS_REQUEST:
             handleFWVersionRequest( message );
             handleHDSerialNumberRequest();
             break;
@@ -1015,7 +1015,7 @@
             handleInitiateTreatmentRequest( message );
             break;
 
-        case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS:
+        case MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS_REQUEST:
             handleUIUserConfirmTreatmentParameters( message );
             break;
 
@@ -1027,7 +1027,7 @@
             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;
 
@@ -1147,7 +1147,7 @@
             handleDGMixingRatios( message );
             break;
 
-        case MSG_ID_UI_REQUEST_SERVICE_MODE:
+        case MSG_ID_UI_SERVICE_MODE_REQUEST:
             handleUIServiceModeRequest( message );
             break;
 
@@ -1159,11 +1159,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;