Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed)
@@ -253,13 +253,13 @@
     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_TRANSMIT_MESSAGE(AdjustConsumablesConfirmRequestData        ); break;
-    case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustDisposablesConfirmRequestData        ); break;
-    case Gui::GuiActionType::ID_AdjustDisposablesPrimeReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustDisposablesPrimeRequestData          ); break;
+    case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq         : INTERPRET_TRSMT_MT_MESSAGE(AdjustConsumablesConfirmRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq         : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesConfirmRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustDisposablesPrimeReq           : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesPrimeRequestData          ); break;
+    case Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq     : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionBeginRequestData    ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq        : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationInitRequestData       ); break;
-    case Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq     : INTERPRET_TRANSMIT_MESSAGE(AdjustPatientConnectionBeginRequestData    ); break;
-    case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq   : INTERPRET_TRANSMIT_MESSAGE(AdjustPatientConnectionConfirmRequestData  ); break;
-    case Gui::GuiActionType::ID_AdjustStartTreatmentReq             : INTERPRET_TRANSMIT_MESSAGE(AdjustStartTreatmentRequestData            ); break;
+    case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmReq   : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionConfirmRequestData  ); break;
+    case Gui::GuiActionType::ID_AdjustStartTreatmentReq             : INTERPRET_TRSMT_MT_MESSAGE(AdjustStartTreatmentRequestData            ); break;
     // alarms
     case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData                    ); break;
     case Gui::GuiActionType::ID_AlarmUserActionReq                  : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData                 ); break;
@@ -350,14 +350,14 @@
     // ----- Pre-Treatment - Datum - Progress
     case Gui::GuiActionType::ID_SelfTestNoCartridgeData         : ok = notify<Model::MPreTreatmentSelfTestNoCartridge       >(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridgeData       ); break;
     case Gui::GuiActionType::ID_SelfTestDryData                 : ok = notify<Model::MPreTreatmentSelfTestDry               >(vMessage, vData, Gui::GuiActionType::ID_SelfTestDryData               ); break;
-    case Gui::GuiActionType::ID_DisposablesPrimeData            : ok = notify<Model::MPreTreatmentDisposablePrime           >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData          ); break;
+    case Gui::GuiActionType::ID_DisposablesPrimeData            : ok = notify<Model::MPreTreatmentDisposablesPrime          >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData          ); break;
     // ----- 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_AdjustDisposablesPrimeRsp           : ok = notify<Model::MAdjustDisposablePrimeResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp         ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp        : ok = notify<Model::MAdjustUltrafiltrationInitResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp      ); 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;