diff --git a/os/run/vmm.run b/os/run/tz_vmm.run
similarity index 84%
rename from os/run/vmm.run
rename to os/run/tz_vmm.run
index 39a1af756f..515ed3c5ca 100644
--- a/os/run/vmm.run
+++ b/os/run/tz_vmm.run
@@ -9,7 +9,7 @@ if {![have_spec trustzone]} {
 	exit 0
 }
 
-build "core init server/vmm"
+build "core init server/tz_vmm"
 create_boot_directory
 
 install_config {
@@ -30,10 +30,12 @@ install_config {
 	<default-route>
 		<any-service><any-child/><parent/></any-service>
 	</default-route>
-	<start name="vmm">
+	<start name="tz_vmm">
 		<resource name="RAM" quantum="4M"/>
 	</start>
 </config>
 }
 
-build_boot_image "core init vmm linux initrd.gz"
+build_boot_image "core init tz_vmm linux initrd.gz"
+
+run_genode_until forever
\ No newline at end of file
diff --git a/os/src/server/vmm/README b/os/src/server/tz_vmm/README
similarity index 100%
rename from os/src/server/vmm/README
rename to os/src/server/tz_vmm/README
diff --git a/os/src/server/vmm/imx53/m4if.h b/os/src/server/tz_vmm/imx53/m4if.h
similarity index 100%
rename from os/src/server/vmm/imx53/m4if.h
rename to os/src/server/tz_vmm/imx53/m4if.h
diff --git a/os/src/server/vmm/imx53/main.cc b/os/src/server/tz_vmm/imx53/main.cc
similarity index 100%
rename from os/src/server/vmm/imx53/main.cc
rename to os/src/server/tz_vmm/imx53/main.cc
diff --git a/os/src/server/vmm/imx53/target.mk b/os/src/server/tz_vmm/imx53/target.mk
similarity index 86%
rename from os/src/server/vmm/imx53/target.mk
rename to os/src/server/tz_vmm/imx53/target.mk
index 36a5f9f6a8..883942c7d0 100644
--- a/os/src/server/vmm/imx53/target.mk
+++ b/os/src/server/tz_vmm/imx53/target.mk
@@ -1,4 +1,4 @@
-TARGET    = vmm
+TARGET    = tz_vmm
 REQUIRES  = trustzone platform_imx53
 LIBS      = base
 SRC_CC    = main.cc
diff --git a/os/src/server/vmm/include/atag.h b/os/src/server/tz_vmm/include/atag.h
similarity index 100%
rename from os/src/server/vmm/include/atag.h
rename to os/src/server/tz_vmm/include/atag.h
diff --git a/os/src/server/vmm/include/mmu.h b/os/src/server/tz_vmm/include/mmu.h
similarity index 100%
rename from os/src/server/vmm/include/mmu.h
rename to os/src/server/tz_vmm/include/mmu.h
diff --git a/os/src/server/vmm/include/ram.h b/os/src/server/tz_vmm/include/ram.h
similarity index 100%
rename from os/src/server/vmm/include/ram.h
rename to os/src/server/tz_vmm/include/ram.h
diff --git a/os/src/server/vmm/include/vm.h b/os/src/server/tz_vmm/include/vm.h
similarity index 100%
rename from os/src/server/vmm/include/vm.h
rename to os/src/server/tz_vmm/include/vm.h
diff --git a/os/src/server/vmm/include/vm_state.h b/os/src/server/tz_vmm/include/vm_state.h
similarity index 100%
rename from os/src/server/vmm/include/vm_state.h
rename to os/src/server/tz_vmm/include/vm_state.h
diff --git a/os/src/server/vmm/vea9x4/bp_147.h b/os/src/server/tz_vmm/vea9x4/bp_147.h
similarity index 100%
rename from os/src/server/vmm/vea9x4/bp_147.h
rename to os/src/server/tz_vmm/vea9x4/bp_147.h
diff --git a/os/src/server/vmm/vea9x4/main.cc b/os/src/server/tz_vmm/vea9x4/main.cc
similarity index 100%
rename from os/src/server/vmm/vea9x4/main.cc
rename to os/src/server/tz_vmm/vea9x4/main.cc
diff --git a/os/src/server/vmm/vea9x4/sp810.h b/os/src/server/tz_vmm/vea9x4/sp810.h
similarity index 100%
rename from os/src/server/vmm/vea9x4/sp810.h
rename to os/src/server/tz_vmm/vea9x4/sp810.h
diff --git a/os/src/server/vmm/vea9x4/sys_reg.h b/os/src/server/tz_vmm/vea9x4/sys_reg.h
similarity index 100%
rename from os/src/server/vmm/vea9x4/sys_reg.h
rename to os/src/server/tz_vmm/vea9x4/sys_reg.h
diff --git a/os/src/server/vmm/vea9x4/target.mk b/os/src/server/tz_vmm/vea9x4/target.mk
similarity index 86%
rename from os/src/server/vmm/vea9x4/target.mk
rename to os/src/server/tz_vmm/vea9x4/target.mk
index f01ce8d14e..71ea3d3413 100644
--- a/os/src/server/vmm/vea9x4/target.mk
+++ b/os/src/server/tz_vmm/vea9x4/target.mk
@@ -1,4 +1,4 @@
-TARGET    = vmm
+TARGET    = tz_vmm
 REQUIRES  = trustzone platform_vea9x4
 LIBS      = base
 SRC_CC    = main.cc
diff --git a/os/src/server/vmm/vea9x4/tsc_380.h b/os/src/server/tz_vmm/vea9x4/tsc_380.h
similarity index 100%
rename from os/src/server/vmm/vea9x4/tsc_380.h
rename to os/src/server/tz_vmm/vea9x4/tsc_380.h