Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -r88563177f10f20ced98750b2e40036201728131d
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 88563177f10f20ced98750b2e40036201728131d)
@@ -231,40 +231,44 @@
         LOG_EVENT(mSenderID + QString("RawData"));
         break;
 
-    case Gui::GuiActionType::ID_PowerOff                            : INTERPRET_TRANSMIT_MESSAGE(AdjustPowerOffRequestData                  ); break;
-    case Gui::GuiActionType::ID_AdjustVersionsReq                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustVersionsRequestData                  ); break;
+    case Gui::GuiActionType::ID_PowerOff                                : INTERPRET_TRANSMIT_MESSAGE(AdjustPowerOffRequestData                      ); break;
+    case Gui::GuiActionType::ID_AdjustVersionsReq                       : INTERPRET_TRSMT_MT_MESSAGE(AdjustVersionsRequestData                      ); break;
+    // Pre-Treatment
+    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;
+    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_AdjustPatientConnectionConfirmReq       : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionConfirmRequestData      ); break;
+    case Gui::GuiActionType::ID_AdjustStartTreatmentReq                 : INTERPRET_TRSMT_MT_MESSAGE(AdjustStartTreatmentRequestData                ); break;
     // in-treatment
-    case Gui::GuiActionType::ID_AdjustDurationReq                   : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationRequestData                  ); break;
-    case Gui::GuiActionType::ID_AdjustBloodDialysateReq             : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodDialysateRequestData            ); break;
-    case Gui::GuiActionType::ID_AdjustPressuresLimitsReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustPressuresLimitsRequestData           ); break;
-    case Gui::GuiActionType::ID_AdjustSalineReq                     : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData                    ); break;
-    case Gui::GuiActionType::ID_AdjustHeparinReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData                   ); break;
+    case Gui::GuiActionType::ID_AdjustDurationReq                       : INTERPRET_TRANSMIT_MESSAGE(AdjustDurationRequestData                      ); break;
+    case Gui::GuiActionType::ID_AdjustBloodDialysateReq                 : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodDialysateRequestData                ); break;
+    case Gui::GuiActionType::ID_AdjustPressuresLimitsReq                : INTERPRET_TRANSMIT_MESSAGE(AdjustPressuresLimitsRequestData               ); break;
+    case Gui::GuiActionType::ID_AdjustSalineReq                         : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData                        ); break;
+    case Gui::GuiActionType::ID_AdjustHeparinReq                        : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData                       ); break;
     // in-treatment - ultrafiltration
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq       : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData      ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq        : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData       ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq     : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData    ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData          ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData           ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData        ); break;
+    // End-Treatment
+    case Gui::GuiActionType::ID_AdjustRinsebackReq                      : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData                     ); break;
+    case Gui::GuiActionType::ID_AdjustRecirculateReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData                   ); break;
+    case Gui::GuiActionType::ID_AdjustTreatmentEndReq                   : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData                  ); break;
     // Post-Treatment
-    case Gui::GuiActionType::ID_AdjustRinsebackReq                  : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData                 ); break;
-    case Gui::GuiActionType::ID_AdjustRecirculateReq                : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData               ); break;
-    case Gui::GuiActionType::ID_AdjustTreatmentEndReq               : INTERPRET_TRANSMIT_MESSAGE(AdjustTreatmentEndRequestData              ); break;
-    // Pre-Treatment
-    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;
-    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_AdjustPatientConnectionConfirmReq   : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientConnectionConfirmRequestData  ); break;
-    case Gui::GuiActionType::ID_AdjustStartTreatmentReq             : INTERPRET_TRSMT_MT_MESSAGE(AdjustStartTreatmentRequestData            ); break;
+    case Gui::GuiActionType::ID_AdjustPatientDisconnectionConfirmReq    : INTERPRET_TRSMT_MT_MESSAGE(AdjustPatientDisconnectionConfirmRequestData   ); break;
+    case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq      : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData     ); break;
+    case Gui::GuiActionType::ID_AdjustTreatmentLogRsp                   : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData                  ); break;
     // alarms
-    case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData                    ); break;
-    case Gui::GuiActionType::ID_AlarmUserActionReq                  : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData                 ); break;
+    case Gui::GuiActionType::ID_AlarmSilenceReq                         : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData                        ); break;
+    case Gui::GuiActionType::ID_AlarmUserActionReq                      : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData                     ); break;
     // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
-    case Gui::GuiActionType::ID_AlarmClearedConditionReq            : INTERPRET_TRANSMIT_MESSAGE(AlarmClearedConditionRequestData           ); break;
+    case Gui::GuiActionType::ID_AlarmClearedConditionReq                : INTERPRET_TRANSMIT_MESSAGE(AlarmClearedConditionRequestData               ); break;
     // coco end
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
@@ -327,30 +331,30 @@
     vData.clear();
     switch (vMessage.actionId) { // notice we are in receive mode
     // ----- Debug
-    case Gui::GuiActionType::ID_CANBusFaultCount                : ok = canbusFaultCountData         (vMessage, vData); break; // TODO : implement notify<>()
-    case Gui::GuiActionType::ID_HDDebugText                     : ok = notify<Model::MHDDebugText                           >(vMessage, vData, Gui::GuiActionType::ID_HDDebugText                   ); break;
+    case Gui::GuiActionType::ID_CANBusFaultCount                    : ok = canbusFaultCountData         (vMessage, vData); break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_HDDebugText                         : ok = notify<Model::MHDDebugText                               >(vMessage, vData, Gui::GuiActionType::ID_HDDebugText                       ); break;
 
-    case Gui::GuiActionType::ID_HDOperationModeData             : ok = notify<Model::MHDOperationMode                       >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData           ); break;
-    case Gui::GuiActionType::ID_PreTreatmentStates              : ok = notify<Model::MPreTreatmentStates                    >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates            ); break;
-    case Gui::GuiActionType::ID_TreatmentStates                 : ok = notify<Model::MTreatmentStates                       >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates               ); break;
+    // ----- Events
+    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<>()
 
+    // ----- States
+    case Gui::GuiActionType::ID_HDOperationModeData                 : ok = notify<Model::MHDOperationMode                           >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData               ); break;
+    case Gui::GuiActionType::ID_PreTreatmentStates                  : ok = notify<Model::MPreTreatmentStates                        >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates                ); break;
+    case Gui::GuiActionType::ID_TreatmentStates                     : ok = notify<Model::MTreatmentStates                           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates                   ); break;
+    case Gui::GuiActionType::ID_PostTreatmentStates                 : ok = notify<Model::MPostTreatmentStates                       >(vMessage, vData, Gui::GuiActionType::ID_PostTreatmentStates               ); break;
+
     // ----- Datum
-    case Gui::GuiActionType::ID_TreatmentTime                   : ok = notify<Model::MTreatmentTime                         >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                 ); break;
-    case Gui::GuiActionType::ID_BloodFlow                       : ok = notify<Model::MBloodFlow                             >(vMessage, vData, Gui::GuiActionType::ID_BloodFlow                     ); break;
-    case Gui::GuiActionType::ID_DialysateInletFlow              : ok = notify<Model::MDialysateFlow                         >(vMessage, vData, Gui::GuiActionType::ID_DialysateInletFlow            ); break;
-    case Gui::GuiActionType::ID_DialysateOutletFlow             : ok = notify<Model::MOutletFlow                            >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow           ); break;
-    case Gui::GuiActionType::ID_TreatmentRanges                 : ok = notify<Model::MTreatmentRanges                       >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges               ); break;
-    case Gui::GuiActionType::ID_PressureOcclusion               : ok = notify<Model::MPressureOcclusion                     >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion             ); break;
-    case Gui::GuiActionType::ID_Saline                          : ok = notify<Model::MTreatmentSaline                       >(vMessage, vData, Gui::GuiActionType::ID_Saline                        ); break;
-    case Gui::GuiActionType::ID_Heparin                         : ok = notify<Model::MTreatmentHeparin                      >(vMessage, vData, Gui::GuiActionType::ID_Heparin                       ); break;
-    case Gui::GuiActionType::ID_Rinseback                       : ok = notify<Model::MTreatmentRinseback                    >(vMessage, vData, Gui::GuiActionType::ID_Rinseback                     ); break;
-    case Gui::GuiActionType::ID_Recirculate                     : ok = notify<Model::MTreatmentRecirculate                  >(vMessage, vData, Gui::GuiActionType::ID_Recirculate                   ); break;
-    case Gui::GuiActionType::ID_BloodPrime                      : ok = notify<Model::MTreatmentBloodPrime                   >(vMessage, vData, Gui::GuiActionType::ID_BloodPrime                    ); break;
-    case Gui::GuiActionType::ID_HDAccelerometerData             : ok = notify<Model::MHDAccelerometer                       >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData           ); break;
+    case Gui::GuiActionType::ID_HDAccelerometerData                 : ok = notify<Model::MHDAccelerometer                           >(vMessage, vData, Gui::GuiActionType::ID_HDAccelerometerData               ); break;
+
+    // ----- Datum - Treatment
+    case Gui::GuiActionType::ID_TreatmentRanges                     : ok = notify<Model::MTreatmentRanges                           >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges                   ); break;
+
     // ----- 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::MPreTreatmentDisposablesPrime          >(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData          ); break;
+    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::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;
@@ -361,33 +365,43 @@
     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;
 
-    // ----- Events
-    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<>()
+    // ----- In-Treatment - Datum
+    case Gui::GuiActionType::ID_TreatmentTime                       : ok = notify<Model::MTreatmentTime                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime                     ); break;
+    case Gui::GuiActionType::ID_BloodFlow                           : ok = notify<Model::MBloodFlow                                 >(vMessage, vData, Gui::GuiActionType::ID_BloodFlow                         ); break;
+    case Gui::GuiActionType::ID_DialysateInletFlow                  : ok = notify<Model::MDialysateFlow                             >(vMessage, vData, Gui::GuiActionType::ID_DialysateInletFlow                ); break;
+    case Gui::GuiActionType::ID_DialysateOutletFlow                 : ok = notify<Model::MOutletFlow                                >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow               ); break;
+    case Gui::GuiActionType::ID_PressureOcclusion                   : ok = notify<Model::MPressureOcclusion                         >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion                 ); break;
+    case Gui::GuiActionType::ID_Saline                              : ok = notify<Model::MTreatmentSaline                           >(vMessage, vData, Gui::GuiActionType::ID_Saline                            ); break;
+    case Gui::GuiActionType::ID_Heparin                             : ok = notify<Model::MTreatmentHeparin                          >(vMessage, vData, Gui::GuiActionType::ID_Heparin                           ); break;
+    case Gui::GuiActionType::ID_Rinseback                           : ok = notify<Model::MTreatmentRinseback                        >(vMessage, vData, Gui::GuiActionType::ID_Rinseback                         ); break;
+    case Gui::GuiActionType::ID_Recirculate                         : ok = notify<Model::MTreatmentRecirculate                      >(vMessage, vData, Gui::GuiActionType::ID_Recirculate                       ); break;
+    case Gui::GuiActionType::ID_BloodPrime                          : ok = notify<Model::MTreatmentBloodPrime                       >(vMessage, vData, Gui::GuiActionType::ID_BloodPrime                        ); break;
+    // ----- In-Treatment Adjust
+    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_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;
+    case Gui::GuiActionType::ID_AdjustRinsebackRsp                  : ok = notify<Model::MAdjustRinsebackResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp                ); break;
+    case Gui::GuiActionType::ID_AdjustRecirculateRsp                : ok = notify<Model::MAdjustRecirculateResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp              ); break;
+    case Gui::GuiActionType::ID_AdjustTreatmentEndRsp               : ok = notify<Model::MAdjustTreatmentEndResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp             ); break;
+    case Gui::GuiActionType::ID_AdjustHDVersionsRsp                 : ok = notify<Model::MAdjustHDVersionsResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp               ); 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_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;
-    case Gui::GuiActionType::ID_AdjustRinsebackRsp              : ok = notify<Model::MAdjustRinsebackResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp            ); break;
-    case Gui::GuiActionType::ID_AdjustRecirculateRsp            : ok = notify<Model::MAdjustRecirculateResponse             >(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp          ); break;
-    case Gui::GuiActionType::ID_AdjustTreatmentEndRsp           : ok = notify<Model::MAdjustTreatmentEndResponse            >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp         ); break;
-    case Gui::GuiActionType::ID_AdjustHDVersionsRsp             : ok = notify<Model::MAdjustHDVersionsResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDVersionsRsp           ); break;
+    // ----- In-Treatment Adjust
+    case Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp   : ok = notify<Model::MAdjustDisposablesRemovalConfirmResponse   >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposableRemovalConfirmRsp ); break;
+    case Gui::GuiActionType::ID_AdjustTreatmentLogRsp               : ok = notify<Model::MAdjustTreatmentLogResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentLogRsp             ); 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_AdjustUltrafiltrationEditRsp        : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp     : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>()
 
-    // Alarms
-    case Gui::GuiActionType::ID_AlarmStatus                     : ok = notify<Model::MAlarmStatus                           >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus                   ); break;
-    case Gui::GuiActionType::ID_AlarmTriggered                  : ok = notify<Model::MAlarmTriggered                        >(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered                ); break;
-    case Gui::GuiActionType::ID_AlarmCleared                    : ok = notify<Model::MAlarmCleared                          >(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared                  ); break;
+    // ----- Alarms
+    case Gui::GuiActionType::ID_AlarmStatus                         : ok = notify<Model::MAlarmStatus                           >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus                   ); break;
+    case Gui::GuiActionType::ID_AlarmTriggered                      : ok = notify<Model::MAlarmTriggered                        >(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered                ); break;
+    case Gui::GuiActionType::ID_AlarmCleared                        : ok = notify<Model::MAlarmCleared                          >(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared                  ); break;
     // coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now.
-    case Gui::GuiActionType::ID_AlarmClearedConditionRsp        : ok = notify<Model::MAlarmClearedCondition                 >(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp      ); break;
+    case Gui::GuiActionType::ID_AlarmClearedConditionRsp            : ok = notify<Model::MAlarmClearedCondition                 >(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp      ); break;
     // coco end
 
     // unhandles messages: these will only be logged as received message