Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r4c8fb9738f785e8c786e8323d7327aa11d18ceb9 -r2ef6269801df1d8323d807c4e56d39e129c8ad4b
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4c8fb9738f785e8c786e8323d7327aa11d18ceb9)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2ef6269801df1d8323d807c4e56d39e129c8ad4b)
@@ -934,7 +934,7 @@
             handleAlarmCleared( message );
             break;
 
-        case MSG_ID_UI_ALARM_USER_ACTION:
+        case MSG_ID_UI_ALARM_USER_ACTION_REQUEST:
             handleAlarmUserAction( message );
             break;
 
@@ -1003,7 +1003,7 @@
             handleDGReservoirData( message );
             break;
 
-        case MSG_ID_USER_REQUEST_ALARM_SILENCE:
+        case MSG_ID_USER_ALARM_SILENCE_REQUEST:
             handleUIAlarmSilenceRequest( message );
             break;
 
@@ -1043,7 +1043,7 @@
             handleSampleWaterResult( message );
             break;
 
-        case MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM:
+        case MSG_ID_UI_CONSUMABLE_INSTALL_CONFIRM_REQUEST:
             handleConsumableInstallConfirm( message );
             break;
 
@@ -1067,7 +1067,7 @@
             handleStartTreatmentRequest( message );
             break;
 
-        case MSG_ID_UI_RINSEBACK_CMD:
+        case MSG_ID_UI_RINSEBACK_CMD_REQUEST:
             handlRinsebackCmd( message );
             break;