diff --git a/repos/gems/recipes/pkg/motif_decorator/runtime b/repos/gems/recipes/pkg/motif_decorator/runtime
index d58c4f587..95e882726 100644
--- a/repos/gems/recipes/pkg/motif_decorator/runtime
+++ b/repos/gems/recipes/pkg/motif_decorator/runtime
@@ -4,7 +4,7 @@
 		<rom label="window_layout"/>
 		<rom label="pointer"/>
 		<report/>
-		<nitpicker/>
+		<gui/>
 		<timer/>
 	</requires>
 
diff --git a/repos/gems/recipes/pkg/motif_wm/runtime b/repos/gems/recipes/pkg/motif_wm/runtime
index b963b61c9..002b90d29 100644
--- a/repos/gems/recipes/pkg/motif_wm/runtime
+++ b/repos/gems/recipes/pkg/motif_wm/runtime
@@ -1,15 +1,15 @@
 <runtime ram="40M" caps="1000" binary="init" config="wm.config">
 
 	<requires>
-		<nitpicker label="focus"/>
-		<nitpicker/>
+		<gui label="focus"/>
+		<gui/>
 		<report label="shape"/>
 		<report label="clipboard"/>
 		<rom    label="clipboard"/>
 		<timer/>
 	</requires>
 
-	<provides> <nitpicker/> <report/> <rom/> </provides>
+	<provides> <gui/> <report/> <rom/> </provides>
 
 	<content>
 		<rom label="ld.lib.so"/>
diff --git a/repos/gems/recipes/pkg/nano3d/runtime b/repos/gems/recipes/pkg/nano3d/runtime
index 468a91b48..b48fcd305 100644
--- a/repos/gems/recipes/pkg/nano3d/runtime
+++ b/repos/gems/recipes/pkg/nano3d/runtime
@@ -1,6 +1,6 @@
 <runtime ram="4M" caps="200" binary="nano3d">
 
-	<requires> <nitpicker/> <timer/> </requires>
+	<requires> <gui/> <timer/> </requires>
 
 	<config/>
 
diff --git a/repos/gems/recipes/pkg/sticks_blue_backdrop/runtime b/repos/gems/recipes/pkg/sticks_blue_backdrop/runtime
index 1cc9aa5b9..25f37f37c 100644
--- a/repos/gems/recipes/pkg/sticks_blue_backdrop/runtime
+++ b/repos/gems/recipes/pkg/sticks_blue_backdrop/runtime
@@ -1,6 +1,6 @@
 <runtime ram="64M" caps="300" binary="backdrop" config="backdrop.config">
 
-	<requires> <nitpicker/> </requires>
+	<requires> <gui/> </requires>
 
 	<content>
 		<rom label="backdrop.config"/>
diff --git a/repos/gems/recipes/pkg/themed_decorator/runtime b/repos/gems/recipes/pkg/themed_decorator/runtime
index 1aad38571..101b10381 100644
--- a/repos/gems/recipes/pkg/themed_decorator/runtime
+++ b/repos/gems/recipes/pkg/themed_decorator/runtime
@@ -4,7 +4,7 @@
 		<rom label="window_layout"/>
 		<rom label="pointer"/>
 		<report/>
-		<nitpicker/>
+		<gui/>
 		<timer/>
 	</requires>
 
diff --git a/repos/gems/recipes/pkg/themed_wm/runtime b/repos/gems/recipes/pkg/themed_wm/runtime
index 39f04e7e5..c9f529aa9 100644
--- a/repos/gems/recipes/pkg/themed_wm/runtime
+++ b/repos/gems/recipes/pkg/themed_wm/runtime
@@ -1,15 +1,15 @@
 <runtime ram="28M" caps="1000" binary="init" config="wm.config">
 
 	<requires>
-		<nitpicker label="focus"/>
-		<nitpicker/>
+		<gui label="focus"/>
+		<gui/>
 		<report label="shape"/>
 		<report label="clipboard"/>
 		<rom    label="clipboard"/>
 		<timer/>
 	</requires>
 
-	<provides> <nitpicker/> <report/> <rom/> </provides>
+	<provides> <gui/> <report/> <rom/> </provides>
 
 	<content>
 		<rom label="ld.lib.so"/>
diff --git a/repos/gems/recipes/pkg/window_layouter/runtime b/repos/gems/recipes/pkg/window_layouter/runtime
index 8ad7f9650..c4034a906 100644
--- a/repos/gems/recipes/pkg/window_layouter/runtime
+++ b/repos/gems/recipes/pkg/window_layouter/runtime
@@ -1,7 +1,7 @@
 <runtime ram="7M" caps="400" binary="init">
 
 	<requires>
-		<nitpicker/>
+		<gui/>
 		<rom label="window_list"/>
 		<rom label="focus_request"/>
 		<rom label="hover"/>
diff --git a/repos/gems/recipes/pkg/wm/runtime b/repos/gems/recipes/pkg/wm/runtime
index e9954f96d..d37fdf039 100644
--- a/repos/gems/recipes/pkg/wm/runtime
+++ b/repos/gems/recipes/pkg/wm/runtime
@@ -1,15 +1,15 @@
 <runtime ram="20M" caps="500" binary="init" config="wm.config">
 
 	<requires>
-		<nitpicker label="focus"/>
-		<nitpicker/>
+		<gui label="focus"/>
+		<gui/>
 		<report label="shape"/>
 		<report label="clipboard"/>
 		<rom    label="clipboard"/>
 		<timer/>
 	</requires>
 
-	<provides> <nitpicker/> <rom/> <report/> </provides>
+	<provides> <gui/> <rom/> <report/> </provides>
 
 	<content>
 		<rom label="ld.lib.so"/>
diff --git a/repos/gems/src/app/depot_autopilot/child.cc b/repos/gems/src/app/depot_autopilot/child.cc
index a1931e0b4..fe2ae72b4 100644
--- a/repos/gems/src/app/depot_autopilot/child.cc
+++ b/repos/gems/src/app/depot_autopilot/child.cc
@@ -319,7 +319,7 @@ void Child::gen_start_node(Xml_generator          &xml,
 					_gen_provides_sub_node(xml, service, "input",       "Input");
 					_gen_provides_sub_node(xml, service, "log",         "LOG");
 					_gen_provides_sub_node(xml, service, "nic",         "Nic");
-					_gen_provides_sub_node(xml, service, "nitpicker",   "Gui");
+					_gen_provides_sub_node(xml, service, "gui",         "Gui");
 					_gen_provides_sub_node(xml, service, "report",      "Report");
 					_gen_provides_sub_node(xml, service, "rom",         "ROM");
 					_gen_provides_sub_node(xml, service, "terminal",    "Terminal");
diff --git a/repos/gems/src/app/depot_deploy/child.h b/repos/gems/src/app/depot_deploy/child.h
index b2c45a18a..8dde3a728 100644
--- a/repos/gems/src/app/depot_deploy/child.h
+++ b/repos/gems/src/app/depot_deploy/child.h
@@ -437,7 +437,7 @@ void Depot_deploy::Child::gen_start_node(Xml_generator &xml, Xml_node common,
 					_gen_provides_sub_node(xml, service, "input",       "Input");
 					_gen_provides_sub_node(xml, service, "log",         "LOG");
 					_gen_provides_sub_node(xml, service, "nic",         "Nic");
-					_gen_provides_sub_node(xml, service, "nitpicker",   "Gui");
+					_gen_provides_sub_node(xml, service, "gui",         "Gui");
 					_gen_provides_sub_node(xml, service, "report",      "Report");
 					_gen_provides_sub_node(xml, service, "rom",         "ROM");
 					_gen_provides_sub_node(xml, service, "terminal",    "Terminal");
diff --git a/repos/gems/src/app/sculpt_manager/model/route.h b/repos/gems/src/app/sculpt_manager/model/route.h
index 9beb0edb5..e4ceee706 100644
--- a/repos/gems/src/app/sculpt_manager/model/route.h
+++ b/repos/gems/src/app/sculpt_manager/model/route.h
@@ -33,7 +33,7 @@ struct Sculpt::Route : List_model<Route>::Element
 		case Service::Type::BLOCK:       return "block";
 		case Service::Type::FILE_SYSTEM: return "file_system";
 		case Service::Type::NIC:         return "nic";
-		case Service::Type::GUI:         return "nitpicker";
+		case Service::Type::GUI:         return "gui";
 		case Service::Type::RM:          return "rm";
 		case Service::Type::IO_MEM:      return "io_mem";
 		case Service::Type::IO_PORT:     return "io_port";
diff --git a/repos/libports/recipes/pkg/pdf_view/runtime b/repos/libports/recipes/pkg/pdf_view/runtime
index b4a8d62e4..b1d369be1 100644
--- a/repos/libports/recipes/pkg/pdf_view/runtime
+++ b/repos/libports/recipes/pkg/pdf_view/runtime
@@ -1,6 +1,6 @@
 <runtime ram="64M" caps="2000" binary="pdf_view">
 
-	<requires> <timer/> <nitpicker/> <file_system/> </requires>
+	<requires> <timer/> <gui/> <file_system/> </requires>
 
 	<content>
 		<rom label="ld.lib.so"/>
diff --git a/repos/libports/recipes/pkg/qt5_textedit/runtime b/repos/libports/recipes/pkg/qt5_textedit/runtime
index 3003ba541..ecd1e7519 100644
--- a/repos/libports/recipes/pkg/qt5_textedit/runtime
+++ b/repos/libports/recipes/pkg/qt5_textedit/runtime
@@ -2,7 +2,7 @@
 
 	<requires>
 		<file_system/>
-		<nitpicker/>
+		<gui/>
 		<report label="shape"/>
 		<report label="clipboard"/>
 		<rom    label="clipboard"/>
diff --git a/repos/ports/recipes/pkg/arora/runtime b/repos/ports/recipes/pkg/arora/runtime
index ad014aeb1..ad0434846 100644
--- a/repos/ports/recipes/pkg/arora/runtime
+++ b/repos/ports/recipes/pkg/arora/runtime
@@ -2,7 +2,7 @@
 
 	<requires>
 		<nic/>
-		<nitpicker/>
+		<gui/>
 		<report label="arora -> shape"/>
 		<rm/>
 		<rtc/>
diff --git a/repos/ports/recipes/pkg/system_shell/runtime b/repos/ports/recipes/pkg/system_shell/runtime
index f155ad327..4c2c140b6 100644
--- a/repos/ports/recipes/pkg/system_shell/runtime
+++ b/repos/ports/recipes/pkg/system_shell/runtime
@@ -1,7 +1,7 @@
 <runtime ram="76M" caps="1000" binary="init" config="system_shell.config">
 
 	<requires>
-		<nitpicker/>
+		<gui/>
 		<timer/>
 		<file_system label="config" writeable="yes"/>
 		<file_system label="report" writeable="no"/>
diff --git a/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime b/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime
index 21069f30f..5e50f5c6f 100755
--- a/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime
+++ b/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime
@@ -3,7 +3,7 @@
 	<requires>
 		<file_system label="vm"/>
 		<file_system label="shared"/>
-		<nitpicker/>
+		<gui/>
 		<nic/>
 		<rom label="capslock"/>
 		<rom label="platform_info"/>
diff --git a/repos/ports/recipes/pkg/vbox5/runtime b/repos/ports/recipes/pkg/vbox5/runtime
index 522c8f2d7..4374dc9c6 100755
--- a/repos/ports/recipes/pkg/vbox5/runtime
+++ b/repos/ports/recipes/pkg/vbox5/runtime
@@ -5,7 +5,7 @@
 		<file_system label="shared"/>
 		<vm/>
 		<timer/>
-		<nitpicker/>
+		<gui/>
 		<nic/>
 		<rom label="capslock"/>
 		<rom label="platform_info"/>