Index: sources/applicationcontroller.cpp
===================================================================
diff -u -r90bcc276f2a879169fef20e9168711cf906c0e54 -r3aab84456cfbdc4c4f495975ba9b8968eb844309
--- sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision 90bcc276f2a879169fef20e9168711cf906c0e54)
+++ sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision 3aab84456cfbdc4c4f495975ba9b8968eb844309)
@@ -21,7 +21,7 @@
 #include "guicontroller.h"
 #include "messagedispatcher.h"
 #include "logger.h"
-#include "usbwatcher.h"
+#include "DriveWatcher.h"
 #include "filehandler.h"
 
 /*!
@@ -100,9 +100,9 @@
 
     connect(&_GuiController , SIGNAL(didUSBDriveUmount()),
             this            ,   SLOT( onUSBDriveUmount()));
-    connect(&_USBWatcher    , SIGNAL(didUSBDriveMount ()),
+    connect(&_DriveWatcher  , SIGNAL(didUSBDriveMount ()),
             this            ,   SLOT( onUSBDriveMount ()));
-    connect(&_USBWatcher    , SIGNAL(didUSBDriveRemove()),
+    connect(&_DriveWatcher  , SIGNAL(didUSBDriveRemove()),
             this            ,   SLOT( onUSBDriveRemove()));
 
     connect(&_GuiController , SIGNAL(didExportLog()),
@@ -186,7 +186,7 @@
 
 /*!
  * \brief   ApplicationController::onUSBDriveMount
- * \details This is the slot which connects to the _USBWatcher didUSBDriveMount signal
+ * \details This is the slot which connects to the _DriveWatcher didUSBDriveMount signal
  *          and notifies the other classes (GuiController) by emitting its signal didUSBDriveMount
  */
 void ApplicationController::onUSBDriveMount ()
@@ -200,7 +200,7 @@
 /*!
  * \brief   ApplicationController::onUSBDriveRemove
  * \details This is the slot which connects to the _GuiController didUSBDriveUmount signal
- *          and notifies the other classes (USBWatcher) by emitting its signal didUSBDriveUmount
+ *          and notifies the other classes (DriveWatcher) by emitting its signal didUSBDriveUmount
  */
 void ApplicationController::onUSBDriveUmount()
 {
@@ -212,7 +212,7 @@
 
 /*!
  * \brief   ApplicationController::onUSBDriveRemove
- * \details This is the slot which connects to the _USBWatcher didUSBDriveRemove signal
+ * \details This is the slot which connects to the _DriveWatcher didUSBDriveRemove signal
  *          and notifies the other classes (GuiController) by emitting its signal didUSBDriveRemove
  */
 void ApplicationController::onUSBDriveRemove()