diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc
index 4dd7a8db7c..776816e9c0 100644
--- a/repos/base/run/platform_drv.inc
+++ b/repos/base/run/platform_drv.inc
@@ -37,7 +37,7 @@ proc platform_drv_policy {} {
 			<policy label="wifi_drv"> <pci class="WIFI"/> </policy>
 			<policy label="usb_drv">  <pci class="USB"/> </policy>
 			<policy label="ahci_drv"> <pci class="AHCI"/> </policy>
-			<policy label="audio_out_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
+			<policy label="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
 	} else {
 		return {}
 	}
diff --git a/repos/dde_bsd/run/audio_in.run b/repos/dde_bsd/run/audio_in.run
index b1709caa4f..837bd4a8d9 100644
--- a/repos/dde_bsd/run/audio_in.run
+++ b/repos/dde_bsd/run/audio_in.run
@@ -1,5 +1,16 @@
 assert_spec x86
 
+if {[have_include "power_on/qemu"]} {
+	puts "\nAudio_in test running on Qemu is not supported.\n"
+	exit 0
+}
+
+if {[have_spec linux]} {
+	puts"\nAudio_in test running on Linux is not supported.\n"
+	exit 0
+}
+
+
 #
 # Build
 #
@@ -7,7 +18,7 @@ assert_spec x86
 set build_components {
 	core init
 	drivers/timer
-	drivers/audio_out
+	drivers/audio
 	test/audio_in
 }
 
@@ -48,7 +59,7 @@ append config {
 append_platform_drv_config
 
 append config {
-	<start name="audio_out_drv">
+	<start name="audio_drv">
 		<resource name="RAM" quantum="8M"/>
 		<provides>
 			<service name="Audio_out"/>
@@ -73,13 +84,11 @@ install_config $config
 #
 
 set boot_modules {
-	core init timer audio_out_drv test-audio_in
+	core init timer audio_drv test-audio_in
 }
 
 append_platform_drv_boot_modules
 
 build_boot_image $boot_modules
 
-append qemu_args " -m 128 -nographic -soundhw es1370 "
-
 run_genode_until forever
diff --git a/repos/dde_bsd/run/audio_out.run b/repos/dde_bsd/run/audio_out.run
index f65300604c..80ac5e925f 100644
--- a/repos/dde_bsd/run/audio_out.run
+++ b/repos/dde_bsd/run/audio_out.run
@@ -19,7 +19,7 @@ set use_mixer 0
 set build_components {
 	core init
 	drivers/timer
-	drivers/audio_out
+	drivers/audio
 	test/audio_out
 }
 
@@ -66,13 +66,13 @@ append_if $use_mixer config {
 		<resource name="RAM" quantum="2M"/>
 		<provides><service name="Audio_out"/></provides>
 		<route>
-			<service name="Audio_out"> <child name="audio_out_drv"/> </service>
+			<service name="Audio_out"> <child name="audio_drv"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>}
 
 append config {
-	<start name="audio_out_drv">
+	<start name="audio_drv">
 		<resource name="RAM" quantum="8M"/>
 		<provides>
 			<service name="Audio_out"/>
@@ -117,7 +117,7 @@ if {![file exists bin/sample.raw]} {
 #
 
 set boot_modules {
-	core init timer audio_out_drv test-audio_out sample.raw }
+	core init timer audio_drv test-audio_out sample.raw }
 
 lappend_if $use_mixer boot_modules mixer
 
diff --git a/repos/dde_bsd/src/drivers/audio_out/main.cc b/repos/dde_bsd/src/drivers/audio/main.cc
similarity index 100%
rename from repos/dde_bsd/src/drivers/audio_out/main.cc
rename to repos/dde_bsd/src/drivers/audio/main.cc
diff --git a/repos/dde_bsd/src/drivers/audio_out/target.mk b/repos/dde_bsd/src/drivers/audio/target.mk
similarity index 81%
rename from repos/dde_bsd/src/drivers/audio_out/target.mk
rename to repos/dde_bsd/src/drivers/audio/target.mk
index 66e3956365..f0736a08bd 100644
--- a/repos/dde_bsd/src/drivers/audio_out/target.mk
+++ b/repos/dde_bsd/src/drivers/audio/target.mk
@@ -1,5 +1,5 @@
-TARGET   = audio_out_drv
 REQUIRES = x86
+TARGET   = audio_drv
 SRC_CC   = main.cc
 LIBS     = dde_bsd_audio base config server
 INC_DIR += $(REP_DIR)/include
diff --git a/repos/libports/run/avplay.run b/repos/libports/run/avplay.run
index 6a54c3ac48..11fe0bfa3c 100644
--- a/repos/libports/run/avplay.run
+++ b/repos/libports/run/avplay.run
@@ -5,7 +5,7 @@
 set build_components {
 	core init
 	drivers/timer
-	drivers/framebuffer drivers/input drivers/audio_out
+	drivers/framebuffer drivers/input drivers/audio
 	server/mixer
 	app/avplay drivers/acpi
 }
@@ -80,7 +80,7 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Timer"/></provides>
 	</start>
-	<start name="audio_out_drv">
+	<start name="audio_drv">
 		<resource name="RAM" quantum="8M"/>
 		<route>
 			<any-service> <any-child /> <parent /></any-service>
@@ -93,7 +93,7 @@ append config {
 		<resource name="RAM" quantum="4M"/>
 		<provides><service name="Audio_out"/></provides>
 		<route>
-			<service name="Audio_out"> <child name="audio_out_drv"/> </service>
+			<service name="Audio_out"> <child name="audio_drv"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
@@ -126,7 +126,7 @@ install_config $config
 #
 
 set boot_modules {
-	core init timer audio_out_drv mixer avplay
+	core init timer audio_drv mixer avplay
 	ld.lib.so libc.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so
 	avfilter.lib.so avutil.lib.so avcodec.lib.so avformat.lib.so swscale.lib.so
 	mediafile
diff --git a/repos/os/run/mixer.run b/repos/os/run/mixer.run
index 7fe2a93fea..ac0c18e61c 100644
--- a/repos/os/run/mixer.run
+++ b/repos/os/run/mixer.run
@@ -6,7 +6,7 @@
 set build_components {
 	core init
 	drivers/timer
-	drivers/audio_out
+	drivers/audio
 	server/mixer
 	test/audio_out
 }
@@ -45,7 +45,7 @@ set config  {
 append_platform_drv_config
 
 append config {
-		<start name="audio_out_drv">
+		<start name="audio_drv">
 			<resource name="RAM" quantum="6M"/>
 			<provides>
 				<service name="Audio_out"/>
@@ -60,7 +60,7 @@ append config {
 			<resource name="RAM" quantum="1M"/>
 			<provides><service name="Audio_out"/></provides>
 			<route>
-				<service name="Audio_out"> <child name="audio_out_drv"/> </service>
+				<service name="Audio_out"> <child name="audio_drv"/> </service>
 				<any-service> <parent/> <any-child/> </any-service>
 			</route>
 		</start>
@@ -90,7 +90,7 @@ install_config $config
 set boot_modules {
 	core init
 	timer
-	audio_out_drv
+	audio_drv
 	test-audio_out
 	sample.raw
 	vogel.f32
diff --git a/repos/os/src/drivers/audio_out/linux/alsa.c b/repos/os/src/drivers/audio/linux/alsa.c
similarity index 100%
rename from repos/os/src/drivers/audio_out/linux/alsa.c
rename to repos/os/src/drivers/audio/linux/alsa.c
diff --git a/repos/os/src/drivers/audio_out/linux/alsa.h b/repos/os/src/drivers/audio/linux/alsa.h
similarity index 100%
rename from repos/os/src/drivers/audio_out/linux/alsa.h
rename to repos/os/src/drivers/audio/linux/alsa.h
diff --git a/repos/os/src/drivers/audio_out/linux/main.cc b/repos/os/src/drivers/audio/linux/main.cc
similarity index 100%
rename from repos/os/src/drivers/audio_out/linux/main.cc
rename to repos/os/src/drivers/audio/linux/main.cc
diff --git a/repos/os/src/drivers/audio_out/linux/target.mk b/repos/os/src/drivers/audio/linux/target.mk
similarity index 78%
rename from repos/os/src/drivers/audio_out/linux/target.mk
rename to repos/os/src/drivers/audio/linux/target.mk
index 22309f1494..20434725c6 100644
--- a/repos/os/src/drivers/audio_out/linux/target.mk
+++ b/repos/os/src/drivers/audio/linux/target.mk
@@ -1,5 +1,5 @@
 REQUIRES = linux
-TARGET   = audio_out_drv
+TARGET   = audio_drv
 LIBS     = lx_hybrid
 SRC_CC   = main.cc
 SRC_C    = alsa.c
diff --git a/repos/ports/run/dosbox.run b/repos/ports/run/dosbox.run
index 8075fc8c33..fb8e98f992 100644
--- a/repos/ports/run/dosbox.run
+++ b/repos/ports/run/dosbox.run
@@ -5,7 +5,7 @@
 set build_components {
 	core init
 	drivers/timer
-	drivers/audio_out
+	drivers/audio
 	drivers/framebuffer drivers/input
 	app/dosbox
 }
@@ -17,7 +17,7 @@ proc platform_drv_policy {} {
 			<policy label="ps2_drv"> <device name="PS2"/> </policy>
 			<policy label="usb_drv"> <pci class="USB"/> </policy>
 			<policy label="fb_drv">  <pci class="VGA"/> </policy>
-			<policy label="audio_out_drv"> <pci class="AUDIO"/> </policy>}
+			<policy label="audio_drv"> <pci class="AUDIO"/> <pci class="HDAUDIO"/> </policy>}
 }
 
 append_platform_drv_build_components
@@ -81,7 +81,7 @@ append_if [have_spec ps2] config {
 	</start>}
 
 append config {
-	<start name="audio_out_drv">
+	<start name="audio_drv">
 		<resource name="RAM" quantum="6M"/>
 		<provides><service name="Audio_out"/></provides>
 	</start>
@@ -120,7 +120,7 @@ if {![file exists bin/dosbox.tar]} {
 
 # generic modules
 set boot_modules {
-	core init timer audio_out_drv
+	core init timer audio_drv
 	ld.lib.so
 	libc.lib.so
 	libm.lib.so lwip.lib.so libpng.lib.so