diff --git a/run/atari800.run b/run/atari800.run
index 3e31efc..4691379 100644
--- a/run/atari800.run
+++ b/run/atari800.run
@@ -34,4 +34,4 @@ set boot_modules {
 	vfs.lib.so
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/avplay.run b/run/avplay.run
index f16197c..4b4e611 100644
--- a/run/avplay.run
+++ b/run/avplay.run
@@ -35,4 +35,4 @@ set boot_modules {
 	mediafile
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/chocolate-doom.run b/run/chocolate-doom.run
index 34d5fba..06c1bd0 100644
--- a/run/chocolate-doom.run
+++ b/run/chocolate-doom.run
@@ -32,4 +32,4 @@ set boot_modules {
 	chocolate-doom doom1.wad
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/grafx2.run b/run/grafx2.run
index 5fac04a..14b5523 100644
--- a/run/grafx2.run
+++ b/run/grafx2.run
@@ -25,4 +25,4 @@ set boot_modules {
 	zlib.lib.so
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/nitpicker_app.inc b/run/gui_app.inc
similarity index 100%
rename from run/nitpicker_app.inc
rename to run/gui_app.inc
diff --git a/run/julia_fractal.run b/run/julia_fractal.run
index 6d3e901..c5f5824 100644
--- a/run/julia_fractal.run
+++ b/run/julia_fractal.run
@@ -17,4 +17,4 @@ set boot_modules {
 	stdcxx.lib.so
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/ltris.run b/run/ltris.run
index f412482..c867436 100644
--- a/run/ltris.run
+++ b/run/ltris.run
@@ -27,4 +27,4 @@ set boot_modules {
 	ltris_data.tar
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/numptyphysics.run b/run/numptyphysics.run
index 0a2a8b6..f8435e5 100644
--- a/run/numptyphysics.run
+++ b/run/numptyphysics.run
@@ -30,4 +30,4 @@ set boot_modules {
 	numptyphysics_data.tar
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/sdl.run b/run/sdl.run
index de66718..13837a7 100644
--- a/run/sdl.run
+++ b/run/sdl.run
@@ -14,4 +14,4 @@ set boot_modules {
 	libc.lib.so vfs.lib.so libm.lib.so sdl.lib.so
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/sdl2.run b/run/sdl2.run
index 8ead339..b584023 100644
--- a/run/sdl2.run
+++ b/run/sdl2.run
@@ -14,4 +14,4 @@ set boot_modules {
 	libc.lib.so vfs.lib.so sdl2.lib.so
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/supertux.run b/run/supertux.run
index f9ce3f2..62f5f71 100644
--- a/run/supertux.run
+++ b/run/supertux.run
@@ -29,4 +29,4 @@ set boot_modules {
 	supertux_data.tar
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/tuxmath.run b/run/tuxmath.run
index 477f6a8..81191af 100644
--- a/run/tuxmath.run
+++ b/run/tuxmath.run
@@ -31,4 +31,4 @@ set boot_modules {
 	tuxmath_data.tar
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/tyrian.run b/run/tyrian.run
index 0900fae..a66406f 100644
--- a/run/tyrian.run
+++ b/run/tyrian.run
@@ -28,4 +28,4 @@ set boot_modules {
 	opentyrian tyrian.tar
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc
diff --git a/run/uhexen2.run b/run/uhexen2.run
index 4db4aac..889cc0d 100644
--- a/run/uhexen2.run
+++ b/run/uhexen2.run
@@ -56,4 +56,4 @@ append boot_modules {
 	nic_loopback
 }
 
-source ${genode_dir}/repos/world/run/nitpicker_app.inc
+source ${genode_dir}/repos/world/run/gui_app.inc