Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r4644222ff44fd3fc588bd071e794aabad9780bae -r1e8f1e33b885d6b5d64efa37525fa4ea6720b4d5
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4644222ff44fd3fc588bd071e794aabad9780bae)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 1e8f1e33b885d6b5d64efa37525fa4ea6720b4d5)
@@ -108,8 +108,8 @@
     { MSG_ID_DD_OP_MODE_DATA,                                           &setDDOpMode },
     { MSG_ID_DD_PRESSURES_DATA,                                         &setDialysatePressure },
     { MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,                           &validateAndSetTreatmentParameters },
-    { MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE,                     &validateAndSetUFVolume },
-    { MSG_ID_UI_ULTRAFILTRATION_CHANGE_VALIDATE_REQUEST,                &signalUserConfirmationOfUFVolume },
+    { MSG_ID_UI_TREATMENT_UF_VOLUME_VALIDATE_REQUEST,                   &validateAndSetUFVolume },
+    { MSG_ID_UI_ULTRAFILTRATION_CHANGE_CONFIRM_REQUEST,                 &signalUserConfirmationOfUFVolume },
     { MSG_ID_UI_DURATION_VALIDATE_REQUEST,                              &validateAndSetTreatmentDuration },
     { MSG_ID_UI_DURATION_CONFIRM_REQUEST,                               &signalUserConfirmationOfTreatmentDuration },
     { MSG_ID_UI_BOLUS_VOLUME_CHANGE_REQUEST,                            &validateAndSetBolusVolume },
@@ -121,7 +121,7 @@
     { MSG_ID_UI_TREATMENT_SET_POINTS_CHANGE_REQUEST,                    &validateAndSetTreatmentSetPoints },
     { MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST,          &validateAndSetBloodFlowRate },
     { MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_REQUEST,      &validateAndSetDialysateFlowRate },
-    { MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_REQUEST,&validateAndSetDialysateTemperature },
+    { MSG_ID_UI_TREATMENT_SET_POINT_DIALYSATE_TEMP_CHANGE_REQUEST,      &validateAndSetDialysateTemperature },
     { MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST,                                &bloodPrimeHandleCmdRequest },
     { MSG_ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_REQUEST,          &bloodPrimeHandleBloodFlowChangeRequest },
     { MSG_ID_TD_SOFTWARE_RESET_REQUEST,                                 &testTDSoftwareResetRequest },