Index: sources/canbus/messagehandler.cpp
===================================================================
diff -u -r68fe14b0d2f0e79d03c95cc0dfff5b47948b6d5b -rb2ebb6f71cf9b0c2ba68a47776e5b220b165b21c
--- sources/canbus/messagehandler.cpp	(.../messagehandler.cpp)	(revision 68fe14b0d2f0e79d03c95cc0dfff5b47948b6d5b)
+++ sources/canbus/messagehandler.cpp	(.../messagehandler.cpp)	(revision b2ebb6f71cf9b0c2ba68a47776e5b220b165b21c)
@@ -66,14 +66,14 @@
 
 void MessageHandler::checked_in()
 {
-    transmitFrame(Message::eChlid_UI, GuiActions::Check_In);
+    transmitFrame(eChlid_UI, GuiActions::Check_In);
 }
 
-void MessageHandler::transmitFrame(Message::Can_Id vFrameId, GuiActionType vAction, const QByteArray &vData)
+void MessageHandler::transmitFrame(Can_Id vFrameId, GuiActionType vAction, const QByteArray &vData)
 {
     QCanBusFrame mFrame;
     mFrame.setFrameId(vFrameId);
-    QList<QByteArray> mFrames = _partitioner.buildMessage(vAction,vData);
+    QList<QByteArray> mFrames = _builder.buildMessage(vAction,vData);
     for (auto frame : mFrames) {
         mFrame.setPayload(frame);
         //TODO : If it's necessary we can have a dispatcher
@@ -85,13 +85,13 @@
 bool MessageHandler::ignoreChannel(const QCanBusFrame &vFrame)
 {
     //TODO : There should be an easy way to find if the correct CAN ID has been received
-    Message::Can_Id mCanId = static_cast<Message::Can_Id>(vFrame.frameId());
+    Can_Id mCanId = static_cast<Can_Id>(vFrame.frameId());
     switch (mCanId) {
-    case Message::eChlid_HD_DG:
-    case Message::eChlid_DG_HD:
+    case eChlid_HD_DG:
+    case eChlid_DG_HD:
         return true;
         break;
-    case Message::eChlid_HD:
+    case eChlid_HD:
         break;
     default:
         break;
@@ -100,7 +100,7 @@
 }
 
 
-bool MessageHandler::interpretData(const MessagePartitioner::Packet &vMessage, GuiActionType &vActionId, GuiActionData &vData)
+bool MessageHandler::interpretData(const Message &vMessage, GuiActionType &vActionId, GuiActionData &vData)
 {
     quint8 tmp;
     vActionId = vMessage.actionId;
@@ -127,7 +127,7 @@
 void MessageHandler::onActionTransmit(GuiActionType vAction, const QByteArray &vData)
 {
     qDebug() << vData;
-    transmitFrame(Message::eChlid_UI, vAction, vData);
+    transmitFrame(eChlid_UI, vAction, vData);
 }
 
 /*!
@@ -140,15 +140,15 @@
         return;
     }
 
-    MessagePartitioner::Packet mPacket;
-    if (! _partitioner.stripMessage(vFrame.payload(), mPacket)) {
+    Message mMessage;
+    if (! _builder.stripMessage(vFrame.payload(), mMessage)) {
         return;
     }
 
     // FIXME: Needs MessageInterpreter class for data in each action [Sprint 8]
     GuiActionType mActionId;
     GuiActionData mData;
-    if (! interpretData(mPacket, mActionId, mData)) {
+    if (! interpretData(mMessage, mActionId, mData)) {
         return;
     }