diff --git a/doc/components.txt b/doc/components.txt
index 8d3cca589..bfdb31a51 100644
--- a/doc/components.txt
+++ b/doc/components.txt
@@ -336,7 +336,7 @@ Separate components:
   A file system server that makes the file system of a Linux base platform
   available to Genode.
 
-:'os/src/server/rom_loopdev':
+:'os/src/server/rom_blk':
   Provides the content of a ROM file as a block session, similar to the
   loop-mount mechanism on Linux
 
diff --git a/os/run/rom_blk.run b/os/run/rom_blk.run
index 1b05306e0..05fa16b9b 100644
--- a/os/run/rom_blk.run
+++ b/os/run/rom_blk.run
@@ -1,10 +1,10 @@
 #
-# \brief  Test for 'rom_loopdev' service
+# \brief  Test for 'rom_blk' service
 # \author Stefan Kalkowski
 # \date   2011-05-10
 #
 
-build "core init server/rom_loopdev test/rom_blk"
+build "core init server/rom_blk test/rom_blk"
 
 create_boot_directory
 
@@ -23,7 +23,7 @@ install_config {
 	<default-route>
 		<any-service>  <any-child/> <parent/></any-service>
 	</default-route>
-	<start name="rom_loopdev">
+	<start name="rom_blk">
 		<resource name="RAM" quantum="3M"/>
 		<provides><service name="Block"/></provides>
 		<config file="init" block_size="512"/>
@@ -35,7 +35,7 @@ install_config {
 </config>
 }
 
-build_boot_image "core init rom_loopdev test-rom_blk"
+build_boot_image "core init rom_blk test-rom_blk"
 
 append qemu_args "-m 64 -nographic "
 
diff --git a/os/src/server/rom_loopdev/README b/os/src/server/rom_blk/README
similarity index 100%
rename from os/src/server/rom_loopdev/README
rename to os/src/server/rom_blk/README
diff --git a/os/src/server/rom_loopdev/main.cc b/os/src/server/rom_blk/main.cc
similarity index 100%
rename from os/src/server/rom_loopdev/main.cc
rename to os/src/server/rom_blk/main.cc
diff --git a/os/src/server/rom_loopdev/target.mk b/os/src/server/rom_blk/target.mk
similarity index 64%
rename from os/src/server/rom_loopdev/target.mk
rename to os/src/server/rom_blk/target.mk
index 4d2045bc8..561f9e086 100644
--- a/os/src/server/rom_loopdev/target.mk
+++ b/os/src/server/rom_blk/target.mk
@@ -1,3 +1,3 @@
-TARGET = rom_loopdev
+TARGET = rom_blk
 SRC_CC = main.cc
 LIBS   = base config