Index: contrib/arch/uspace/lib/libc/bind
===================================================================
--- contrib/arch/uspace/lib/libc/bind	(revision ea5f46d1766b374ee3bb1b470e3f08c441077c0b)
+++ contrib/arch/uspace/lib/libc/bind	(revision cf7b3e025e3db101a36b0419103a3b43b6675127)
@@ -1,16 +1,16 @@
 /* Bind %% to kernel interfaces */
-bind %%:kernel_klog to kernel:kernel_klog;
-bind %%:kernel_console to kernel:kernel_console;
-bind %%:kernel_tls to kernel:kernel_tls;
-bind %%:kernel_thread to kernel:kernel_thread;
-bind %%:kernel_task to kernel:kernel_task;
-bind %%:kernel_program to kernel:kernel_program;
-bind %%:kernel_futex to kernel:kernel_futex;
-bind %%:kernel_smc to kernel:kernel_smc;
-bind %%:kernel_as to kernel:kernel_as;
-bind %%:kernel_ipc to kernel:kernel_sys;
-bind %%:kernel_event to kernel:kernel_event;
-bind %%:kernel_cap to kernel:kernel_cap;
-bind %%:kernel_ddi to kernel:kernel_ddi;
-bind %%:kernel_sysinfo to kernel:kernel_sysinfo;
-bind %%:kernel_debug to kernel:kernel_debug;
+bind %%:sys_klog to kernel:sys_klog;
+bind %%:sys_console to kernel:sys_console;
+bind %%:sys_tls to kernel:sys_tls;
+bind %%:sys_thread to kernel:sys_thread;
+bind %%:sys_task to kernel:sys_task;
+bind %%:sys_program to kernel:sys_program;
+bind %%:sys_futex to kernel:sys_futex;
+bind %%:sys_smc to kernel:sys_smc;
+bind %%:sys_as to kernel:sys_as;
+bind %%:sys_ipc to kernel:sys_ipc;
+bind %%:sys_event to kernel:sys_event;
+bind %%:sys_cap to kernel:sys_cap;
+bind %%:sys_ddi to kernel:sys_ddi;
+bind %%:sys_sysinfo to kernel:sys_sysinfo;
+bind %%:sys_debug to kernel:sys_debug;
Index: contrib/arch/uspace/lib/libc/protocol
===================================================================
--- contrib/arch/uspace/lib/libc/protocol	(revision ea5f46d1766b374ee3bb1b470e3f08c441077c0b)
+++ contrib/arch/uspace/lib/libc/protocol	(revision cf7b3e025e3db101a36b0419103a3b43b6675127)
@@ -1,41 +1,41 @@
 /* Protocol according to which libc uses kernel syscalls */
 (
-	!kernel_klog.sys_klog +
-	!kernel_tls.sys_tls_set +
-	!kernel_thread.sys_thread_create +
-	!kernel_thread.sys_thread_get_id +
-	!kernel_thread.sys_thread_exit +
-	!kernel_task.sys_task_set_name +
-	!kernel_task.sys_task_get_id +
-	!kernel_program.sys_program_spawn_loader +
-	!kernel_futex.sys_futex_sleep_timeout +
-	!kernel_futex.sys_futex_wakeup +
-	!kernel_smc.sys_smc_coherence +
-	!kernel_as.sys_as_area_create +
-	!kernel_as.sys_as_area_resize +
-	!kernel_as.sys_as_area_change_flags +
-	!kernel_as.sys_as_area_destroy +
-	!kernel_ipc.sys_ipc_call_sync_fast +
-	!kernel_ipc.sys_ipc_call_sync_slow +
-	!kernel_ipc.sys_ipc_call_async_fast +
-	!kernel_ipc.sys_ipc_call_async_slow +
-	!kernel_ipc.sys_ipc_forward_fast +
-	!kernel_ipc.sys_ipc_forward_slow +
-	!kernel_ipc.sys_ipc_answer_fast +
-	!kernel_ipc.sys_ipc_answer_slow +
-	!kernel_ipc.sys_ipc_hangup +
-	!kernel_ipc.sys_ipc_wait_for_call +
-	!kernel_ipc.sys_ipc_poke +
-	!kernel_event.sys_event_subscribe +
-	!kernel_cap.sys_cap_grant +
-	!kernel_cap.sys_cap_rewoke +
-	!kernel_ddi.sys_enable_iospace +
-	!kernel_ddi.sys_physmem_map +
-	!kernel_ddi.sys_device_assign_devno +
-	!kernel_ddi.sys_preempt_control +
-	!kernel_ddi.sys_ipc_register_irq +
-	!kernel_ddi.sys_ipc_unregister_irq +
-	!kernel_sysinfo.sys_sysinfo_valid +
-	!kernel_sysinfo.sys_sysinfo_value +
-	!kernel_debug.sys_ipc_connect_kbox
+	!sys_klog.sys_klog +
+	!sys_tls.sys_tls_set +
+	!sys_thread.sys_thread_create +
+	!sys_thread.sys_thread_get_id +
+	!sys_thread.sys_thread_exit +
+	!sys_task.sys_task_set_name +
+	!sys_task.sys_task_get_id +
+	!sys_program.sys_program_spawn_loader +
+	!sys_futex.sys_futex_sleep_timeout +
+	!sys_futex.sys_futex_wakeup +
+	!sys_smc.sys_smc_coherence +
+	!sys_as.sys_as_area_create +
+	!sys_as.sys_as_area_resize +
+	!sys_as.sys_as_area_change_flags +
+	!sys_as.sys_as_area_destroy +
+	!sys_ipc.sys_ipc_call_sync_fast +
+	!sys_ipc.sys_ipc_call_sync_slow +
+	!sys_ipc.sys_ipc_call_async_fast +
+	!sys_ipc.sys_ipc_call_async_slow +
+	!sys_ipc.sys_ipc_forward_fast +
+	!sys_ipc.sys_ipc_forward_slow +
+	!sys_ipc.sys_ipc_answer_fast +
+	!sys_ipc.sys_ipc_answer_slow +
+	!sys_ipc.sys_ipc_hangup +
+	!sys_ipc.sys_ipc_wait_for_call +
+	!sys_ipc.sys_ipc_poke +
+	!sys_event.sys_event_subscribe +
+	!sys_cap.sys_cap_grant +
+	!sys_cap.sys_cap_rewoke +
+	!sys_ddi.sys_enable_iospace +
+	!sys_ddi.sys_physmem_map +
+	!sys_ddi.sys_device_assign_devno +
+	!sys_ddi.sys_preempt_control +
+	!sys_ddi.sys_ipc_register_irq +
+	!sys_ddi.sys_ipc_unregister_irq +
+	!sys_sysinfo.sys_sysinfo_valid +
+	!sys_sysinfo.sys_sysinfo_value +
+	!sys_debug.sys_ipc_connect_kbox
 )*
Index: contrib/arch/uspace/lib/libc/requires
===================================================================
--- contrib/arch/uspace/lib/libc/requires	(revision ea5f46d1766b374ee3bb1b470e3f08c441077c0b)
+++ contrib/arch/uspace/lib/libc/requires	(revision cf7b3e025e3db101a36b0419103a3b43b6675127)
@@ -1,16 +1,16 @@
 /* Kernel interfaces required by libc */
-kernel_klog kernel_klog;
-kernel_console kernel_console;
-kernel_tls kernel_tls;
-kernel_thread kernel_thread;
-kernel_task kernel_task;
-kernel_program kernel_program;
-kernel_futex kernel_futex;
-kernel_smc kernel_smc;
-kernel_as kernel_as;
-kernel_ipc kernel_sys;
-kernel_event kernel_event;
-kernel_cap kernel_cap;
-kernel_ddi kernel_ddi;
-kernel_sysinfo kernel_sysinfo;
-kernel_debug kernel_debug;
+sys_klog sys_klog;
+sys_console sys_console;
+sys_tls sys_tls;
+sys_thread sys_thread;
+sys_task sys_task;
+sys_program sys_program;
+sys_futex sys_futex;
+sys_smc sys_smc;
+sys_as sys_as;
+sys_ipc sys_ipc;
+sys_event sys_event;
+sys_cap sys_cap;
+sys_ddi sys_ddi;
+sys_sysinfo sys_sysinfo;
+sys_debug sys_debug;
Index: contrib/arch/uspace/lib/libc/subsume
===================================================================
--- contrib/arch/uspace/lib/libc/subsume	(revision ea5f46d1766b374ee3bb1b470e3f08c441077c0b)
+++ contrib/arch/uspace/lib/libc/subsume	(revision cf7b3e025e3db101a36b0419103a3b43b6675127)
@@ -1,16 +1,16 @@
 /* Subsume %% to kernel interfaces */
-subsume %%:kernel_klog to kernel_klog;
-subsume %%:kernel_console to kernel_console;
-subsume %%:kernel_tls to kernel_tls;
-subsume %%:kernel_thread to kernel_thread;
-subsume %%:kernel_task to kernel_task;
-subsume %%:kernel_program to kernel_program;
-subsume %%:kernel_futex to kernel_futex;
-subsume %%:kernel_smc to kernel_smc;
-subsume %%:kernel_as to kernel_as;
-subsume %%:kernel_ipc to kernel_sys;
-subsume %%:kernel_event to kernel_event;
-subsume %%:kernel_cap to kernel_cap;
-subsume %%:kernel_ddi to kernel_ddi;
-subsume %%:kernel_sysinfo to kernel_sysinfo;
-subsume %%:kernel_debug to kernel_debug;
+subsume %%:sys_klog to sys_klog;
+subsume %%:sys_console to sys_console;
+subsume %%:sys_tls to sys_tls;
+subsume %%:sys_thread to sys_thread;
+subsume %%:sys_task to sys_task;
+subsume %%:sys_program to sys_program;
+subsume %%:sys_futex to sys_futex;
+subsume %%:sys_smc to sys_smc;
+subsume %%:sys_as to sys_as;
+subsume %%:sys_ipc to sys_ipc;
+subsume %%:sys_event to sys_event;
+subsume %%:sys_cap to sys_cap;
+subsume %%:sys_ddi to sys_ddi;
+subsume %%:sys_sysinfo to sys_sysinfo;
+subsume %%:sys_debug to sys_debug;
