Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r66e87ea403ec12a273553284919684282d87bc6a
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 66e87ea403ec12a273553284919684282d87bc6a)
@@ -292,11 +292,11 @@
  * \param   vData - Data model contains the start treatment request information.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const StartTreatmentRequestData &vData)
+void MessageDispatcher::onAdjustment(const TreatmentStartRequestData &vData)
 {
     QVariantList mData;
     mData += vData.request;
-    onActionTransmit(GuiActionType::ID_StartTreatmentReq, mData);
+    onActionTransmit(GuiActionType::ID_TreatmentStartReq, mData);
 }
 
 /*!
@@ -331,11 +331,11 @@
  * \param   vData - Data model contains the confirm treatment request
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const ConfirmTreatmentRequestData &vData)
+void MessageDispatcher::onAdjustment(const TreatmentConfirmRequestData &vData)
 {
     QVariantList mData;
     mData += vData.request;
-    onActionTransmit(GuiActionType::ID_ConfirmTreatmentReq, mData);
+    onActionTransmit(GuiActionType::ID_TreatmentConfirmReq, mData);
 }
 
 /*!
@@ -344,11 +344,11 @@
  * \param   vData - Data model contains the end treatment request
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const EndTreatmentRequestData &vData)
+void MessageDispatcher::onAdjustment(const TreatmentEndRequestData &vData)
 {
     Q_UNUSED(vData)
     QVariantList mData;
-    onActionTransmit(GuiActionType::ID_EndTreatmentReq, mData);
+    onActionTransmit(GuiActionType::ID_TreatmentEndReq, mData);
 }
 
 
@@ -418,10 +418,9 @@
     mData += vData.heparinBolusVolume           ;
     mData += vData.dialysateTemp                ;
 
-    onActionTransmit(GuiActionType::ID_CreateTreatmentReq, mData);
+    onActionTransmit(GuiActionType::ID_TreatmentCreateReq, mData);
 }
 
-
 /*!
  * \brief   MessageDispatcher::actionTransmit
  * \details This method is called by slot MessageDispatcher::onActionTransmit