Index: main.cpp
===================================================================
diff -u -r6816b783f50e08267aa016d64350bc020080d901 -r61f16c988a159401c92730b4cbfca5085c77222f
--- main.cpp	(.../main.cpp)	(revision 6816b783f50e08267aa016d64350bc020080d901)
+++ main.cpp	(.../main.cpp)	(revision 61f16c988a159401c92730b4cbfca5085c77222f)
@@ -46,7 +46,7 @@
 #include "ApplicationController.h"
 #include "GuiController.h"
 #include "Logger.h"
-#include "DriveWatcher.h"
+#include "DeviceController.h"
 #include "WifiInterface.h"
 
 #include "Threads.h"
@@ -320,8 +320,8 @@
                   " \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ");
     }
 
-    //! - Initializing the Drive Watcher
-    _DriveWatcher.init(Threads::_DriveWatcher_Thread);
+    //! - Initializing the Device Controller
+    _DeviceController.init(Threads::_DeviceController_Thread);
 
     //! - Initializing the CANBus Interface
     if (_CanInterface.init(Threads::_CanFrame_Thread)) {