Index: uspace/srv/hid/output/output.c
===================================================================
--- uspace/srv/hid/output/output.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/srv/hid/output/output.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -78,5 +78,5 @@
 }
 
-static void srv_yield(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_yield(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	errno_t ret = EOK;
@@ -93,5 +93,5 @@
 }
 
-static void srv_claim(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_claim(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	errno_t ret = EOK;
@@ -108,5 +108,5 @@
 }
 
-static void srv_get_dimensions(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_get_dimensions(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	sysarg_t cols = MAX_COLS;
@@ -121,5 +121,5 @@
 }
 
-static void srv_get_caps(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_get_caps(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	console_caps_t caps = 0;
@@ -134,5 +134,5 @@
 }
 
-static frontbuf_t *resolve_frontbuf(sysarg_t handle, ipc_callid_t iid)
+static frontbuf_t *resolve_frontbuf(sysarg_t handle, cap_call_handle_t iid)
 {
 	frontbuf_t *frontbuf = NULL;
@@ -152,5 +152,5 @@
 }
 
-static void srv_frontbuf_create(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_frontbuf_create(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	frontbuf_t *frontbuf = (frontbuf_t *) malloc(sizeof(frontbuf_t));
@@ -162,5 +162,5 @@
 	link_initialize(&frontbuf->link);
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	if (!async_share_out_receive(&callid, &frontbuf->size,
 	    &frontbuf->flags)) {
@@ -181,5 +181,5 @@
 }
 
-static void srv_frontbuf_destroy(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_frontbuf_destroy(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
@@ -194,5 +194,5 @@
 }
 
-static void srv_cursor_update(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_cursor_update(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
@@ -226,5 +226,5 @@
 }
 
-static void srv_set_style(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_set_style(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	list_foreach(outdevs, link, outdev_t, dev) {
@@ -237,5 +237,5 @@
 }
 
-static void srv_set_color(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_set_color(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	list_foreach(outdevs, link, outdev_t, dev) {
@@ -252,5 +252,5 @@
 }
 
-static void srv_set_rgb_color(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_set_rgb_color(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	list_foreach(outdevs, link, outdev_t, dev) {
@@ -302,5 +302,5 @@
 }
 
-static void srv_update(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_update(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
@@ -352,5 +352,5 @@
 }
 
-static void srv_damage(ipc_callid_t iid, ipc_call_t *icall)
+static void srv_damage(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	frontbuf_t *frontbuf = resolve_frontbuf(IPC_GET_ARG1(*icall), iid);
@@ -391,5 +391,5 @@
 }
 
-static void client_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void client_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	/* Accept the connection */
@@ -398,5 +398,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)) {