Index: contrib/bp/lib/libfs/libfs_mount
===================================================================
--- contrib/bp/lib/libfs/libfs_mount	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/lib/libfs/libfs_mount	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,4 +1,4 @@
-?IPC_M_CONNECTION_CLONE ;
-?IPC_M_DATA_WRITE /* mount options */ {
+?fs.IPC_M_CONNECTION_CLONE ;
+?fs.IPC_M_DATA_WRITE /* mount options */ {
 	!fs.IPC_M_CONNECT_ME ;
 	!fs.VFS_OUT_MOUNTED ;
Index: contrib/bp/lib/libfs/libfs_stat
===================================================================
--- contrib/bp/lib/libfs/libfs_stat	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/lib/libfs/libfs_stat	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,1 +1,1 @@
-?IPC_M_DATA_READ
+?fs.IPC_M_DATA_READ
Index: contrib/bp/preproc.py
===================================================================
--- contrib/bp/preproc.py	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/preproc.py	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -84,5 +84,5 @@
 	outf.write("### %s\n\n" % fname)
 	
-	tokens = split_tokens(inf.read(), ["\n", " ", "\t", "(", ")", "{", "}", "/*", "*/", "#", "*", ";", "+", "||", "|", "!", "?"], True)
+	tokens = split_tokens(inf.read(), ["\n", " ", "\t", "(", ")", "{", "}", "[", "/*", "*/", "#", "*", ";", "+", "||", "|", "!", "?"], True)
 	
 	empty = True
Index: contrib/bp/srv/bd/rd/rd.bp
===================================================================
--- contrib/bp/srv/bd/rd/rd.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/bd/rd/rd.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -2,10 +2,10 @@
 [devmap_device_register] ;
 (
-	?IPC_M_CONNECT_ME_TO ;
-	?IPC_SHARE_IN ;
+	?bd.IPC_M_CONNECT_ME_TO ;
+	?bd.IPC_SHARE_IN ;
 	(
-		?BD_READ_BLOCK +
-		?BD_WRITE_BLOCK
+		?bd.BD_READ_BLOCK +
+		?bd.BD_WRITE_BLOCK
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?bd.IPC_M_PHONE_HUNGUP
 )*
Index: contrib/bp/srv/console/cons_read
===================================================================
--- contrib/bp/srv/console/cons_read	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/console/cons_read	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,1 +1,1 @@
-?IPC_M_DATA_READ
+?console.IPC_M_DATA_READ
Index: contrib/bp/srv/console/cons_write
===================================================================
--- contrib/bp/srv/console/cons_write	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/console/cons_write	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,3 +1,3 @@
-?IPC_M_DATA_WRITE ;
+?console.IPC_M_DATA_WRITE ;
 [write_char]* ;
 [gcons_notify_char]
Index: contrib/bp/srv/console/console.bp
===================================================================
--- contrib/bp/srv/console/console.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/console/console.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -22,16 +22,16 @@
 [curs_visibility] ;
 (
-	?IPC_M_CONNECT_ME_TO ;
+	?console.IPC_M_CONNECT_ME_TO ;
 	[gcons_notify_connect] ;
 	(
-		?VFS_OUT_READ {
+		?console.VFS_OUT_READ {
 			[cons_read]
 		} +
 		
-		?VFS_OUT_WRITE {
+		?console.VFS_OUT_WRITE {
 			[cons_write]
 		} +
 		
-		?VFS_OUT_SYNC {
+		?console.VFS_OUT_SYNC {
 			[fb_pending_flush] ;
 			(
@@ -44,19 +44,19 @@
 		} +
 		
-		?CONSOLE_CLEAR {
+		?console.CONSOLE_CLEAR {
 			!fb.FB_FLUSH +
 			NULL
 		} +
 		
-		?CONSOLE_GOTO {
+		?console.CONSOLE_GOTO {
 			!fb.CURS_GOTO +
 			NULL
 		} +
 		
-		?CONSOLE_GET_SIZE +
+		?console.CONSOLE_GET_SIZE +
 		
-		?CONSOLE_GET_COLOR_CAP +
+		?console.CONSOLE_GET_COLOR_CAP +
 		
-		?CONSOLE_SET_STYLE {
+		?console.CONSOLE_SET_STYLE {
 			[fb_pending_flush] ;
 			(
@@ -66,5 +66,5 @@
 		} +
 		
-		?CONSOLE_SET_COLOR {
+		?console.CONSOLE_SET_COLOR {
 			[fb_pending_flush] ;
 			(
@@ -74,5 +74,5 @@
 		} +
 		
-		?CONSOLE_SET_RGB_COLOR {
+		?console.CONSOLE_SET_RGB_COLOR {
 			[fb_pending_flush] ;
 			(
@@ -82,5 +82,5 @@
 		} +
 		
-		?CONSOLE_CURSOR_VISIBILITY {
+		?console.CONSOLE_CURSOR_VISIBILITY {
 			[fb_pending_flush] ;
 			(
@@ -90,11 +90,11 @@
 		} +
 		
-		?CONSOLE_GET_EVENT +
+		?console.CONSOLE_GET_EVENT +
 		
-		?CONSOLE_KCON_ENABLE
+		?console.CONSOLE_KCON_ENABLE
 		
 	)* ;
 	
-	?IPC_M_PHONE_HUNGUP {
+	?console.IPC_M_PHONE_HUNGUP {
 		[gcons_notify_disconnect]
 	}
Index: contrib/bp/srv/devmap/devmap.bp
===================================================================
--- contrib/bp/srv/devmap/devmap.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/devmap/devmap.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,37 +1,37 @@
 !ns.IPC_M_CONNECT_TO_ME ;
 (
-	?IPC_M_CONNECT_ME_TO ;
+	?devmap.IPC_M_CONNECT_ME_TO ;
 	(
 		( /* driver interface */
-			?DEVMAP_DEVICE_REGISTER {
-				?IPC_M_DATA_WRITE /* name */
+			?devmap.DEVMAP_DEVICE_REGISTER {
+				?devmap.IPC_M_DATA_WRITE /* name */
 			} +
 			
-			?DEVMAP_DEVICE_GET_HANDLE {
-				?IPC_M_DATA_WRITE /* name */
+			?devmap.DEVMAP_DEVICE_GET_HANDLE {
+				?devmap.IPC_M_DATA_WRITE /* name */
 			} +
 			
-			?DEVMAP_DEVICE_GET_NAME +
+			?devmap.DEVMAP_DEVICE_GET_NAME +
 			
-			?DEVMAP_DEVICE_UNREGISTER +
+			?devmap.DEVMAP_DEVICE_UNREGISTER +
 			
-			?DEVMAP_DRIVER_UNREGISTER
+			?devmap.DEVMAP_DRIVER_UNREGISTER
 		) +
 		
 		( /* client interface */
-			?DEVMAP_DEVICE_GET_HANDLE {
-				?IPC_M_DATA_WRITE /* name */
+			?devmap.DEVMAP_DEVICE_GET_HANDLE {
+				?devmap.IPC_M_DATA_WRITE /* name */
 			} +
 			
-			?DEVMAP_DEVICE_GET_NAME +
+			?devmap.DEVMAP_DEVICE_GET_NAME +
 			
-			?DEVMAP_DEVICE_NULL_CREATE +
+			?devmap.DEVMAP_DEVICE_NULL_CREATE +
 			
-			?DEVMAP_DEVICE_NULL_DESTROY +
+			?devmap.DEVMAP_DEVICE_NULL_DESTROY +
 			
-			?DEVMAP_DEVICE_GET_COUNT +
+			?devmap.DEVMAP_DEVICE_GET_COUNT +
 			
-			?DEVMAP_DEVICE_GET_DEVICES {
-				?IPC_M_DATA_READ /* buffer */
+			?devmap.DEVMAP_DEVICE_GET_DEVICES {
+				?devmap.IPC_M_DATA_READ /* buffer */
 			}
 		) +
@@ -39,4 +39,4 @@
 		!dev.IPC_M_CONNECT_ME_TO /* forwarded */
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?devmap.IPC_M_PHONE_HUNGUP
 )*
Index: contrib/bp/srv/fb/fb.bp
===================================================================
--- contrib/bp/srv/fb/fb.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/fb/fb.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,74 +1,74 @@
 !ns.IPC_M_CONNECT_TO_ME ;
 (
-	?IPC_M_CONNECT_ME_TO ;
+	?fb.IPC_M_CONNECT_ME_TO ;
 	(
-		?IPC_M_SHARE_OUT +
+		?fb.IPC_M_SHARE_OUT +
 		
 		(
-			?FB_PREPARE_SHM ;
-			?IPC_M_AS_AREA_SEND ;
-			?FB_DRAW_PPM ;
-			?FB_DROP_SHM
+			?fb.FB_PREPARE_SHM ;
+			?fb.IPC_M_AS_AREA_SEND ;
+			?fb.FB_DRAW_PPM ;
+			?fb.FB_DROP_SHM
 		) +
 		
 		(
-			?IPC_M_AS_AREA_SEND ;
-			?FB_DRAW_TEXT_DATA
+			?fb.IPC_M_AS_AREA_SEND ;
+			?fb.FB_DRAW_TEXT_DATA
 		) +
 		
-		?FB_SHM2PIXMAP +
+		?fb.FB_SHM2PIXMAP +
 		
-		?FB_VP_DRAW_PIXMAP +
+		?fb.FB_VP_DRAW_PIXMAP +
 		
-		?FB_VP2PIXMAP +
+		?fb.FB_VP2PIXMAP +
 		
-		?FB_DROP_PIXMAP +
+		?fb.FB_DROP_PIXMAP +
 		
-		?FB_ANIM_CREATE +
+		?fb.FB_ANIM_CREATE +
 		
-		?FB_ANIM_DROP +
+		?fb.FB_ANIM_DROP +
 		
-		?FB_ANIM_ADDPIXMAP +
+		?fb.FB_ANIM_ADDPIXMAP +
 		
-		?FB_ANIM_CHGVP +
+		?fb.FB_ANIM_CHGVP +
 		
-		?FB_ANIM_START +
+		?fb.FB_ANIM_START +
 		
-		?FB_ANIM_STOP +
+		?fb.FB_ANIM_STOP +
 		
-		?FB_PUTCHAR +
+		?fb.FB_PUTCHAR +
 		
-		?FB_CLEAR +
+		?fb.FB_CLEAR +
 		
-		?FB_CURSOR_GOTO +
+		?fb.FB_CURSOR_GOTO +
 		
-		?FB_CURSOR_VISIBILITY +
+		?fb.FB_CURSOR_VISIBILITY +
 		
-		?FB_GET_CSIZE +
+		?fb.FB_GET_CSIZE +
 		
-		?FB_GET_COLOR_CAP +
+		?fb.FB_GET_COLOR_CAP +
 		
-		?FB_SCROLL +
+		?fb.FB_SCROLL +
 		
-		?FB_VIEWPORT_SWITCH +
+		?fb.FB_VIEWPORT_SWITCH +
 		
-		?FB_VIEWPORT_CREATE +
+		?fb.FB_VIEWPORT_CREATE +
 		
-		?FB_VIEWPORT_DELETE +
+		?fb.FB_VIEWPORT_DELETE +
 		
-		?FB_SET_STYLE +
+		?fb.FB_SET_STYLE +
 		
-		?FB_SET_COLOR +
+		?fb.FB_SET_COLOR +
 		
-		?FB_SET_RGB_COLOR +
+		?fb.FB_SET_RGB_COLOR +
 		
-		?FB_GET_RESOLUTION +
+		?fb.FB_GET_RESOLUTION +
 		
-		?FB_POINTER_MOVE +
+		?fb.FB_POINTER_MOVE +
 		
-		?FB_SCREEN_YIELD +
+		?fb.FB_SCREEN_YIELD +
 		
-		?FB_SCREEN_RECLAIM
+		?fb.FB_SCREEN_RECLAIM
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?fb.IPC_M_PHONE_HUNGUP
 )*
Index: contrib/bp/srv/fs/devfs/devfs.bp
===================================================================
--- contrib/bp/srv/fs/devfs/devfs.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/fs/devfs/devfs.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -3,13 +3,13 @@
 [../../../lib/libfs/fs_register] ;
 (
-	?IPC_M_CONNECT_ME_TO ;
+	?fs.IPC_M_CONNECT_ME_TO ;
 	(
-		?VFS_OUT_MOUNTED {
-			?IPC_M_DATA_WRITE /* mount options */
+		?fs.VFS_OUT_MOUNTED {
+			?fs.IPC_M_DATA_WRITE /* mount options */
 		} +
 		
-		?VFS_OUT_MOUNT +
+		?fs.VFS_OUT_MOUNT +
 		
-		?VFS_OUT_LOOKUP {
+		?fs.VFS_OUT_LOOKUP {
 			(
 				[../../../lib/libc/devmap_device_get_handle] ;
@@ -19,6 +19,6 @@
 		} +
 		
-		?VFS_OUT_READ {
-			?IPC_M_DATA_READ /* payload */ {
+		?fs.VFS_OUT_READ {
+			?fs.IPC_M_DATA_READ /* payload */ {
 				(
 					!dev.VFS_OUT_READ ;
@@ -32,6 +32,6 @@
 		} +
 		
-		?VFS_OUT_WRITE {
-			?IPC_M_DATA_WRITE /* payload */ {
+		?fs.VFS_OUT_WRITE {
+			?fs.IPC_M_DATA_WRITE /* payload */ {
 				(
 					!dev.VFS_OUT_WRITE ;
@@ -42,25 +42,25 @@
 		} +
 		
-		?VFS_OUT_TRUNCATE +
+		?fs.VFS_OUT_TRUNCATE +
 		
-		?VFS_OUT_CLOSE {
+		?fs.VFS_OUT_CLOSE {
 			!dev.IPC_M_PHONE_HUNGUP
 		} +
 		
-		?VFS_OUT_DESTROY +
+		?fs.VFS_OUT_DESTROY +
 		
-		?VFS_OUT_OPEN_NODE {
+		?fs.VFS_OUT_OPEN_NODE {
 			[../../../lib/libc/devmap_device_connect] +
 			NULL
 		} +
 		
-		?VFS_OUT_STAT {
+		?fs.VFS_OUT_STAT {
 			?IPC_M_DATA_READ /* struct stat */
 		} +
 		
-		?VFS_OUT_SYNC
+		?fs.VFS_OUT_SYNC
 		
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?fs.IPC_M_PHONE_HUNGUP
 )* ;
 !vfs.IPC_M_PHONE_HUNGUP
Index: contrib/bp/srv/fs/fat/fat.bp
===================================================================
--- contrib/bp/srv/fs/fat/fat.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/fs/fat/fat.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -2,44 +2,44 @@
 [../../../lib/libfs/fs_register] ;
 (
-	?IPC_M_CONNECT_ME_TO ;
+	?fs.IPC_M_CONNECT_ME_TO ;
 	(
-		?VFS_OUT_MOUNTED {
-			?IPC_M_DATA_WRITE /* mount options */
+		?fs.VFS_OUT_MOUNTED {
+			?fs.IPC_M_DATA_WRITE /* mount options */
 		} +
 		
-		?VFS_OUT_MOUNT {
+		?fs.VFS_OUT_MOUNT {
 			[../../../lib/libfs/libfs_mount]
 		} +
 		
-		?VFS_OUT_LOOKUP {
+		?fs.VFS_OUT_LOOKUP {
 			[../../../lib/libfs/libfs_lookup]
 		} +
 		
-		?VFS_OUT_READ {
-			?IPC_M_DATA_READ /* payload */
+		?fs.VFS_OUT_READ {
+			?fs.IPC_M_DATA_READ /* payload */
 		} +
 		
-		?VFS_OUT_WRITE {
-			?IPC_M_DATA_WRITE /* payload */
+		?fs.VFS_OUT_WRITE {
+			?fs.IPC_M_DATA_WRITE /* payload */
 		} +
 		
-		?VFS_OUT_TRUNCATE +
+		?fs.VFS_OUT_TRUNCATE +
 		
-		?VFS_OUT_CLOSE +
+		?fs.VFS_OUT_CLOSE +
 		
-		?VFS_OUT_DESTROY +
+		?fs.VFS_OUT_DESTROY +
 		
-		?VFS_OUT_OPEN_NODE {
+		?fs.VFS_OUT_OPEN_NODE {
 			[../../../lib/libfs/libfs_open_node]
 		} +
 		
-		?VFS_OUT_STAT {
+		?fs.VFS_OUT_STAT {
 			[../../../lib/libfs/libfs_stat]
 		} +
 		
-		?VFS_OUT_SYNC
+		?fs.VFS_OUT_SYNC
 		
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?fs.IPC_M_PHONE_HUNGUP
 )* ;
 !vfs.IPC_M_PHONE_HUNGUP
Index: contrib/bp/srv/fs/tmpfs/tmpfs.bp
===================================================================
--- contrib/bp/srv/fs/tmpfs/tmpfs.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/fs/tmpfs/tmpfs.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -2,44 +2,44 @@
 [../../../lib/libfs/fs_register] ;
 (
-	?IPC_M_CONNECT_ME_TO ;
+	?fs.IPC_M_CONNECT_ME_TO ;
 	(
-		?VFS_OUT_MOUNTED {
-			?IPC_M_DATA_WRITE /* mount options */
+		?fs.VFS_OUT_MOUNTED {
+			?fs.IPC_M_DATA_WRITE /* mount options */
 		} +
 		
-		?VFS_OUT_MOUNT {
+		?fs.VFS_OUT_MOUNT {
 			[../../../lib/libfs/libfs_mount]
 		} +
 		
-		?VFS_OUT_LOOKUP {
+		?fs.VFS_OUT_LOOKUP {
 			[../../../lib/libfs/libfs_lookup]
 		} +
 		
-		?VFS_OUT_READ {
-			?IPC_M_DATA_READ /* payload */
+		?fs.VFS_OUT_READ {
+			?fs.IPC_M_DATA_READ /* payload */
 		} +
 		
-		?VFS_OUT_WRITE {
-			?IPC_M_DATA_WRITE /* payload */
+		?fs.VFS_OUT_WRITE {
+			?fs.IPC_M_DATA_WRITE /* payload */
 		} +
 		
-		?VFS_OUT_TRUNCATE +
+		?fs.VFS_OUT_TRUNCATE +
 		
-		?VFS_OUT_CLOSE +
+		?fs.VFS_OUT_CLOSE +
 		
-		?VFS_OUT_DESTROY +
+		?fs.VFS_OUT_DESTROY +
 		
-		?VFS_OUT_OPEN_NODE {
+		?fs.VFS_OUT_OPEN_NODE {
 			[../../../lib/libfs/libfs_open_node]
 		} +
 		
-		?VFS_OUT_STAT {
+		?fs.VFS_OUT_STAT {
 			[../../../lib/libfs/libfs_stat]
 		} +
 		
-		?VFS_OUT_SYNC
+		?fs.VFS_OUT_SYNC
 		
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?fs.IPC_M_PHONE_HUNGUP
 )* ;
 !vfs.IPC_M_PHONE_HUNGUP
Index: contrib/bp/srv/kbd/kbd.bp
===================================================================
--- contrib/bp/srv/kbd/kbd.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/kbd/kbd.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -5,13 +5,13 @@
 !ns.IPC_M_CONNECT_TO_ME ;
 (
-	?IPC_M_CONNECT_ME_TO ;
+	?kbd.IPC_M_CONNECT_ME_TO ;
 	(
 		(
-			?KBD_YIELD +
-			?KBD_RECLAIM +
+			?kbd.KBD_YIELD +
+			?kbd.KBD_RECLAIM +
 		) |
 		!console.KBD_EVENT
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?kbd.IPC_M_PHONE_HUNGUP
 )* ;
 (
Index: contrib/bp/srv/loader/loader.bp
===================================================================
--- contrib/bp/srv/loader/loader.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/loader/loader.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -2,24 +2,24 @@
 !ns.IPC_M_CONNECT_TO_ME ;
 (
-	?LOADER_GET_TASKID {
-		?IPC_M_DATA_READ /* task id */
+	?loader.LOADER_GET_TASKID {
+		?loader.IPC_M_DATA_READ /* task id */
 	} +
 	
-	?LOADER_SET_PATHNAME {
-		?IPC_M_DATA_WRITE /* path */
+	?loader.LOADER_SET_PATHNAME {
+		?loader.IPC_M_DATA_WRITE /* path */
 	} +
 	
-	?LOADER_SET_ARGS {
-		?IPC_M_DATA_WRITE /* arguments */
+	?loader.LOADER_SET_ARGS {
+		?loader.IPC_M_DATA_WRITE /* arguments */
 	} +
 	
-	?LOADER_SET_FILES {
-		?IPC_M_DATA_WRITE /* files */
+	?loader.LOADER_SET_FILES {
+		?loader.IPC_M_DATA_WRITE /* files */
 	} +
 	
-	?LOADER_LOAD
+	?loader.LOADER_LOAD
 )* ;
 (
-	?LOADER_RUN +
-	?IPC_M_PHONE_HUNGUP
+	?loader.LOADER_RUN +
+	?loader.IPC_M_PHONE_HUNGUP
 )
Index: contrib/bp/srv/ns/ns.bp
===================================================================
--- contrib/bp/srv/ns/ns.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/ns/ns.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,18 +1,18 @@
 (
 	(
-		?IPC_M_SHARE_IN /* SERVICE_MEM_REALTIME || SERVICE_MEM_KLOG */ +
-		?IPC_M_CONNECT_TO_ME {
+		?ns.IPC_M_SHARE_IN /* SERVICE_MEM_REALTIME || SERVICE_MEM_KLOG */ +
+		?ns.IPC_M_CONNECT_TO_ME {
 			!clonable.IPC_M_CONNECT_TO_ME /* forwarded */ +
 			NULL
 		} +
-		?IPC_M_CONNECT_ME_TO {
+		?ns.IPC_M_CONNECT_ME_TO {
 			!service.IPC_M_CONNECT_ME_TO /* forwarded */ +
 			NULL
 		} +
-		?NS_PING +
-		?NS_TASK_WAIT +
-		?NS_ID_INTRO +
-		?NS_RETVAL
+		?ns.NS_PING +
+		?ns.NS_TASK_WAIT +
+		?ns.NS_ID_INTRO +
+		?ns.NS_RETVAL
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?ns.IPC_M_PHONE_HUNGUP
 )*
Index: contrib/bp/srv/pci/pci.bp
===================================================================
--- contrib/bp/srv/pci/pci.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/pci/pci.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,5 +1,5 @@
 !ns.IPC_M_CONNECT_TO_ME ;
 (
-	?IPC_M_CONNECT_ME_TO ;
-	?IPC_M_PHONE_HUNGUP
+	?pci.IPC_M_CONNECT_ME_TO ;
+	?pci.IPC_M_PHONE_HUNGUP
 )*
Index: contrib/bp/srv/vfs/vfs.bp
===================================================================
--- contrib/bp/srv/vfs/vfs.bp	(revision e74242936fc14aa3d253b0e9b00478d8c06f0424)
+++ contrib/bp/srv/vfs/vfs.bp	(revision 9b11daefe44950f259e896108d7b632e4718b174)
@@ -1,17 +1,17 @@
 !ns.IPC_M_CONNECT_TO_ME ;
 (
-	?IPC_M_CONNECT_ME_TO ;
+	?vfs.IPC_M_CONNECT_ME_TO ;
 	(
-		?VFS_IN_REGISTER {
-			?IPC_M_DATA_WRITE ;
-			?IPC_M_CONNECT_TO_ME ;
-			?IPC_M_SHARE_IN
+		?vfs.VFS_IN_REGISTER {
+			?vfs.IPC_M_DATA_WRITE ;
+			?vfs.IPC_M_CONNECT_TO_ME ;
+			?vfs.IPC_M_SHARE_IN
 		} +
 		
-		?VFS_IN_MOUNT {
-			?IPC_M_DATA_WRITE /* mount point */ ;
-			?IPC_M_DATA_WRITE /* mount options */ ;
-			?IPC_M_DATA_WRITE /* fs name */ ;
-			?IPC_M_PING ;
+		?vfs.VFS_IN_MOUNT {
+			?vfs.IPC_M_DATA_WRITE /* mount point */ ;
+			?vfs.IPC_M_DATA_WRITE /* mount options */ ;
+			?vfs.IPC_M_DATA_WRITE /* fs name */ ;
+			?vfs.IPC_M_PING ;
 			(
 				
@@ -26,6 +26,6 @@
 		} +
 		
-		?VFS_IN_OPEN {
-			?IPC_M_DATA_WRITE /* path */ ;
+		?vfs.VFS_IN_OPEN {
+			?vfs.IPC_M_DATA_WRITE /* path */ ;
 			[vfs_lookup_internal] ;
 			(
@@ -39,5 +39,5 @@
 		} +
 		
-		?VFS_IN_OPEN_NODE {
+		?vfs.VFS_IN_OPEN_NODE {
 			[vfs_grab_phone] ;
 			!fs.VFS_OUT_OPEN_NODE ;
@@ -53,5 +53,5 @@
 		} +
 		
-		?VFS_IN_CLOSE {
+		?vfs.VFS_IN_CLOSE {
 			[vfs_grab_phone] ;
 			!fs.VFS_OUT_CLOSE ;
@@ -59,6 +59,6 @@
 		} +
 		
-		?VFS_IN_READ {
-			?IPC_M_DATA_READ {
+		?vfs.VFS_IN_READ {
+			?vfs.IPC_M_DATA_READ {
 				[vfs_grab_phone] ;
 				!fs.VFS_OUT_READ /* payload */ ;
@@ -68,6 +68,6 @@
 		} +
 		
-		?VFS_IN_WRITE {
-			?IPC_M_DATA_WRITE {
+		?vfs.VFS_IN_WRITE {
+			?vfs.IPC_M_DATA_WRITE {
 				[vfs_grab_phone] ;
 				!fs.VFS_OUT_WRITE /* payload */ ;
@@ -77,7 +77,7 @@
 		} +
 		
-		?VFS_IN_SEEK +
+		?vfs.VFS_IN_SEEK +
 		
-		?VFS_IN_TRUNCATE {
+		?vfs.VFS_IN_TRUNCATE {
 			[vfs_grab_phone] ;
 			!fs.VFS_OUT_TRUNCATE ;
@@ -85,6 +85,6 @@
 		} +
 		
-		?VFS_IN_FSTAT {
-			?IPC_M_DATA_READ /* struct stat */ {
+		?vfs.VFS_IN_FSTAT {
+			?vfs.IPC_M_DATA_READ /* struct stat */ {
 				[vfs_grab_phone] ;
 				!fs.VFS_OUT_STAT ;
@@ -94,7 +94,7 @@
 		} +
 		
-		?VFS_IN_STAT {
-			?IPC_M_DATA_WRITE /* path */ ;
-			?IPC_M_DATA_READ /* struct stat */ {
+		?vfs.VFS_IN_STAT {
+			?vfs.IPC_M_DATA_WRITE /* path */ ;
+			?vfs.IPC_M_DATA_READ /* struct stat */ {
 				[vfs_lookup_internal] ;
 				!fs.VFS_OUT_STAT ;
@@ -103,17 +103,17 @@
 		} +
 		
-		?VFS_IN_MKDIR {
-			?IPC_M_DATA_WRITE /* path */ ;
+		?vfs.VFS_IN_MKDIR {
+			?vfs.IPC_M_DATA_WRITE /* path */ ;
 			[vfs_lookup_internal]
 		} +
 		
-		?VFS_IN_UNLINK {
-			?IPC_M_DATA_WRITE /* path */ ;
+		?vfs.VFS_IN_UNLINK {
+			?vfs.IPC_M_DATA_WRITE /* path */ ;
 			[vfs_lookup_internal]
 		} +
 		
-		?VFS_IN_RENAME {
-			?IPC_M_DATA_WRITE /* old path */ ;
-			?IPC_M_DATE_WRITE /* new path */ ;
+		?vfs.VFS_IN_RENAME {
+			?vfs.IPC_M_DATA_WRITE /* old path */ ;
+			?vfs.IPC_M_DATE_WRITE /* new path */ ;
 			[vfs_lookup_internal] /* lookup old path */ ;
 			[vfs_lookup_internal] /* lookup parent of new path */ ;
@@ -123,9 +123,9 @@
 		} +
 		
-		?VFS_IN_SYNC {
+		?vfs.VFS_IN_SYNC {
 			!fs.VFS_OUT_SYNC
 		}
 		
 	)* ;
-	?IPC_M_PHONE_HUNGUP
+	?vfs.IPC_M_PHONE_HUNGUP
 )*
