Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r595ede3b4cf5a1f5c06a04d1db99a0674ae742bd -r66e87ea403ec12a273553284919684282d87bc6a
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 595ede3b4cf5a1f5c06a04d1db99a0674ae742bd)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 66e87ea403ec12a273553284919684282d87bc6a)
@@ -272,25 +272,25 @@
         LOG_EVENT(AlarmAcknowledgeRequestData::toString(vData));
         break;
 
-    case Gui::GuiActionType::ID_StartTreatmentReq:
+    case Gui::GuiActionType::ID_TreatmentStartReq:
         if ( ! length ) { logInvalidLength(vActionId); return false; }
         vPayload = Format::fromVariant(vData);
-        LOG_EVENT(StartTreatmentRequestData::toString(vData));
+        LOG_EVENT(TreatmentStartRequestData::toString(vData));
         break;
 
-    case Gui::GuiActionType::ID_ConfirmTreatmentReq:
+    case Gui::GuiActionType::ID_TreatmentConfirmReq:
         if ( ! length ) { logInvalidLength(vActionId); return false; }
         vPayload = Format::fromVariant(vData);
-        LOG_EVENT(ConfirmTreatmentRequestData::toString(vData));
+        LOG_EVENT(TreatmentConfirmRequestData::toString(vData));
         break;
 
-    case Gui::GuiActionType::ID_EndTreatmentReq:
+    case Gui::GuiActionType::ID_TreatmentEndReq:
         if ( length != 0 ) { logInvalidLength(vActionId); return false; }
         vPayload = Format::fromVariant(vData);
-        LOG_EVENT(EndTreatmentRequestData::toString(vData));
+        LOG_EVENT(TreatmentEndRequestData::toString(vData));
         break;
 
-    case Gui::GuiActionType::ID_CreateTreatmentReq:
+    case Gui::GuiActionType::ID_TreatmentCreateReq:
         if ( ! length ) { logInvalidLength(vActionId); return false; }
         vPayload = Format::fromVariant(vData);
         LOG_EVENT(AdjustTreatmentParametersRequestData::toString(vData));
@@ -381,7 +381,7 @@
     case Gui::GuiActionType::ID_AlarmStatus                     : ok = alarmStatus                  (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AlarmTriggered                  : ok = alarmTriggered               (vMessage, vData); break; // TODO : implement notify<>()
     case Gui::GuiActionType::ID_AlarmCleared                    : ok = alarmCleared                 (vMessage, vData); 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;
@@ -395,8 +395,8 @@
     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;
 
     // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.