Index: unittests/tst_threads.cpp
===================================================================
diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r56e378f7504701b9e9a9dccaf205aef2fd52c58e
--- unittests/tst_threads.cpp	(.../tst_threads.cpp)	(revision b798668f16ad0967ab97e96f5f9a2cdd821e899f)
+++ unittests/tst_threads.cpp	(.../tst_threads.cpp)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
@@ -2,13 +2,14 @@
  *
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
- *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,
- *          IN PART OR IN WHOLE,
- *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file    tst_threads.cpp
- * \date    4/19/2020
- * \author  Behrouz NematiPour
+ * \file tst_threads.cpp
+ * \author (last) Behrouz NematiPour
+ * \date (last) 30-Jul-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 21-Apr-2020
  *
  */
 #include "tst_threads.h"
@@ -19,7 +20,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 +36,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 +48,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" );