Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rca67f7413160dfba507856222bd9aa95c5fa6200 -rcbfda5b02abeec60eb45b49da4bfbe07283a037f
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision ca67f7413160dfba507856222bd9aa95c5fa6200)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision cbfda5b02abeec60eb45b49da4bfbe07283a037f)
@@ -238,7 +238,6 @@
     case Gui::GuiActionType::ID_AdjustInitTreatmentReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData                 ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData          ); break;
     case Gui::GuiActionType::ID_AdjustParametersConfirmReq              : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersConfirmRequestData             ); break;
-    case Gui::GuiActionType::ID_AdjustWaterSampleReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleRequestData                   ); break;
     case Gui::GuiActionType::ID_AdjustWaterSampleResultReq              : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleResultRequestData             ); break;
     case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq             : INTERPRET_TRSMT_MT_MESSAGE(AdjustConsumablesConfirmRequestData            ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq             : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesConfirmRequestData            ); break;
@@ -520,15 +519,14 @@
         // ----- Pre-Treatment - Adjust
     case Gui::GuiActionType::ID_AdjustInitTreatmentRsp              : ok = notify<Model::MAdjustInitTreatmentResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustInitTreatmentRsp            ); break;
     case Gui::GuiActionType::ID_AdjustParametersValidationRsp       : ok = notify<Model::MAdjustParametersValidationResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustParametersValidationRsp     ); break;
-    case Gui::GuiActionType::ID_AdjustWaterSampleRsp                : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleRsp              ); break;
+    case Gui::GuiActionType::ID_AdjustWaterSampleResultRsp          : ok = notify<Model::MAdjustWaterSampleResultResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleResultRsp        ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp         : ok = notify<Model::MAdjustDisposablesConfirmResponse          >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp       ); break;
     case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp           : ok = notify<Model::MAdjustDisposablesPrimeResponse            >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp         ); break;
     case Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp     : ok = notify<Model::MAdjustPatientConnectionBeginResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp        : ok = notify<Model::MAdjustUltrafiltrationInitResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp      ); break;
     case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp   : ok = notify<Model::MAdjustPatientConnectionConfirmResponse    >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break;
     case Gui::GuiActionType::ID_AdjustStartTreatmentRsp             : ok = notify<Model::MAdjustStartTreatmentResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp           ); break;
     case Gui::GuiActionType::ID_AdjustWaterSampleData               : ok = notify<Model::MWaterSample                               >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleData             ); break;
-//    case Gui::GuiActionType::ID_AdjustWaterSampleTimeout            : ok = notify<Model::MAdjustWaterSampleResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleTimeout          ); break;
 
     // ----- In-Treatment - Datum
     case Gui::GuiActionType::ID_TreatmentTime                       : ok = notify<Model::MTreatmentTime                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                     ); break;