Index: uspace/lib/c/generic/io/chardev_srv.c
===================================================================
--- uspace/lib/c/generic/io/chardev_srv.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ uspace/lib/c/generic/io/chardev_srv.c	(revision 3e242d25d5b49481f9f26ba4a66712daa6a48540)
@@ -43,5 +43,5 @@
 static chardev_srv_t *chardev_srv_create(chardev_srvs_t *);
 
-static void chardev_read_srv(chardev_srv_t *srv, ipc_callid_t callid,
+static void chardev_read_srv(chardev_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -50,5 +50,5 @@
 	size_t nread;
 	errno_t rc;
-	ipc_callid_t rcallid;
+	cap_call_handle_t rcallid;
 
 	if (!async_data_read_receive(&rcallid, &size)) {
@@ -85,5 +85,5 @@
 }
 
-static void chardev_write_srv(chardev_srv_t *srv, ipc_callid_t callid,
+static void chardev_write_srv(chardev_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -132,5 +132,5 @@
 }
 
-errno_t chardev_conn(ipc_callid_t iid, ipc_call_t *icall, chardev_srvs_t *srvs)
+errno_t chardev_conn(cap_call_handle_t iid, ipc_call_t *icall, chardev_srvs_t *srvs)
 {
 	chardev_srv_t *srv;
@@ -152,5 +152,5 @@
 	while (true) {
 		ipc_call_t call;
-		ipc_callid_t callid = async_get_call(&call);
+		cap_call_handle_t callid = async_get_call(&call);
 		sysarg_t method = IPC_GET_IMETHOD(call);
 
Index: uspace/lib/c/generic/io/con_srv.c
===================================================================
--- uspace/lib/c/generic/io/con_srv.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ uspace/lib/c/generic/io/con_srv.c	(revision 3e242d25d5b49481f9f26ba4a66712daa6a48540)
@@ -66,5 +66,5 @@
 }
 
-static void con_read_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_read_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -72,5 +72,5 @@
 	size_t size;
 	errno_t rc;
-	ipc_callid_t rcallid;
+	cap_call_handle_t rcallid;
 
 	if (!async_data_read_receive(&rcallid, &size)) {
@@ -108,5 +108,5 @@
 }
 
-static void con_write_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_write_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -133,5 +133,5 @@
 }
 
-static void con_sync_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_sync_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -145,5 +145,5 @@
 }
 
-static void con_clear_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_clear_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -157,5 +157,5 @@
 }
 
-static void con_set_pos_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_pos_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -175,5 +175,5 @@
 }
 
-static void con_get_pos_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_get_pos_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -191,5 +191,5 @@
 }
 
-static void con_get_size_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_get_size_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -207,5 +207,5 @@
 }
 
-static void con_get_color_cap_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_get_color_cap_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -222,5 +222,5 @@
 }
 
-static void con_set_style_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_style_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -238,5 +238,5 @@
 }
 
-static void con_set_color_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_color_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -258,5 +258,5 @@
 }
 
-static void con_set_rgb_color_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_rgb_color_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -276,5 +276,5 @@
 }
 
-static void con_set_cursor_visibility_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_set_cursor_visibility_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -292,5 +292,5 @@
 }
 
-static void con_get_event_srv(con_srv_t *srv, ipc_callid_t callid,
+static void con_get_event_srv(con_srv_t *srv, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -340,5 +340,5 @@
 }
 
-errno_t con_conn(ipc_callid_t iid, ipc_call_t *icall, con_srvs_t *srvs)
+errno_t con_conn(cap_call_handle_t iid, ipc_call_t *icall, con_srvs_t *srvs)
 {
 	con_srv_t *srv;
@@ -366,5 +366,5 @@
 	while (true) {
 		ipc_call_t call;
-		ipc_callid_t callid = 0;
+		cap_call_handle_t callid = 0;
 
 		while (callid == 0) {
Index: uspace/lib/c/generic/io/input.c
===================================================================
--- uspace/lib/c/generic/io/input.c	(revision 84239b1cd7c5ed286263ce4edb649da00b34b249)
+++ uspace/lib/c/generic/io/input.c	(revision 3e242d25d5b49481f9f26ba4a66712daa6a48540)
@@ -43,5 +43,5 @@
 #include <stdlib.h>
 
-static void input_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static void input_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
 
 errno_t input_open(async_sess_t *sess, input_ev_ops_t *ev_ops,
@@ -92,5 +92,5 @@
 }
 
-static void input_ev_active(input_t *input, ipc_callid_t callid,
+static void input_ev_active(input_t *input, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -99,5 +99,5 @@
 }
 
-static void input_ev_deactive(input_t *input, ipc_callid_t callid,
+static void input_ev_deactive(input_t *input, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -106,5 +106,5 @@
 }
 
-static void input_ev_key(input_t *input, ipc_callid_t callid,
+static void input_ev_key(input_t *input, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -124,5 +124,5 @@
 }
 
-static void input_ev_move(input_t *input, ipc_callid_t callid,
+static void input_ev_move(input_t *input, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -138,5 +138,5 @@
 }
 
-static void input_ev_abs_move(input_t *input, ipc_callid_t callid,
+static void input_ev_abs_move(input_t *input, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -156,5 +156,5 @@
 }
 
-static void input_ev_button(input_t *input, ipc_callid_t callid,
+static void input_ev_button(input_t *input, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -170,5 +170,5 @@
 }
 
-static void input_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void input_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	input_t *input = (input_t *)arg;
@@ -176,5 +176,5 @@
 	while (true) {
 		ipc_call_t call;
-		ipc_callid_t callid = async_get_call(&call);
+		cap_call_handle_t callid = async_get_call(&call);
 
 		if (!IPC_GET_IMETHOD(call)) {