Index: unittests/tst_threads.cpp
===================================================================
diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -rf6c480d06e4b8c770012115d20df2a44e0da8031
--- unittests/tst_threads.cpp	(.../tst_threads.cpp)	(revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997)
+++ unittests/tst_threads.cpp	(.../tst_threads.cpp)	(revision f6c480d06e4b8c770012115d20df2a44e0da8031)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 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.
  *
- * \file tst_threads.cpp
- * \author (last) Behrouz NematiPour
- * \date (last) 30-Jul-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 21-Apr-2020
+ * \file    tst_threads.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      22-Feb-2024
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  21-Apr-2020
  *
  */
 #include "tst_threads.h"
@@ -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::_Gui_Thread                ), ! _GuiController          .init(Threads::_Gui_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(), "Device::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(), "ApplicationController_Thread"  );
+    QCOMPARE( _GuiController          .thread()->objectName(), "Gui::GuiController_Thread"          );
 }