diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index 3b46976ca7..6d59fef44a 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -2721,11 +2721,11 @@ class ITUNES_ASYNC(ITUNES):
         else:
             return BookList(self.log)
 
-    def disconnect_from_folder(self):
+    def unmount_device(self):
         '''
         '''
         if DEBUG:
-            self.log.info("ITUNES_ASYNC:disconnect_from_folder()")
+            self.log.info("ITUNES_ASYNC:unmount_device()")
         self.connected = False
 
     def eject(self):
diff --git a/src/calibre/devices/folder_device/driver.py b/src/calibre/devices/folder_device/driver.py
index e1c95e865a..1d00b32864 100644
--- a/src/calibre/devices/folder_device/driver.py
+++ b/src/calibre/devices/folder_device/driver.py
@@ -66,7 +66,7 @@ class FOLDER_DEVICE(USBMS):
               detected_device=None):
         pass
 
-    def disconnect_from_folder(self):
+    def unmount_device(self):
         self._main_prefix = ''
         self.is_connected = False
 
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 0e98b81f1c..22b8f2c8dc 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -201,10 +201,10 @@ class DeviceManager(Thread): # {{{
                 self.connected_device.eject()
                 self.ejected_devices.add(self.connected_device)
                 self.connected_slot(False, self.connected_device_kind)
-            elif hasattr(self.connected_device, 'disconnect_from_folder'):
+            elif hasattr(self.connected_device, 'unmount_device'):
                 # As we are on the wrong thread, this call must *not* do
                 # anything besides set a flag that the right thread will see.
-                self.connected_device.disconnect_from_folder()
+                self.connected_device.unmount_device()
 
     def next(self):
         if not self.jobs.empty():