Index: sources/canbus/messagehandler.h
===================================================================
diff -u -r68fe14b0d2f0e79d03c95cc0dfff5b47948b6d5b -rb2ebb6f71cf9b0c2ba68a47776e5b220b165b21c
--- sources/canbus/messagehandler.h	(.../messagehandler.h)	(revision 68fe14b0d2f0e79d03c95cc0dfff5b47948b6d5b)
+++ sources/canbus/messagehandler.h	(.../messagehandler.h)	(revision b2ebb6f71cf9b0c2ba68a47776e5b220b165b21c)
@@ -25,7 +25,7 @@
 // Project
 #include "main.h"
 #include "guiactions.h"
-#include "messagepartitioner.h"
+#include "messagebuilder.h"
 
 // Define
 #define _MessageHandler MessageHandler::I()
@@ -47,7 +47,7 @@
     // friends
     friend class ::unittests;
 
-    MessagePartitioner _partitioner;
+    MessageBuilder _builder;
 
     // Singleton
     SINGLETON_DECL(MessageHandler)
@@ -58,13 +58,13 @@
     void initConnections();
     void checked_in();
 
-    void transmitFrame(Message::Can_Id vCan_Id, GuiActionType vAction, const QByteArray &vData = 0);
+    void transmitFrame(Can_Id vCan_Id, GuiActionType vAction, const QByteArray &vData = 0);
 
     bool ignoreChannel(const QCanBusFrame &vFrame);
 
 
     // interpret the data into GUI understandable Actions/Data
-    bool          interpretData(const MessagePartitioner::Packet &vMessage, GuiActionType &vActionId, GuiActionData &vData);
+    bool          interpretData(const Message &vMessage, GuiActionType &vActionId, GuiActionData &vData);
 
 private slots: // Should be private for thread safety and is connected internally.
     void  onActionTransmit(GuiActionType vAction, const QByteArray &vData); // UI => HD/DG