Index: unittests/tst_threads.cpp
===================================================================
diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r3aab84456cfbdc4c4f495975ba9b8968eb844309
--- unittests/tst_threads.cpp	(.../tst_threads.cpp)	(revision b798668f16ad0967ab97e96f5f9a2cdd821e899f)
+++ unittests/tst_threads.cpp	(.../tst_threads.cpp)	(revision 3aab84456cfbdc4c4f495975ba9b8968eb844309)
@@ -19,7 +19,7 @@
 #include "threads.h"
 #include "applicationcontroller.h"
 #include "guicontroller.h"
-#include "usbwatcher.h"
+#include "DriveWatcher.h"
 #include "caninterface.h"
 #include "frameinterface.h"
 #include "messagedispatcher.h"
@@ -35,7 +35,7 @@
 void tst_threads::tst_Thread_init()
 {
     QCOMPARE( _Logger                 .init(Threads::_Logger_Thread       ), ! _Logger                 .init(Threads::_Logger_Thread       ));
-    QCOMPARE( _USBWatcher             .init(Threads::_USBWatcher_Thread   ), ! _USBWatcher             .init(Threads::_USBWatcher_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    ));
@@ -47,7 +47,7 @@
 void tst_threads::tst_Thread_names()
 {
     QCOMPARE( _Logger                 .thread()->objectName(), "Storage::Logger_Thread"         );
-    QCOMPARE( _USBWatcher             .thread()->objectName(), "Storage::USBWatcher_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" );