diff --git a/src/add-ons/kernel/drivers/audio/Jamfile b/src/add-ons/kernel/drivers/audio/Jamfile
index f65610da6ac..470af641eb2 100644
--- a/src/add-ons/kernel/drivers/audio/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/Jamfile
@@ -9,5 +9,5 @@ SubInclude HAIKU_TOP src add-ons kernel drivers audio ice1712 ;
 SubInclude HAIKU_TOP src add-ons kernel drivers audio module_driver ;
 SubInclude HAIKU_TOP src add-ons kernel drivers audio null ;
 SubInclude HAIKU_TOP src add-ons kernel drivers audio sb16 ;
-SubInclude HAIKU_TOP src add-ons kernel drivers audio usb_audio ;
+SubInclude HAIKU_TOP src add-ons kernel drivers audio usb ;
 
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/AudioControlInterface.cpp b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/AudioControlInterface.cpp
rename to src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.cpp
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/AudioControlInterface.h b/src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.h
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/AudioControlInterface.h
rename to src/add-ons/kernel/drivers/audio/usb/AudioControlInterface.h
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/AudioStreamingInterface.cpp b/src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/AudioStreamingInterface.cpp
rename to src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.cpp
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/AudioStreamingInterface.h b/src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.h
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/AudioStreamingInterface.h
rename to src/add-ons/kernel/drivers/audio/usb/AudioStreamingInterface.h
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Device.cpp b/src/add-ons/kernel/drivers/audio/usb/Device.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Device.cpp
rename to src/add-ons/kernel/drivers/audio/usb/Device.cpp
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Device.h b/src/add-ons/kernel/drivers/audio/usb/Device.h
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Device.h
rename to src/add-ons/kernel/drivers/audio/usb/Device.h
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Driver.cpp b/src/add-ons/kernel/drivers/audio/usb/Driver.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Driver.cpp
rename to src/add-ons/kernel/drivers/audio/usb/Driver.cpp
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Driver.h b/src/add-ons/kernel/drivers/audio/usb/Driver.h
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Driver.h
rename to src/add-ons/kernel/drivers/audio/usb/Driver.h
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Jamfile b/src/add-ons/kernel/drivers/audio/usb/Jamfile
similarity index 83%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Jamfile
rename to src/add-ons/kernel/drivers/audio/usb/Jamfile
index fca7d129a5e..b012a73373b 100644
--- a/src/add-ons/kernel/drivers/audio/usb_audio/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/usb/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons kernel drivers audio usb_audio ;
+SubDir HAIKU_TOP src add-ons kernel drivers audio usb ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Settings.cpp b/src/add-ons/kernel/drivers/audio/usb/Settings.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Settings.cpp
rename to src/add-ons/kernel/drivers/audio/usb/Settings.cpp
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Settings.h b/src/add-ons/kernel/drivers/audio/usb/Settings.h
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Settings.h
rename to src/add-ons/kernel/drivers/audio/usb/Settings.h
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Stream.cpp b/src/add-ons/kernel/drivers/audio/usb/Stream.cpp
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Stream.cpp
rename to src/add-ons/kernel/drivers/audio/usb/Stream.cpp
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/Stream.h b/src/add-ons/kernel/drivers/audio/usb/Stream.h
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/Stream.h
rename to src/add-ons/kernel/drivers/audio/usb/Stream.h
diff --git a/src/add-ons/kernel/drivers/audio/usb_audio/usb_audio.settings b/src/add-ons/kernel/drivers/audio/usb/usb_audio.settings
similarity index 100%
rename from src/add-ons/kernel/drivers/audio/usb_audio/usb_audio.settings
rename to src/add-ons/kernel/drivers/audio/usb/usb_audio.settings