Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r4d322070769e54c059b020f18215dca88c90acd7 -r54aae98b72e3804008acad0bbbb7573be8e35707
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 4d322070769e54c059b020f18215dca88c90acd7)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 54aae98b72e3804008acad0bbbb7573be8e35707)
@@ -232,14 +232,15 @@
     case Gui::GuiActionType::ID_AdjustSalineReq                     : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData                    ); break;
     case Gui::GuiActionType::ID_AdjustHeparinReq                    : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData                   ); break;
     // in-treatment - ultrafiltration
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq       : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData      ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData       ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq     : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData    ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationInitRequestData   ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq       : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData  ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData   ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq     : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData); break;
     // pre-Treatment
-    case Gui::GuiActionType::ID_StartTreatmentReq                   : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData                  ); break;
-    case Gui::GuiActionType::ID_ConfirmTreatmentReq                 : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData                ); break;
-    case Gui::GuiActionType::ID_EndTreatmentReq                     : INTERPRET_RECVD_MT_MESSAGE(EndTreatmentRequestData                    ); break;
-    case Gui::GuiActionType::ID_CreateTreatmentReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData       ); break;
+    case Gui::GuiActionType::ID_TreatmentStartReq                   : INTERPRET_RECEIVED_MESSAGE(TreatmentStartRequestData              ); break;
+    case Gui::GuiActionType::ID_TreatmentConfirmReq                 : INTERPRET_RECEIVED_MESSAGE(TreatmentConfirmRequestData            ); break;
+    case Gui::GuiActionType::ID_TreatmentEndReq                     : INTERPRET_RECVD_MT_MESSAGE(TreatmentEndRequestData                ); break;
+    case Gui::GuiActionType::ID_TreatmentCreateReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData   ); break;
     // alarms
     case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData                    ); break;
     case Gui::GuiActionType::ID_AlarmUserActionReq                  : INTERPRET_RECEIVED_MESSAGE(AlarmUserActionRequestData                 ); break;
@@ -328,22 +329,23 @@
     case Gui::GuiActionType::ID_Acknow                          : ok = true;                                                     break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_PowerOff                        : ok = notify<Model::MPowerOff                              >(vMessage, vData, Gui::GuiActionType::ID_PowerOff                      ); break;
     case Gui::GuiActionType::ID_ShuttingDown                    : ok = true; LOG_EVENT("HD,ShuttingDown");                       break; // TODO : implement notify<>()
-    case Gui::GuiActionType::ID_CreateTreatmentRsp              : ok = notify<Model::MTreatmentParametersResponse           >(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp            ); break;
+    case Gui::GuiActionType::ID_TreatmentCreateRsp              : ok = notify<Model::MTreatmentParametersResponse           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentCreateRsp            ); break;
 
     // Adjustment Response Messages
     case Gui::GuiActionType::ID_AdjustDurationRsp               : ok = notify<Model::MAdjustDurationResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp             ); break;
     case Gui::GuiActionType::ID_AdjustBloodDialysateRsp         : ok = notify<Model::MAdjustBloodDialysateResponse          >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp       ); break;
     case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp        : ok = notify<Model::MAdjustPressuresLimitsResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp      ); break;
     case Gui::GuiActionType::ID_AdjustSalineRsp                 : ok = notify<Model::MAdjustSalineResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp               ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp    : ok = notify<Model::MAdjustUltrafiltrationInitResponse     >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp  ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp   : ok = notify<Model::MAdjustUltrafiltrationStateResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break;
     case Gui::GuiActionType::ID_AdjustHeparinRsp                : ok = notify<Model::MAdjustHeparinResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp              ); break;
 
     // these need to be standard and use notify as well
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>()
 
-    case Gui::GuiActionType::ID_StartTreatmentRsp               : ok = notify<Model::MStartTreatmentResponse                >(vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp             ); break;
-    case Gui::GuiActionType::ID_EndTreatmentRsp                 : ok = notify<Model::MEndTreatmentResponse                  >(vMessage, vData, Gui::GuiActionType::ID_EndTreatmentRsp               ); break;
+    case Gui::GuiActionType::ID_TreatmentStartRsp               : ok = notify<Model::MTreatmentStartResponse                >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStartRsp             ); break;
+    case Gui::GuiActionType::ID_TreatmentEndRsp                 : ok = notify<Model::MTreatmentEndResponse                  >(vMessage, vData, Gui::GuiActionType::ID_TreatmentEndRsp               ); break;
 
     // Alarms
     case Gui::GuiActionType::ID_AlarmStatus                     : ok = notify<Model::MAlarmStatus                           >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus                   ); break;