diff --git a/drivers/usb/CMakeLists.txt b/drivers/usb/CMakeLists.txt
index 3f33c2b2c4f..0a24294acdb 100644
--- a/drivers/usb/CMakeLists.txt
+++ b/drivers/usb/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_subdirectory(usbccgp)
 add_subdirectory(usbd)
-add_subdirectory(usbehci_new)
-add_subdirectory(usbhub_new)
-add_subdirectory(usbohci_new)
+add_subdirectory(usbehci)
+add_subdirectory(usbhub)
+add_subdirectory(usbohci)
 add_subdirectory(usbport)
 add_subdirectory(usbstor)
 #add_subdirectory(usbstor_new)
-add_subdirectory(usbuhci_new)
+add_subdirectory(usbuhci)
diff --git a/drivers/usb/usbehci_new/CMakeLists.txt b/drivers/usb/usbehci/CMakeLists.txt
similarity index 100%
rename from drivers/usb/usbehci_new/CMakeLists.txt
rename to drivers/usb/usbehci/CMakeLists.txt
diff --git a/drivers/usb/usbehci_new/dbg_ehci.h b/drivers/usb/usbehci/dbg_ehci.h
similarity index 100%
rename from drivers/usb/usbehci_new/dbg_ehci.h
rename to drivers/usb/usbehci/dbg_ehci.h
diff --git a/drivers/usb/usbehci_new/debug.c b/drivers/usb/usbehci/debug.c
similarity index 100%
rename from drivers/usb/usbehci_new/debug.c
rename to drivers/usb/usbehci/debug.c
diff --git a/drivers/usb/usbehci_new/guid.c b/drivers/usb/usbehci/guid.c
similarity index 100%
rename from drivers/usb/usbehci_new/guid.c
rename to drivers/usb/usbehci/guid.c
diff --git a/drivers/usb/usbehci_new/hardware.h b/drivers/usb/usbehci/hardware.h
similarity index 100%
rename from drivers/usb/usbehci_new/hardware.h
rename to drivers/usb/usbehci/hardware.h
diff --git a/drivers/usb/usbehci_new/roothub.c b/drivers/usb/usbehci/roothub.c
similarity index 100%
rename from drivers/usb/usbehci_new/roothub.c
rename to drivers/usb/usbehci/roothub.c
diff --git a/drivers/usb/usbehci_new/usbehci.c b/drivers/usb/usbehci/usbehci.c
similarity index 100%
rename from drivers/usb/usbehci_new/usbehci.c
rename to drivers/usb/usbehci/usbehci.c
diff --git a/drivers/usb/usbehci_new/usbehci.h b/drivers/usb/usbehci/usbehci.h
similarity index 100%
rename from drivers/usb/usbehci_new/usbehci.h
rename to drivers/usb/usbehci/usbehci.h
diff --git a/drivers/usb/usbehci_new/usbehci.rc b/drivers/usb/usbehci/usbehci.rc
similarity index 100%
rename from drivers/usb/usbehci_new/usbehci.rc
rename to drivers/usb/usbehci/usbehci.rc
diff --git a/drivers/usb/usbhub_new/CMakeLists.txt b/drivers/usb/usbhub/CMakeLists.txt
similarity index 100%
rename from drivers/usb/usbhub_new/CMakeLists.txt
rename to drivers/usb/usbhub/CMakeLists.txt
diff --git a/drivers/usb/usbhub_new/dbg_uhub.h b/drivers/usb/usbhub/dbg_uhub.h
similarity index 100%
rename from drivers/usb/usbhub_new/dbg_uhub.h
rename to drivers/usb/usbhub/dbg_uhub.h
diff --git a/drivers/usb/usbhub_new/debug.c b/drivers/usb/usbhub/debug.c
similarity index 100%
rename from drivers/usb/usbhub_new/debug.c
rename to drivers/usb/usbhub/debug.c
diff --git a/drivers/usb/usbhub_new/guid.c b/drivers/usb/usbhub/guid.c
similarity index 100%
rename from drivers/usb/usbhub_new/guid.c
rename to drivers/usb/usbhub/guid.c
diff --git a/drivers/usb/usbhub_new/ioctl.c b/drivers/usb/usbhub/ioctl.c
similarity index 100%
rename from drivers/usb/usbhub_new/ioctl.c
rename to drivers/usb/usbhub/ioctl.c
diff --git a/drivers/usb/usbhub_new/pnp.c b/drivers/usb/usbhub/pnp.c
similarity index 100%
rename from drivers/usb/usbhub_new/pnp.c
rename to drivers/usb/usbhub/pnp.c
diff --git a/drivers/usb/usbhub_new/power.c b/drivers/usb/usbhub/power.c
similarity index 100%
rename from drivers/usb/usbhub_new/power.c
rename to drivers/usb/usbhub/power.c
diff --git a/drivers/usb/usbhub_new/usbhub.c b/drivers/usb/usbhub/usbhub.c
similarity index 100%
rename from drivers/usb/usbhub_new/usbhub.c
rename to drivers/usb/usbhub/usbhub.c
diff --git a/drivers/usb/usbhub_new/usbhub.h b/drivers/usb/usbhub/usbhub.h
similarity index 100%
rename from drivers/usb/usbhub_new/usbhub.h
rename to drivers/usb/usbhub/usbhub.h
diff --git a/drivers/usb/usbhub_new/usbhub.rc b/drivers/usb/usbhub/usbhub.rc
similarity index 100%
rename from drivers/usb/usbhub_new/usbhub.rc
rename to drivers/usb/usbhub/usbhub.rc
diff --git a/drivers/usb/usbohci_new/CMakeLists.txt b/drivers/usb/usbohci/CMakeLists.txt
similarity index 100%
rename from drivers/usb/usbohci_new/CMakeLists.txt
rename to drivers/usb/usbohci/CMakeLists.txt
diff --git a/drivers/usb/usbohci_new/dbg_ohci.h b/drivers/usb/usbohci/dbg_ohci.h
similarity index 100%
rename from drivers/usb/usbohci_new/dbg_ohci.h
rename to drivers/usb/usbohci/dbg_ohci.h
diff --git a/drivers/usb/usbohci_new/guid.c b/drivers/usb/usbohci/guid.c
similarity index 100%
rename from drivers/usb/usbohci_new/guid.c
rename to drivers/usb/usbohci/guid.c
diff --git a/drivers/usb/usbohci_new/hardware.h b/drivers/usb/usbohci/hardware.h
similarity index 100%
rename from drivers/usb/usbohci_new/hardware.h
rename to drivers/usb/usbohci/hardware.h
diff --git a/drivers/usb/usbohci_new/roothub.c b/drivers/usb/usbohci/roothub.c
similarity index 100%
rename from drivers/usb/usbohci_new/roothub.c
rename to drivers/usb/usbohci/roothub.c
diff --git a/drivers/usb/usbohci_new/usbohci.c b/drivers/usb/usbohci/usbohci.c
similarity index 100%
rename from drivers/usb/usbohci_new/usbohci.c
rename to drivers/usb/usbohci/usbohci.c
diff --git a/drivers/usb/usbohci_new/usbohci.h b/drivers/usb/usbohci/usbohci.h
similarity index 100%
rename from drivers/usb/usbohci_new/usbohci.h
rename to drivers/usb/usbohci/usbohci.h
diff --git a/drivers/usb/usbohci_new/usbohci.rc b/drivers/usb/usbohci/usbohci.rc
similarity index 100%
rename from drivers/usb/usbohci_new/usbohci.rc
rename to drivers/usb/usbohci/usbohci.rc
diff --git a/drivers/usb/usbuhci_new/CMakeLists.txt b/drivers/usb/usbuhci/CMakeLists.txt
similarity index 100%
rename from drivers/usb/usbuhci_new/CMakeLists.txt
rename to drivers/usb/usbuhci/CMakeLists.txt
diff --git a/drivers/usb/usbuhci_new/dbg_uhci.h b/drivers/usb/usbuhci/dbg_uhci.h
similarity index 100%
rename from drivers/usb/usbuhci_new/dbg_uhci.h
rename to drivers/usb/usbuhci/dbg_uhci.h
diff --git a/drivers/usb/usbuhci_new/guid.c b/drivers/usb/usbuhci/guid.c
similarity index 100%
rename from drivers/usb/usbuhci_new/guid.c
rename to drivers/usb/usbuhci/guid.c
diff --git a/drivers/usb/usbuhci_new/hardware.h b/drivers/usb/usbuhci/hardware.h
similarity index 100%
rename from drivers/usb/usbuhci_new/hardware.h
rename to drivers/usb/usbuhci/hardware.h
diff --git a/drivers/usb/usbuhci_new/roothub.c b/drivers/usb/usbuhci/roothub.c
similarity index 100%
rename from drivers/usb/usbuhci_new/roothub.c
rename to drivers/usb/usbuhci/roothub.c
diff --git a/drivers/usb/usbuhci_new/usbuhci.c b/drivers/usb/usbuhci/usbuhci.c
similarity index 100%
rename from drivers/usb/usbuhci_new/usbuhci.c
rename to drivers/usb/usbuhci/usbuhci.c
diff --git a/drivers/usb/usbuhci_new/usbuhci.h b/drivers/usb/usbuhci/usbuhci.h
similarity index 100%
rename from drivers/usb/usbuhci_new/usbuhci.h
rename to drivers/usb/usbuhci/usbuhci.h
diff --git a/drivers/usb/usbuhci_new/usbuhci.rc b/drivers/usb/usbuhci/usbuhci.rc
similarity index 100%
rename from drivers/usb/usbuhci_new/usbuhci.rc
rename to drivers/usb/usbuhci/usbuhci.rc