Index: main.cpp
===================================================================
diff -u -r3a68ae894549f9b0664ddb817458ca771ec3dd30 -rd3f98384e9400f8acb84c88dee75f1c480986998
--- main.cpp	(.../main.cpp)	(revision 3a68ae894549f9b0664ddb817458ca771ec3dd30)
+++ main.cpp	(.../main.cpp)	(revision d3f98384e9400f8acb84c88dee75f1c480986998)
@@ -30,7 +30,7 @@
 // Project
 #include "maintimer.h"
 #include "caninterface.h"
-#include "messagehandler.h"
+#include "frameinterface.h"
 #include "messagedispatcher.h"
 #include "applicationcontroller.h"
 #include "guicontroller.h"
@@ -55,11 +55,11 @@
     QCoreApplication::setOrganizationName(QLatin1String("Diality Inc."));
 
     // Test code for debugging can messages
-    bool _consoleoutMessageHandler = false;
+    bool _consoleoutFrameInterface = false;
     bool _consoleoutCanInterface   = false;
     QStringList args = app.arguments();
     if (args.length() >= 2) {
-        _consoleoutMessageHandler = args[1] == "1";
+        _consoleoutFrameInterface = args[1] == "1";
     }
     if (args.length() >= 3) {
         _consoleoutCanInterface   = args[2] == "1";
@@ -90,11 +90,11 @@
     _CanInterface->enableConsoleOut(_consoleoutCanInterface);
 
     //! - Initializing CanBus Message Handler
-    _MessageHandler->init();
+    _FrameInterface->init();
 
     //! - Initializing CanBus Message Dispatcher
     _MessageDispatcher->init();
-    _MessageDispatcher->enableConsoleOut(_consoleoutMessageHandler);
+    _MessageDispatcher->enableConsoleOut(_consoleoutFrameInterface);
 
     //! - Initializing Application Controller
     _ApplicationController->init();