diff --git a/drivers/usb/CMakeLists.txt b/drivers/usb/CMakeLists.txt
index 48be424a694..9afa4fb8963 100644
--- a/drivers/usb/CMakeLists.txt
+++ b/drivers/usb/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(usbccgp)
 add_subdirectory(usbd)
-add_subdirectory(usbehci_new)
-add_subdirectory(usbhub_new)
+add_subdirectory(usbehci)
+add_subdirectory(usbhub)
 add_subdirectory(usbohci)
 add_subdirectory(usbstor)
\ No newline at end of file
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/hardware.cpp b/drivers/usb/usbehci/hardware.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/hardware.cpp
rename to drivers/usb/usbehci/hardware.cpp
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/hcd_controller.cpp b/drivers/usb/usbehci/hcd_controller.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/hcd_controller.cpp
rename to drivers/usb/usbehci/hcd_controller.cpp
diff --git a/drivers/usb/usbehci_new/hub_controller.cpp b/drivers/usb/usbehci/hub_controller.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/hub_controller.cpp
rename to drivers/usb/usbehci/hub_controller.cpp
diff --git a/drivers/usb/usbehci_new/interfaces.h b/drivers/usb/usbehci/interfaces.h
similarity index 100%
rename from drivers/usb/usbehci_new/interfaces.h
rename to drivers/usb/usbehci/interfaces.h
diff --git a/drivers/usb/usbehci_new/memory_manager.cpp b/drivers/usb/usbehci/memory_manager.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/memory_manager.cpp
rename to drivers/usb/usbehci/memory_manager.cpp
diff --git a/drivers/usb/usbehci_new/misc.cpp b/drivers/usb/usbehci/misc.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/misc.cpp
rename to drivers/usb/usbehci/misc.cpp
diff --git a/drivers/usb/usbehci_new/purecall.cpp b/drivers/usb/usbehci/purecall.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/purecall.cpp
rename to drivers/usb/usbehci/purecall.cpp
diff --git a/drivers/usb/usbehci_new/usb_device.cpp b/drivers/usb/usbehci/usb_device.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/usb_device.cpp
rename to drivers/usb/usbehci/usb_device.cpp
diff --git a/drivers/usb/usbehci_new/usb_queue.cpp b/drivers/usb/usbehci/usb_queue.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/usb_queue.cpp
rename to drivers/usb/usbehci/usb_queue.cpp
diff --git a/drivers/usb/usbehci_new/usb_request.cpp b/drivers/usb/usbehci/usb_request.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/usb_request.cpp
rename to drivers/usb/usbehci/usb_request.cpp
diff --git a/drivers/usb/usbehci_new/usbehci.cpp b/drivers/usb/usbehci/usbehci.cpp
similarity index 100%
rename from drivers/usb/usbehci_new/usbehci.cpp
rename to drivers/usb/usbehci/usbehci.cpp
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/fdo.c b/drivers/usb/usbhub/fdo.c
similarity index 100%
rename from drivers/usb/usbhub_new/fdo.c
rename to drivers/usb/usbhub/fdo.c
diff --git a/drivers/usb/usbhub_new/misc.c b/drivers/usb/usbhub/misc.c
similarity index 100%
rename from drivers/usb/usbhub_new/misc.c
rename to drivers/usb/usbhub/misc.c
diff --git a/drivers/usb/usbhub_new/pdo.c b/drivers/usb/usbhub/pdo.c
similarity index 100%
rename from drivers/usb/usbhub_new/pdo.c
rename to drivers/usb/usbhub/pdo.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