Index: unittests/tst_threads.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r61f16c988a159401c92730b4cbfca5085c77222f
--- unittests/tst_threads.cpp	(.../tst_threads.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ unittests/tst_threads.cpp	(.../tst_threads.cpp)	(revision 61f16c988a159401c92730b4cbfca5085c77222f)
@@ -20,7 +20,7 @@
 #include "Threads.h"
 #include "ApplicationController.h"
 #include "GuiController.h"
-#include "DriveWatcher.h"
+#include "DeviceController.h"
 #include "CanInterface.h"
 #include "FrameInterface.h"
 #include "MessageDispatcher.h"
@@ -35,25 +35,25 @@
 
 void tst_threads::tst_Thread_init()
 {
-    QCOMPARE( _Logger                 .init(Threads::_Logger_Thread       ), ! _Logger                 .init(Threads::_Logger_Thread       ));
-    QCOMPARE( _DriveWatcher           .init(Threads::_DriveWatcher_Thread ), ! _DriveWatcher           .init(Threads::_DriveWatcher_Thread ));
-    QCOMPARE( _CanInterface           .init(Threads::_CanFrame_Thread     ), ! _CanInterface           .init(Threads::_CanFrame_Thread     ));
-    QCOMPARE( _FrameInterface         .init(Threads::_CanFrame_Thread     ), ! _FrameInterface         .init(Threads::_CanFrame_Thread     ));
-    QCOMPARE( _MessageAcknowModel     .init(Threads::_CanAcknow_Thread    ), ! _MessageAcknowModel     .init(Threads::_CanAcknow_Thread    ));
-    QCOMPARE( _MessageDispatcher      .init(Threads::_CanMessage_Thread   ), ! _MessageDispatcher      .init(Threads::_CanMessage_Thread   ));
-    QCOMPARE( _ApplicationController  .init(Threads::_Application_Thread  ), ! _ApplicationController  .init(Threads::_Application_Thread  ));
-    QCOMPARE( _GuiController          .init(Threads::_Application_Thread  ), ! _GuiController          .init(Threads::_Application_Thread  ));
+    QCOMPARE( _Logger                 .init(Threads::_Logger_Thread             ), ! _Logger                 .init(Threads::_Logger_Thread              ));
+    QCOMPARE( _DeviceController       .init(Threads::_DeviceController_Thread   ), ! _DeviceController       .init(Threads::_DeviceController_Thread    ));
+    QCOMPARE( _CanInterface           .init(Threads::_CanFrame_Thread           ), ! _CanInterface           .init(Threads::_CanFrame_Thread            ));
+    QCOMPARE( _FrameInterface         .init(Threads::_CanFrame_Thread           ), ! _FrameInterface         .init(Threads::_CanFrame_Thread            ));
+    QCOMPARE( _MessageAcknowModel     .init(Threads::_CanAcknow_Thread          ), ! _MessageAcknowModel     .init(Threads::_CanAcknow_Thread           ));
+    QCOMPARE( _MessageDispatcher      .init(Threads::_CanMessage_Thread         ), ! _MessageDispatcher      .init(Threads::_CanMessage_Thread          ));
+    QCOMPARE( _ApplicationController  .init(Threads::_Application_Thread        ), ! _ApplicationController  .init(Threads::_Application_Thread         ));
+    QCOMPARE( _GuiController          .init(Threads::_Application_Thread        ), ! _GuiController          .init(Threads::_Application_Thread         ));
 }
 
 void tst_threads::tst_Thread_names()
 {
-    QCOMPARE( _Logger                 .thread()->objectName(), "Storage::Logger_Thread"         );
-    QCOMPARE( _DriveWatcher           .thread()->objectName(), "Storage::DriveWatcher_Thread"   );
-    QCOMPARE( _CanInterface           .thread()->objectName(), "Can::FrameInterface_Thread"     );
-    QCOMPARE( _FrameInterface         .thread()->objectName(), "Can::FrameInterface_Thread"     );
-    QCOMPARE( _MessageAcknowModel     .thread()->objectName(), "Can::MessageAcknowModel_Thread" );
-    QCOMPARE( _MessageDispatcher      .thread()->objectName(), "Can::MessageDispatcher_Thread"  );
-    QCOMPARE( _ApplicationController  .thread()->objectName(), "Gui::GuiController_Thread"      );
-    QCOMPARE( _GuiController          .thread()->objectName(), "Gui::GuiController_Thread"      );
+    QCOMPARE( _Logger                 .thread()->objectName(), "Storage::Logger_Thread"             );
+    QCOMPARE( _DeviceController       .thread()->objectName(), "Storage::DeviceController_Thread"   );
+    QCOMPARE( _CanInterface           .thread()->objectName(), "Can::FrameInterface_Thread"         );
+    QCOMPARE( _FrameInterface         .thread()->objectName(), "Can::FrameInterface_Thread"         );
+    QCOMPARE( _MessageAcknowModel     .thread()->objectName(), "Can::MessageAcknowModel_Thread"     );
+    QCOMPARE( _MessageDispatcher      .thread()->objectName(), "Can::MessageDispatcher_Thread"      );
+    QCOMPARE( _ApplicationController  .thread()->objectName(), "Gui::GuiController_Thread"          );
+    QCOMPARE( _GuiController          .thread()->objectName(), "Gui::GuiController_Thread"          );
 }