diff --git a/repos/base/run/util_mmio.run b/repos/base/run/mmio.run
similarity index 81%
rename from repos/base/run/util_mmio.run
rename to repos/base/run/mmio.run
index 777f3b3375..8adaea8c63 100644
--- a/repos/base/run/util_mmio.run
+++ b/repos/base/run/mmio.run
@@ -2,7 +2,7 @@
 # Build
 #
 
-build "core init test/util_mmio"
+build "core init test/mmio"
 
 #
 # Boot image
@@ -24,13 +24,13 @@ install_config {
 		</default-route>
 		<default caps="100"/>
 		<start name="test">
-			<binary name="test-util_mmio"/>
+			<binary name="test-mmio"/>
 			<resource name="RAM" quantum="10M"/>
 		</start>
 	</config>
 }
 
-build_boot_image "core ld.lib.so init test-util_mmio"
+build_boot_image "core ld.lib.so init test-mmio"
 
 #
 # Execution
diff --git a/repos/base/src/test/util_mmio/main.cc b/repos/base/src/test/mmio/main.cc
similarity index 100%
rename from repos/base/src/test/util_mmio/main.cc
rename to repos/base/src/test/mmio/main.cc
diff --git a/repos/base/src/test/util_mmio/target.mk b/repos/base/src/test/mmio/target.mk
similarity index 89%
rename from repos/base/src/test/util_mmio/target.mk
rename to repos/base/src/test/mmio/target.mk
index 230b6c25f6..4eff71c9f2 100644
--- a/repos/base/src/test/util_mmio/target.mk
+++ b/repos/base/src/test/mmio/target.mk
@@ -5,7 +5,7 @@
 #
 
 # Set program name
-TARGET = test-util_mmio
+TARGET = test-mmio
 
 # Add C++ sources
 SRC_CC += main.cc
diff --git a/tool/autopilot.list b/tool/autopilot.list
index b23e817120..8c718d3463 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -101,7 +101,7 @@ trace_logger
 tz_vmm
 usb_hid
 utf8
-util_mmio
+mmio
 vbox4_ubuntu_14_04_32
 vbox4_ubuntu_14_04_64
 vbox4_ubuntu_16_04_32