diff --git a/src/calibre/devices/bebook/driver.py b/src/calibre/devices/bebook/driver.py
index 1b81fae27c..a0130cd7f8 100644
--- a/src/calibre/devices/bebook/driver.py
+++ b/src/calibre/devices/bebook/driver.py
@@ -14,9 +14,9 @@ class BEBOOK(USBMS):
     PRODUCT_ID  = [0x8803, 0x6803]
     BCD		= [0x312]
 
-    VENDOR_NAME = 'BEBOOK'
-    WINDOWS_MAIN_MEM = 'BEBOOK_INTERNAL_MEMORY'
-    WINDOWS_CARD_MEM = 'BEBOOK_STORAGE_CARD'
+    VENDOR_NAME = 'LINUX'
+    WINDOWS_MAIN_MEM = 'FILE-STOR_GADGET'
+    WINDOWS_CARD_MEM = 'FILE-STOR_GADGET'
 
     OSX_MAIN_MEM = 'BeBook Internal Memory'
     OSX_CARD_MEM = 'BeBook Storage Card'
@@ -28,15 +28,23 @@ class BEBOOK(USBMS):
 
     FDI_LUNS = {'lun0':1, 'lun1':0, 'lun2':2}
 
+    def windows_sort_drives(self, drives):
+        main = drives.get('main', None)
+        card = drives.get('card', None)
+        if card and main and card < main:
+            drives['main'] = card
+            drives['card'] = main
+
+        return drives
+
+
+
 class BEBOOKMINI(BEBOOK):
 
     VENDOR_ID	= [0x0492]
     PRODUCT_ID	= [0x8813]
     BCD		= [0x319]
 
-    WINDOWS_MAIN_MEM = 'BEBOOKMINI_INTERNAL_MEMORY'
-    WINDOWS_CARD_MEM = 'BEBOOKMINI_STORAGE_CARD'
-
     OSX_MAIN_MEM = 'BeBook Mini Internal Memory'
     OSX_CARD_MEM = 'BeBook Mini Storage Card'