diff --git a/reactos/drivers/usb/CMakeLists.txt b/reactos/drivers/usb/CMakeLists.txt
index a7eb481921d..291a4290b86 100644
--- a/reactos/drivers/usb/CMakeLists.txt
+++ b/reactos/drivers/usb/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-#add_subdirectory(nt4compat)
+add_subdirectory(nt4compat)
 add_subdirectory(usbd)
 #add_subdirectory(usbehci) The USB branch has usbehci_new
 #add_subdirectory(usbhub) Compiles, just skipped in trunk
diff --git a/reactos/drivers/usb/directory.rbuild b/reactos/drivers/usb/directory.rbuild
index 04b926b50fd..e81eb8b291a 100644
--- a/reactos/drivers/usb/directory.rbuild
+++ b/reactos/drivers/usb/directory.rbuild
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<!--directory name="nt4compat">
+	<directory name="nt4compat">
 		<xi:include href="nt4compat/directory.rbuild" />
-	</directory-->
+	</directory>
 	<directory name="usbd">
 		<xi:include href="usbd/usbd.rbuild" />
 	</directory>
diff --git a/reactos/drivers/usb/nt4compat/CMakeLists.txt b/reactos/drivers/usb/nt4compat/CMakeLists.txt
index 861e293ff6d..3075585ebec 100644
--- a/reactos/drivers/usb/nt4compat/CMakeLists.txt
+++ b/reactos/drivers/usb/nt4compat/CMakeLists.txt
@@ -1,2 +1,2 @@
 
-add_subdirectory(usbdriver)
+add_subdirectory(usbdrv)
diff --git a/reactos/drivers/usb/nt4compat/directory.rbuild b/reactos/drivers/usb/nt4compat/directory.rbuild
index 682ac9431c2..8f2df716086 100644
--- a/reactos/drivers/usb/nt4compat/directory.rbuild
+++ b/reactos/drivers/usb/nt4compat/directory.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="usbdriver">
-		<xi:include href="usbdriver/usbdriver.rbuild" />
+	<directory name="usbdrv">
+		<xi:include href="usbdrv/usbdrv.rbuild" />
 	</directory>
 </group>
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/CMakeLists.txt b/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt
similarity index 59%
rename from reactos/drivers/usb/nt4compat/usbdriver/CMakeLists.txt
rename to reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt
index 2bf1365a6ee..b44650507c1 100644
--- a/reactos/drivers/usb/nt4compat/usbdriver/CMakeLists.txt
+++ b/reactos/drivers/usb/nt4compat/usbdrv/CMakeLists.txt
@@ -25,11 +25,11 @@ list(APPEND SOURCE
     keyboard.c
     usbdriver.rc)
 
-add_library(usbdriver SHARED ${SOURCE})
+add_library(usbdrv SHARED ${SOURCE})
 
-set_module_type(usbdriver kernelmodedriver)
-add_importlibs(usbdriver ntoskrnl hal)
+set_module_type(usbdrv kernelmodedriver)
+add_importlibs(usbdrv ntoskrnl hal)
 
-add_pch(usbdriver usbdriver.h)
+add_pch(usbdrv usbdriver.h)
 
-add_cd_file(TARGET usbdriver DESTINATION reactos/system32/drivers FOR all)
+add_cd_file(TARGET usbdrv DESTINATION reactos/system32/drivers NO_CAB FOR all)
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c b/reactos/drivers/usb/nt4compat/usbdrv/bulkonly.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c
rename to reactos/drivers/usb/nt4compat/usbdrv/bulkonly.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/cbi.c b/reactos/drivers/usb/nt4compat/usbdrv/cbi.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/cbi.c
rename to reactos/drivers/usb/nt4compat/usbdrv/cbi.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c b/reactos/drivers/usb/nt4compat/usbdrv/compdrv.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/compdrv.c
rename to reactos/drivers/usb/nt4compat/usbdrv/compdrv.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/debug.h b/reactos/drivers/usb/nt4compat/usbdrv/debug.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/debug.h
rename to reactos/drivers/usb/nt4compat/usbdrv/debug.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c b/reactos/drivers/usb/nt4compat/usbdrv/devmgr.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/devmgr.c
rename to reactos/drivers/usb/nt4compat/usbdrv/devmgr.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h b/reactos/drivers/usb/nt4compat/usbdrv/devmgr.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/devmgr.h
rename to reactos/drivers/usb/nt4compat/usbdrv/devmgr.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c b/reactos/drivers/usb/nt4compat/usbdrv/dmgrdisp.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c
rename to reactos/drivers/usb/nt4compat/usbdrv/dmgrdisp.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/ehci.c b/reactos/drivers/usb/nt4compat/usbdrv/ehci.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/ehci.c
rename to reactos/drivers/usb/nt4compat/usbdrv/ehci.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/ehci.h b/reactos/drivers/usb/nt4compat/usbdrv/ehci.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/ehci.h
rename to reactos/drivers/usb/nt4compat/usbdrv/ehci.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/etd.c b/reactos/drivers/usb/nt4compat/usbdrv/etd.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/etd.c
rename to reactos/drivers/usb/nt4compat/usbdrv/etd.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/events.h b/reactos/drivers/usb/nt4compat/usbdrv/events.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/events.h
rename to reactos/drivers/usb/nt4compat/usbdrv/events.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c b/reactos/drivers/usb/nt4compat/usbdrv/gendrv.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/gendrv.c
rename to reactos/drivers/usb/nt4compat/usbdrv/gendrv.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/gendrv.h b/reactos/drivers/usb/nt4compat/usbdrv/gendrv.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/gendrv.h
rename to reactos/drivers/usb/nt4compat/usbdrv/gendrv.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/hcd.h b/reactos/drivers/usb/nt4compat/usbdrv/hcd.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/hcd.h
rename to reactos/drivers/usb/nt4compat/usbdrv/hcd.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/hub.c b/reactos/drivers/usb/nt4compat/usbdrv/hub.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/hub.c
rename to reactos/drivers/usb/nt4compat/usbdrv/hub.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/hub.h b/reactos/drivers/usb/nt4compat/usbdrv/hub.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/hub.h
rename to reactos/drivers/usb/nt4compat/usbdrv/hub.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/irplist.h b/reactos/drivers/usb/nt4compat/usbdrv/irplist.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/irplist.h
rename to reactos/drivers/usb/nt4compat/usbdrv/irplist.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c b/reactos/drivers/usb/nt4compat/usbdrv/keyboard.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/keyboard.c
rename to reactos/drivers/usb/nt4compat/usbdrv/keyboard.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/keyboard.h b/reactos/drivers/usb/nt4compat/usbdrv/keyboard.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/keyboard.h
rename to reactos/drivers/usb/nt4compat/usbdrv/keyboard.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/mouse.c b/reactos/drivers/usb/nt4compat/usbdrv/mouse.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/mouse.c
rename to reactos/drivers/usb/nt4compat/usbdrv/mouse.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/mouse.h b/reactos/drivers/usb/nt4compat/usbdrv/mouse.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/mouse.h
rename to reactos/drivers/usb/nt4compat/usbdrv/mouse.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/ohci.c b/reactos/drivers/usb/nt4compat/usbdrv/ohci.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/ohci.c
rename to reactos/drivers/usb/nt4compat/usbdrv/ohci.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/ohci.h b/reactos/drivers/usb/nt4compat/usbdrv/ohci.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/ohci.h
rename to reactos/drivers/usb/nt4compat/usbdrv/ohci.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/roothub.c b/reactos/drivers/usb/nt4compat/usbdrv/roothub.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/roothub.c
rename to reactos/drivers/usb/nt4compat/usbdrv/roothub.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/td.c b/reactos/drivers/usb/nt4compat/usbdrv/td.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/td.c
rename to reactos/drivers/usb/nt4compat/usbdrv/td.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/td.h b/reactos/drivers/usb/nt4compat/usbdrv/td.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/td.h
rename to reactos/drivers/usb/nt4compat/usbdrv/td.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/uhci.c b/reactos/drivers/usb/nt4compat/usbdrv/uhci.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/uhci.c
rename to reactos/drivers/usb/nt4compat/usbdrv/uhci.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/uhciver.h b/reactos/drivers/usb/nt4compat/usbdrv/uhciver.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/uhciver.h
rename to reactos/drivers/usb/nt4compat/usbdrv/uhciver.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/umss.c b/reactos/drivers/usb/nt4compat/usbdrv/umss.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/umss.c
rename to reactos/drivers/usb/nt4compat/usbdrv/umss.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/umss.h b/reactos/drivers/usb/nt4compat/usbdrv/umss.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/umss.h
rename to reactos/drivers/usb/nt4compat/usbdrv/umss.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/usb.c b/reactos/drivers/usb/nt4compat/usbdrv/usb.c
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/usb.c
rename to reactos/drivers/usb/nt4compat/usbdrv/usb.c
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/usb.h b/reactos/drivers/usb/nt4compat/usbdrv/usb.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/usb.h
rename to reactos/drivers/usb/nt4compat/usbdrv/usb.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h b/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.h
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/usbdriver.h
rename to reactos/drivers/usb/nt4compat/usbdrv/usbdriver.h
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rc b/reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rc
similarity index 100%
rename from reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rc
rename to reactos/drivers/usb/nt4compat/usbdrv/usbdriver.rc
diff --git a/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild b/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild
similarity index 77%
rename from reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild
rename to reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild
index 770e77e5434..9aad31dadba 100644
--- a/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild
+++ b/reactos/drivers/usb/nt4compat/usbdrv/usbdrv.rbuild
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="usbdriver" type="kernelmodedriver" installbase="system32/drivers" installname="usbdriver.sys">
+<module name="usbdrv" type="kernelmodedriver" installbase="system32/drivers" installname="usbdrv.sys">
+	<bootstrap installbase="$(CDOUTPUT)/system32/drivers" />
 	<define name="INCLUDE_EHCI" />
 	<define name="_MULTI_UHCI" />
 	<define name="_MULTI_EHCI" />
 	<define name="_X86" />
-	<include base="usbdriver">.</include>
+	<include base="usbdrv">.</include>
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<file>ehci.c</file>