diff --git a/recipes/pkg/ssh_client/archives b/recipes/pkg/ssh_client/archives
index a3ded3e..9a60b4d 100644
--- a/recipes/pkg/ssh_client/archives
+++ b/recipes/pkg/ssh_client/archives
@@ -1,7 +1,7 @@
 _/pkg/terminal
 _/src/libc
 _/src/libcrypto
-_/src/nit_fb
+_/src/gui_fb
 _/src/vfs
 _/src/zlib
 _/src/vfs_jitterentropy
diff --git a/recipes/pkg/ssh_client/runtime b/recipes/pkg/ssh_client/runtime
index 7d30395..be812b1 100644
--- a/recipes/pkg/ssh_client/runtime
+++ b/recipes/pkg/ssh_client/runtime
@@ -17,7 +17,7 @@
 		<rom label="libcrypto.lib.so"/>
 		<rom label="libm.lib.so"/>
 		<rom label="libssh.lib.so"/>
-		<rom label="nit_fb"/>
+		<rom label="gui_fb"/>
 		<rom label="ssh_client"/>
 		<rom label="terminal"/>
 		<rom label="vfs.lib.so"/>
@@ -44,7 +44,7 @@
 
 		<default caps="100"/>
 
-		<start name="nit_fb">
+		<start name="gui_fb">
 			<resource name="RAM" quantum="4M"/>
 			<provides> <service name="Framebuffer"/> <service name="Input"/> </provides>
 			<config xpos="10" ypos="10" initial_width="800" initial_height="600"/>
diff --git a/run/avconv.run b/run/avconv.run
index 11f9334..a9456f3 100644
--- a/run/avconv.run
+++ b/run/avconv.run
@@ -18,7 +18,7 @@ set build_components {
 	drivers/ahci server/vfs
 	lib/vfs/rump
 	drivers/framebuffer drivers/input
-	server/nitpicker server/nit_fb
+	server/nitpicker server/gui_fb
 	app/launchpad app/pointer
 	lib/mesa/swrast
 	test/mesa_demo/gears
@@ -121,7 +121,7 @@ append config {
 			<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
 			<domain name="default" layer="2" content="client" focus="click" hover="always" />
 			<policy label="pointer -> " domain="pointer"/>
-			<policy label="nit_fb -> " domain="default"/>
+			<policy label="gui_fb -> " domain="default"/>
 		</config>
 		<route>
 			<service name="Input"><child name="input_drv"/></service>
@@ -134,7 +134,7 @@ append config {
 		<resource name="RAM" quantum="1M"/>
 	</start>
 
-	<start name="nit_fb" priority="-1">
+	<start name="gui_fb" priority="-1">
 		<resource name="RAM" quantum="4M"/>
 		<provides>
 			<service name="Input"/>
@@ -167,7 +167,7 @@ append config {
 			<service name="ROM" label="egl_drv.lib.so">
 				<parent label="egl_swrast.lib.so"/>
 			</service>
-			<service name="Framebuffer"><child name="nit_fb"/></service>
+			<service name="Framebuffer"><child name="gui_fb"/></service>
 			<any-service><parent/><any-child/></any-service>
 		</route>
 		<config>
@@ -232,7 +232,7 @@ set boot_modules {
 	avdevice.lib.so avfilter.lib.so avutil.lib.so avcodec.lib.so
 	avformat.lib.so swscale.lib.so
 	ahci_drv rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so
-	nitpicker nit_fb
+	nitpicker gui_fb
 	launchpad pointer
 	gears egl.lib.so expat.lib.so glapi.lib.so mesa.lib.so stdcxx.lib.so egl_swrast.lib.so
 	fb_splitter
diff --git a/run/log_fader.run b/run/log_fader.run
index 57e0af4..f7502d8 100644
--- a/run/log_fader.run
+++ b/run/log_fader.run
@@ -22,7 +22,7 @@ set build_components {
 	timer
 	server/log_tee
 	server/nit_fader
-	server/nit_fb
+	server/gui_fb
 	server/nitpicker
 	server/rom_filter
 	server/terminal_log
@@ -213,7 +213,7 @@ append config {
 		</route>
 	</start>
 	<start name="log_fb">
-		<binary name="nit_fb"/>
+		<binary name="gui_fb"/>
 		<resource name="RAM" quantum="4M"/>
 		<provides>
 			<service name="Framebuffer"/>
@@ -291,7 +291,7 @@ set boot_modules {
 	launchpad
 	log_tee
 	nit_fader
-	nit_fb
+	gui_fb
 	nitpicker
 	pointer
 	report_rom
diff --git a/src/server/flif_capture/README b/src/server/flif_capture/README
index 265c390..2b65e70 100644
--- a/src/server/flif_capture/README
+++ b/src/server/flif_capture/README
@@ -11,4 +11,4 @@ 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'.
+by using the 'gui_fb' server beneath 'flif_capture'.
diff --git a/src/server/input_normalizer/README b/src/server/input_normalizer/README
index 3d95364..e3cb580 100644
--- a/src/server/input_normalizer/README
+++ b/src/server/input_normalizer/README
@@ -8,7 +8,7 @@ config node. The default is 200 milliseconds.
 
 An example of injecting delay into VirtualBox:
 
-! <start name="nit_fb">
+! <start name="gui_fb">
 ! 		<resource name="RAM" quantum="8M" />
 ! 		<provides>
 ! 			<service name="Framebuffer" />
@@ -24,7 +24,7 @@ An example of injecting delay into VirtualBox:
 ! 		<config period_ms="150"/>
 ! 		<route>
 ! 			<any-service>
-! 				<child name="nit_fb"/>
+! 				<child name="gui_fb"/>
 ! 				<parent/>
 !				<any-child/>
 ! 			</any-service>
@@ -39,9 +39,9 @@ An example of injecting delay into VirtualBox:
 ! 		<route>
 ! 			<any-service>
 ! 				<child name="input_normalizer"/>
-! 				<child name="nit_fb"/>
+! 				<child name="gui_fb"/>
 ! 				<parent/>
 !				<any-child/>
 ! 			</any-service>
 ! 		</route>
-! 	</start>
\ No newline at end of file
+! 	</start>