diff --git a/recipes/pkg/sdl_vnc/runtime b/recipes/pkg/sdl_vnc/runtime
index b9ca4af..ddcea93 100644
--- a/recipes/pkg/sdl_vnc/runtime
+++ b/recipes/pkg/sdl_vnc/runtime
@@ -16,7 +16,7 @@
 			<service name="PD"/>
 			<service name="ROM"/>
 			<service name="Timer"/>
-			<service name="Nitpicker"/>
+			<service name="Gui"/>
 			<service name="Nic"/>
 			<service name="File_system"/>
 			<service name="Rtc"/>
diff --git a/recipes/pkg/ssh_client/runtime b/recipes/pkg/ssh_client/runtime
index b4eda4c..05e132f 100644
--- a/recipes/pkg/ssh_client/runtime
+++ b/recipes/pkg/ssh_client/runtime
@@ -37,7 +37,7 @@
 			<service name="Report"/>
 			<service name="File_system"/>
 			<service name="Nic"/>
-			<service name="Nitpicker"/>
+			<service name="Gui"/>
 		</parent-provides>
 
 		<default-route> <any-service> <parent/> <any-child/> </any-service> </default-route>
diff --git a/run/avconv.run b/run/avconv.run
index a0b8713..11f9334 100644
--- a/run/avconv.run
+++ b/run/avconv.run
@@ -116,7 +116,7 @@ append config {
 
 	<start name="nitpicker" priority="-1">
 		<resource name="RAM" quantum="4M"/>
-		<provides><service name="Nitpicker"/></provides>
+		<provides> <service name="Gui"/> </provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" focus="click" hover="always" />
diff --git a/run/flif.run b/run/flif.run
index 423b8ba..7cb821a 100644
--- a/run/flif.run
+++ b/run/flif.run
@@ -52,7 +52,7 @@ install_config {
 
 	<start name="nitpicker">
 		<resource name="RAM" quantum="4M"/>
-		<provides><service name="Nitpicker"/></provides>
+		<provides><service name="Gui"/></provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" label="no" hover="always" focus="click" />
@@ -65,7 +65,7 @@ install_config {
 	<start name="pointer">
 		<resource name="RAM" quantum="1M"/>
 		<route>
-			<service name="Nitpicker"> <child name="nitpicker"/> </service>
+			<service name="Gui"> <child name="nitpicker"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
diff --git a/run/julia_fractal.run b/run/julia_fractal.run
index c0b38fc..6d3e901 100644
--- a/run/julia_fractal.run
+++ b/run/julia_fractal.run
@@ -2,7 +2,7 @@ set app_config {
   <start name="julia_fractal">
     <resource name="RAM" quantum="4M"/>
     <route>
-      <service name="Nitpicker"> <child name="wm"/> </service>
+      <service name="Gui"> <child name="wm"/> </service>
       <any-service> <parent/> <any-child/> </any-service>
     </route>
   </start>}
diff --git a/run/log_fader.run b/run/log_fader.run
index f1489cb..57e0af4 100644
--- a/run/log_fader.run
+++ b/run/log_fader.run
@@ -57,7 +57,7 @@ append config {
 			<child name="log_fader_config"/> </service>
 		<service name="ROM" label_suffix="nitpicker.config">
 			<child name="nitpicker_config"/> </service>
-		<service name="Nitpicker"> <child name="nitpicker" /> </service>
+		<service name="Gui"> <child name="nitpicker" /> </service>
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
 	<default caps="128"/>
@@ -138,7 +138,7 @@ append config {
 
 	<start name="nitpicker">
 		<resource name="RAM" quantum="4M"/>
-		<provides><service name="Nitpicker"/></provides>
+		<provides><service name="Gui"/></provides>
 		<route>
 			<service name="ROM" label="config"> <child name="nitpicker_config"/> </service>
 			<service name="Framebuffer"> <child name="fb_drv" /> </service>
@@ -165,7 +165,7 @@ append config {
 		</config>
 		<route>
 			<service name="ROM" label="hover"> <child name="report_rom"/> </service>
-			<service name="Nitpicker"> <child name="nitpicker"/>  </service>
+			<service name="Gui"> <child name="nitpicker"/>  </service>
 			<service name="Report"> <child name="report_rom"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
@@ -204,11 +204,11 @@ append config {
 	<start name="log_fader">
 		<binary name="nit_fader"/>
 		<resource name="RAM" quantum="5M"/>
-		<provides> <service name="Nitpicker"/> </provides>
+		<provides> <service name="Gui"/> </provides>
 		<route>
 			<service name="ROM" label="config">
 				<child name="log_fader_config" /> </service>
-			<service name="Nitpicker"> <child name="nitpicker" /> </service>
+			<service name="Gui"> <child name="nitpicker" /> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
@@ -221,7 +221,7 @@ append config {
 		</provides>
 		<config/>
 		<route>
-			<service name="Nitpicker"> <child name="log_fader" /> </service>
+			<service name="Gui"> <child name="log_fader" /> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
diff --git a/run/nit_entropy.run b/run/nit_entropy.run
index a4aac76..0801705 100644
--- a/run/nit_entropy.run
+++ b/run/nit_entropy.run
@@ -18,7 +18,7 @@ append config {
 		<service name="LOG"/>
 	</parent-provides>
 	<default-route>
-		<service name="Nitpicker"> <child name="nitpicker"/> </service>
+		<service name="Gui"> <child name="nitpicker"/> </service>
 		<service name="Timer">     <child name="timer"/> </service>
 		<service name="Terminal">  <child name="terminal"/> </service>
 		<service name="Platform">  <child name="platform_drv"/> </service>
@@ -47,7 +47,7 @@ append config {
 
 	<start name="nitpicker">
 		<resource name="RAM" quantum="8M"/>
-		<provides><service name="Nitpicker"/></provides>
+		<provides><service name="Gui"/></provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" label="no" focus="click" hover="always" />
@@ -68,7 +68,7 @@ append config {
 	<start name="nit_entropy">
 		<resource name="RAM" quantum="4M"/>
 		<route>
-			<service name="Nitpicker"> <child name="nitpicker"/> </service>
+			<service name="Gui"> <child name="nitpicker"/> </service>
 			<any-service> <parent/> <any-child/></any-service>
 		</route>
 	</start>
diff --git a/run/nitpicker_app.inc b/run/nitpicker_app.inc
index d3adf20..8e87d95 100644
--- a/run/nitpicker_app.inc
+++ b/run/nitpicker_app.inc
@@ -41,7 +41,7 @@ install_config {
 	</parent-provides>
 
 	<default-route>
-		<service name="Nitpicker">
+		<service name="Gui">
 			<child name="wm"/> </service>
 		<any-service> <parent/> <any-child/> </any-service>
 	</default-route>
@@ -69,7 +69,7 @@ install_config {
 
 	<start name="nitpicker">
 		<resource name="RAM" quantum="4M"/>
-		<provides><service name="Nitpicker"/></provides>
+		<provides><service name="Gui"/></provides>
 		<config focus="rom">
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" label="no" hover="always"/>
@@ -82,7 +82,7 @@ install_config {
 	<start name="pointer">
 		<resource name="RAM" quantum="1M"/>
 		<route>
-			<service name="Nitpicker"> <child name="nitpicker"/> </service>
+			<service name="Gui"> <child name="nitpicker"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
@@ -90,10 +90,10 @@ install_config {
 	<start name="wm" caps="1000">
 		<resource name="RAM" quantum="32M"/>
 		<binary name="init"/>
-		<provides> <service name="Nitpicker"/> </provides>
+		<provides> <service name="Gui"/> </provides>
 		<route>
 			<service name="ROM" label="config"> <parent label="wm.config"/> </service>
-			<service name="Nitpicker"> <child name="nitpicker"/> </service>
+			<service name="Gui"> <child name="nitpicker"/> </service>
 			<any-service> <parent/> <any-child/> </any-service>
 		</route>
 	</start>
diff --git a/run/qt5_avplay.run b/run/qt5_avplay.run
index d7610fd..447d132 100644
--- a/run/qt5_avplay.run
+++ b/run/qt5_avplay.run
@@ -67,7 +67,7 @@ append config {
 			<mediafile name="mediafile"/>
 		</config>
 		<route>
-			<service name="Nitpicker"> <child name="wm"/> </service>
+			<service name="Gui"> <child name="wm"/> </service>
 			<service name="Report" label="shape">
 				<child name="pointer" label="wm -> qt_avplay -> shape"/>
 			</service>
diff --git a/run/sdl_opengl.inc b/run/sdl_opengl.inc
index 491eeed..4e5a776 100644
--- a/run/sdl_opengl.inc
+++ b/run/sdl_opengl.inc
@@ -85,7 +85,7 @@ append config {
 	</start>
 	<start name="nitpicker">
 		<resource name="RAM" quantum="1M"/>
-		<provides><service name="Nitpicker"/></provides>
+		<provides> <service name="Gui"/> </provides>
 		<config>
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" label="no" focus="click" hover="always" />
diff --git a/src/app/qt_avplay/avplay_slave.h b/src/app/qt_avplay/avplay_slave.h
index 0bff965..067af82 100644
--- a/src/app/qt_avplay/avplay_slave.h
+++ b/src/app/qt_avplay/avplay_slave.h
@@ -120,7 +120,7 @@ class Avplay_slave : public QObject
 
 				Genode::Service &_matching_service(Genode::Service::Name const &name)
 				{
-					if (name == "Nitpicker")
+					if (name == "Gui")
 						return _nitpicker_service;
 
 					throw Genode::Service_denied();
diff --git a/src/server/flif_capture/README b/src/server/flif_capture/README
index 8fb1115..265c390 100644
--- a/src/server/flif_capture/README
+++ b/src/server/flif_capture/README
@@ -7,8 +7,8 @@ Usage
 -----
 
 Only few Genode components make direct 'Input' and 'Framebuffer' connections,
-the recommendation is to use these session bundled in a 'Nitpicker' connection.
-Therefore to screenshot 'Nitpicker' clients a Nitpicker server must be running
+the recommendation is to use these session bundled in a 'Gui' connection.
+Therefore to screenshot 'Gui' clients a GUI server must be running
 as a client of the 'flif_capture' server, and a window manager may be necessary
 as well. The 'flif_capture', 'nitpicker', and 'wm' stack may be hosted recursively
 by using the 'nit_fb' server beneath 'flif_capture'.