Index: sources/canbus/messageinterpreter.h
===================================================================
diff -u -r4a6abe765f03feae8100ec660aa04aa218d4dfa3 -r595ed1fbe8066960afd4c8fea168208e81b173d9
--- sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 4a6abe765f03feae8100ec660aa04aa218d4dfa3)
+++ sources/canbus/messageinterpreter.h	(.../messageinterpreter.h)	(revision 595ed1fbe8066960afd4c8fea168208e81b173d9)
@@ -18,7 +18,7 @@
 
 // Project
 #include "messageglobals.h"
-#include "model.h"
+#include "mmodel.h"
 
 namespace Can {
 
@@ -35,43 +35,39 @@
 
     void printUnhandled         (const Message &vMessage);
 
-    bool interpretMessage_HD    (const Message &vMessage        , QVariantList &vData)                                      __attribute_warn_unused_result__;
-    bool interpretMessage_DG    (const Message &vMessage        , QVariantList &vData)                                      __attribute_warn_unused_result__;
+    bool interpretMessage_HD    (const Message &vMessage, QVariantList &vData)                                      __attribute_warn_unused_result__;
+    bool interpretMessage_DG    (const Message &vMessage, QVariantList &vData)                                      __attribute_warn_unused_result__;
 
-    bool getPowerOffData        (const Message &vMessage        , quint8     &vShowHide)                                    __attribute_warn_unused_result__;
+    // ---- PowerOff
+    bool            getPowerOffData(const Message &vMessage, Model::MPowerOff  &vData)                              __attribute_warn_unused_result__;
+    bool               powerOffData(const Message &vMessage, QVariantList      &vData)                              __attribute_warn_unused_result__;
 
     // ---- BloodFlowData
-    bool getBloodFlowData       (const Message &vMessage        , Model::BloodFlow  &vData)                                 __attribute_warn_unused_result__;
-    bool    bloodFlowData       (const Message &vMessage        , QVariantList      &vData)                                 __attribute_warn_unused_result__;
+    bool           getBloodFlowData(const Message &vMessage, Model::MBloodFlow  &vData)                             __attribute_warn_unused_result__;
+    bool              bloodFlowData(const Message &vMessage, QVariantList       &vData)                             __attribute_warn_unused_result__;
 
     // ---- Dialysate Inlet FlowData
-    bool getDialysateInletFlowData
-                                (const Message &vMessage        , Model::DialysateFlow &vData)                              __attribute_warn_unused_result__;
-    bool    dialysateInletFlowData
-                                (const Message &vMessage        , QVariantList &vData)                                      __attribute_warn_unused_result__;
+    bool  getDialysateInletFlowData(const Message &vMessage, Model::DialysateFlow &vData)                           __attribute_warn_unused_result__;
+    bool     dialysateInletFlowData(const Message &vMessage, QVariantList         &vData)                           __attribute_warn_unused_result__;
 
-
     // ---- Dialysate Outlet FlowData
-    bool getDialysateOutletFlowData
-                                (const Message &vMessage        , Model::OutletFlow &vData)                                 __attribute_warn_unused_result__;
-    bool    dialysateOutletFlowData
-                                (const Message &vMessage        , QVariantList &vData)                                      __attribute_warn_unused_result__;
+    bool getDialysateOutletFlowData(const Message &vMessage, Model::MOutletFlow &vData)                             __attribute_warn_unused_result__;
+    bool    dialysateOutletFlowData(const Message &vMessage, QVariantList       &vData)                             __attribute_warn_unused_result__;
 
     // ---- AlarmStatus
-    bool getAlarmStatus         (const Message &vMessage        , Model::AlarmStatus &vData)                                __attribute_warn_unused_result__;
-    bool    alarmStatus         (const Message &vMessage        , QVariantList &vData)                                      __attribute_warn_unused_result__;
+    bool            getAlarmStatus         (const Message &vMessage, Model::MAlarmStatus &vData)                    __attribute_warn_unused_result__;
+    bool               alarmStatus         (const Message &vMessage, QVariantList       &vData)                     __attribute_warn_unused_result__;
 
     // ---- Treatment Time
-    bool getTreatmentTime       (const Message &vMessage,
-                                 Model::TreatmentTime &vData);
-    bool treatmentTime          (const Message &vMessage, QVariantList &vData);
+    bool getTreatmentTime       (const Message &vMessage, Model::MTreatmentTime &vData);
+    bool treatmentTime          (const Message &vMessage, QVariantList          &vData);
 
 public:
     explicit MessageInterpreter(QObject *parent = nullptr);
 
     // interpret the data into GUI understandable Actions/Data
-    bool interpretMessage(const Message &vMessage, QVariantList &vData)                                                     __attribute_warn_unused_result__;
-    bool interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload)             __attribute_warn_unused_result__;
+    bool interpretMessage(const Message &vMessage, QVariantList &vData)                                             __attribute_warn_unused_result__;
+    bool interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload)     __attribute_warn_unused_result__;
 
 signals:
     ACTION_RECEIVE_SIGNALS