Index: uspace/srv/net/dhcp/main.c
===================================================================
--- uspace/srv/net/dhcp/main.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/dhcp/main.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -50,5 +50,5 @@
 #define NAME  "dhcp"
 
-static void dhcp_client_conn(ipc_callid_t, ipc_call_t *, void *);
+static void dhcp_client_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 static errno_t dhcp_init(void)
@@ -84,5 +84,5 @@
 }
 
-static void dhcp_link_add_srv(ipc_callid_t callid, ipc_call_t *call)
+static void dhcp_link_add_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	sysarg_t link_id;
@@ -97,5 +97,5 @@
 }
 
-static void dhcp_link_remove_srv(ipc_callid_t callid, ipc_call_t *call)
+static void dhcp_link_remove_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	sysarg_t link_id;
@@ -110,5 +110,5 @@
 }
 
-static void dhcp_discover_srv(ipc_callid_t callid, ipc_call_t *call)
+static void dhcp_discover_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	sysarg_t link_id;
@@ -123,5 +123,5 @@
 }
 
-static void dhcp_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void dhcp_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcp_client_conn()");
@@ -132,5 +132,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/srv/net/dnsrsrv/dnsrsrv.c
===================================================================
--- uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/dnsrsrv/dnsrsrv.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -53,5 +53,5 @@
 #define NAME  "dnsres"
 
-static void dnsr_client_conn(ipc_callid_t, ipc_call_t *, void *);
+static void dnsr_client_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 static errno_t dnsr_init(void)
@@ -86,5 +86,5 @@
 }
 
-static void dnsr_name2host_srv(dnsr_client_t *client, ipc_callid_t iid,
+static void dnsr_name2host_srv(dnsr_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -108,5 +108,5 @@
 	}
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_read_receive(&callid, &size)) {
@@ -151,10 +151,10 @@
 }
 
-static void dnsr_get_srvaddr_srv(dnsr_client_t *client, ipc_callid_t iid,
+static void dnsr_get_srvaddr_srv(dnsr_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()");
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_read_receive(&callid, &size)) {
@@ -179,10 +179,10 @@
 }
 
-static void dnsr_set_srvaddr_srv(dnsr_client_t *client, ipc_callid_t iid,
+static void dnsr_set_srvaddr_srv(dnsr_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "dnsr_set_srvaddr_srv()");
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_write_receive(&callid, &size)) {
@@ -209,5 +209,5 @@
 }
 
-static void dnsr_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void dnsr_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	dnsr_client_t client;
@@ -220,5 +220,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/srv/net/ethip/ethip.c
===================================================================
--- uspace/srv/net/ethip/ethip.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/ethip/ethip.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -63,5 +63,5 @@
 static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
 
-static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static void ethip_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
 
 static iplink_ops_t ethip_iplink_ops = {
@@ -142,5 +142,5 @@
 }
 
-static void ethip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ethip_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	ethip_nic_t *nic;
Index: uspace/srv/net/ethip/ethip_nic.c
===================================================================
--- uspace/srv/net/ethip/ethip_nic.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/ethip/ethip_nic.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -52,5 +52,5 @@
 
 static errno_t ethip_nic_open(service_id_t sid);
-static void ethip_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static void ethip_nic_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
 
 static LIST_INITIALIZE(ethip_nic_list);
@@ -229,5 +229,5 @@
 }
 
-static void ethip_nic_addr_changed(ethip_nic_t *nic, ipc_callid_t callid,
+static void ethip_nic_addr_changed(ethip_nic_t *nic, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -258,5 +258,5 @@
 }
 
-static void ethip_nic_received(ethip_nic_t *nic, ipc_callid_t callid,
+static void ethip_nic_received(ethip_nic_t *nic, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -285,5 +285,5 @@
 }
 
-static void ethip_nic_device_state(ethip_nic_t *nic, ipc_callid_t callid,
+static void ethip_nic_device_state(ethip_nic_t *nic, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -292,5 +292,5 @@
 }
 
-static void ethip_nic_cb_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ethip_nic_cb_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	ethip_nic_t *nic = (ethip_nic_t *)arg;
@@ -300,5 +300,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)) {
Index: uspace/srv/net/inetsrv/inetcfg.c
===================================================================
--- uspace/srv/net/inetsrv/inetcfg.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/inetsrv/inetcfg.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -253,5 +253,5 @@
 }
 
-static void inetcfg_addr_create_static_srv(ipc_callid_t iid,
+static void inetcfg_addr_create_static_srv(cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -260,5 +260,5 @@
 	sysarg_t link_id = IPC_GET_ARG1(*icall);
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_write_receive(&callid, &size)) {
@@ -296,5 +296,5 @@
 }
 
-static void inetcfg_addr_delete_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_addr_delete_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	sysarg_t addr_id;
@@ -309,5 +309,5 @@
 }
 
-static void inetcfg_addr_get_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void inetcfg_addr_get_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_srv()");
@@ -327,5 +327,5 @@
 	}
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_read_receive(&callid, &size)) {
@@ -367,5 +367,5 @@
 }
 
-static void inetcfg_addr_get_id_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_addr_get_id_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	char *name;
@@ -391,7 +391,7 @@
 }
 
-static void inetcfg_get_addr_list_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-	ipc_callid_t rcallid;
+static void inetcfg_get_addr_list_srv(cap_call_handle_t callid, ipc_call_t *call)
+{
+	cap_call_handle_t rcallid;
 	size_t count;
 	size_t max_size;
@@ -425,7 +425,7 @@
 }
 
-static void inetcfg_get_link_list_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-	ipc_callid_t rcallid;
+static void inetcfg_get_link_list_srv(cap_call_handle_t callid, ipc_call_t *call)
+{
+	cap_call_handle_t rcallid;
 	size_t count;
 	size_t max_size;
@@ -459,7 +459,7 @@
 }
 
-static void inetcfg_get_sroute_list_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-	ipc_callid_t rcallid;
+static void inetcfg_get_sroute_list_srv(cap_call_handle_t callid, ipc_call_t *call)
+{
+	cap_call_handle_t rcallid;
 	size_t count;
 	size_t max_size;
@@ -493,5 +493,5 @@
 }
 
-static void inetcfg_link_add_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_link_add_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	sysarg_t link_id;
@@ -506,8 +506,8 @@
 }
 
-static void inetcfg_link_get_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-	ipc_callid_t name_callid;
-	ipc_callid_t laddr_callid;
+static void inetcfg_link_get_srv(cap_call_handle_t callid, ipc_call_t *call)
+{
+	cap_call_handle_t name_callid;
+	cap_call_handle_t laddr_callid;
 	size_t name_max_size;
 	size_t laddr_max_size;
@@ -559,5 +559,5 @@
 }
 
-static void inetcfg_link_remove_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_link_remove_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	sysarg_t link_id;
@@ -572,10 +572,10 @@
 }
 
-static void inetcfg_sroute_create_srv(ipc_callid_t iid,
+static void inetcfg_sroute_create_srv(cap_call_handle_t iid,
     ipc_call_t *icall)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_create_srv()");
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_write_receive(&callid, &size)) {
@@ -633,5 +633,5 @@
 }
 
-static void inetcfg_sroute_delete_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_sroute_delete_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	sysarg_t sroute_id;
@@ -646,5 +646,5 @@
 }
 
-static void inetcfg_sroute_get_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void inetcfg_sroute_get_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_srv()");
@@ -664,5 +664,5 @@
 	}
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_read_receive(&callid, &size)) {
@@ -717,5 +717,5 @@
 }
 
-static void inetcfg_sroute_get_id_srv(ipc_callid_t callid, ipc_call_t *call)
+static void inetcfg_sroute_get_id_srv(cap_call_handle_t callid, ipc_call_t *call)
 {
 	char *name;
@@ -738,5 +738,5 @@
 }
 
-void inet_cfg_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+void inet_cfg_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_cfg_conn()");
@@ -747,5 +747,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/srv/net/inetsrv/inetcfg.h
===================================================================
--- uspace/srv/net/inetsrv/inetcfg.h	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/inetsrv/inetcfg.h	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -38,5 +38,5 @@
 #define INETCFG_H_
 
-extern void inet_cfg_conn(ipc_callid_t, ipc_call_t *, void *);
+extern void inet_cfg_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 #endif
Index: uspace/srv/net/inetsrv/inetping.c
===================================================================
--- uspace/srv/net/inetsrv/inetping.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/inetsrv/inetping.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -136,5 +136,5 @@
 }
 
-static void inetping_send_srv(inetping_client_t *client, ipc_callid_t iid,
+static void inetping_send_srv(inetping_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -146,5 +146,5 @@
 	sdu.seq_no = IPC_GET_ARG1(*icall);
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_write_receive(&callid, &size)) {
@@ -200,9 +200,9 @@
 
 static void inetping_get_srcaddr_srv(inetping_client_t *client,
-    ipc_callid_t iid, ipc_call_t *icall)
+    cap_call_handle_t iid, ipc_call_t *icall)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_get_srcaddr_srv()");
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 
@@ -281,5 +281,5 @@
 }
 
-void inetping_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+void inetping_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_conn()");
@@ -295,5 +295,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/srv/net/inetsrv/inetping.h
===================================================================
--- uspace/srv/net/inetsrv/inetping.h	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/inetsrv/inetping.h	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -41,5 +41,5 @@
 #include "inetsrv.h"
 
-extern void inetping_conn(ipc_callid_t, ipc_call_t *, void *);
+extern void inetping_conn(cap_call_handle_t, ipc_call_t *, void *);
 extern errno_t inetping_recv(uint16_t, inetping_sdu_t *);
 
Index: uspace/srv/net/inetsrv/inetsrv.c
===================================================================
--- uspace/srv/net/inetsrv/inetsrv.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/inetsrv/inetsrv.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -82,5 +82,5 @@
 static LIST_INITIALIZE(client_list);
 
-static void inet_default_conn(ipc_callid_t, ipc_call_t *, void *);
+static void inet_default_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 static errno_t inet_init(void)
@@ -120,5 +120,5 @@
 }
 
-static void inet_callback_create_srv(inet_client_t *client, ipc_callid_t callid,
+static void inet_callback_create_srv(inet_client_t *client, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -230,5 +230,5 @@
 }
 
-static void inet_get_srcaddr_srv(inet_client_t *client, ipc_callid_t iid,
+static void inet_get_srcaddr_srv(inet_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -237,5 +237,5 @@
 	uint8_t tos = IPC_GET_ARG1(*icall);
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_write_receive(&callid, &size)) {
@@ -287,5 +287,5 @@
 }
 
-static void inet_send_srv(inet_client_t *client, ipc_callid_t iid,
+static void inet_send_srv(inet_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -300,5 +300,5 @@
 	int df = IPC_GET_ARG4(*icall);
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_write_receive(&callid, &size)) {
@@ -351,5 +351,5 @@
 }
 
-static void inet_set_proto_srv(inet_client_t *client, ipc_callid_t callid,
+static void inet_set_proto_srv(inet_client_t *client, cap_call_handle_t callid,
     ipc_call_t *call)
 {
@@ -387,5 +387,5 @@
 }
 
-static void inet_default_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void inet_default_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	inet_client_t client;
@@ -400,5 +400,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/srv/net/loopip/loopip.c
===================================================================
--- uspace/srv/net/loopip/loopip.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/loopip/loopip.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -59,5 +59,5 @@
 static errno_t loopip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
 
-static void loopip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static void loopip_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
 
 static iplink_ops_t loopip_iplink_ops = {
@@ -148,5 +148,5 @@
 }
 
-static void loopip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void loopip_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "loopip_client_conn()");
Index: uspace/srv/net/nconfsrv/nconfsrv.c
===================================================================
--- uspace/srv/net/nconfsrv/nconfsrv.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/nconfsrv/nconfsrv.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -54,5 +54,5 @@
 #define NAME "nconfsrv"
 
-static void ncs_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static void ncs_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg);
 
 static errno_t ncs_init(void)
@@ -98,5 +98,5 @@
 }
 
-static void ncs_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ncs_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	async_answer_0(iid, ENOTSUP);
Index: uspace/srv/net/slip/slip.c
===================================================================
--- uspace/srv/net/slip/slip.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/slip/slip.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -199,5 +199,5 @@
 }
 
-static void slip_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void slip_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "slip_client_conn()");
Index: uspace/srv/net/tcp/service.c
===================================================================
--- uspace/srv/net/tcp/service.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/tcp/service.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -728,5 +728,5 @@
  * @param icall   Async request data
  */
-static void tcp_callback_create_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_callback_create_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -751,8 +751,8 @@
  * @param icall    Async request data
  */
-static void tcp_conn_create_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_conn_create_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	inet_ep2_t epp;
@@ -798,5 +798,5 @@
  * @param icall    Async request data
  */
-static void tcp_conn_destroy_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_conn_destroy_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -819,8 +819,8 @@
  * @param icall    Async request data
  */
-static void tcp_listener_create_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_listener_create_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	inet_ep_t ep;
@@ -866,5 +866,5 @@
  * @param icall    Async request data
  */
-static void tcp_listener_destroy_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_listener_destroy_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -887,5 +887,5 @@
  * @param icall    Async request data
  */
-static void tcp_conn_send_fin_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_conn_send_fin_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -908,5 +908,5 @@
  * @param icall    Async request data
  */
-static void tcp_conn_push_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_conn_push_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -929,5 +929,5 @@
  * @param icall    Async request data
  */
-static void tcp_conn_reset_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_conn_reset_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -950,8 +950,8 @@
  * @param icall    Async request data
  */
-static void tcp_conn_send_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_conn_send_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	sysarg_t conn_id;
@@ -1011,8 +1011,8 @@
  * @param icall    Async request data
  */
-static void tcp_conn_recv_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_conn_recv_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	sysarg_t conn_id;
 	size_t size, rsize;
@@ -1067,8 +1067,8 @@
  * @param icall    Async request data
  */
-static void tcp_conn_recv_wait_srv(tcp_client_t *client, ipc_callid_t iid,
+static void tcp_conn_recv_wait_srv(tcp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	sysarg_t conn_id;
 	size_t size, rsize;
@@ -1172,5 +1172,5 @@
  * @param arg   Connection argument
  */
-static void tcp_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void tcp_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	tcp_client_t client;
@@ -1187,5 +1187,5 @@
 		log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_client_conn: wait req");
 		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/srv/net/udp/service.c
===================================================================
--- uspace/srv/net/udp/service.c	(revision 013e5d32c9af4ea5eff1d29e41946a398895b296)
+++ uspace/srv/net/udp/service.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -335,5 +335,5 @@
  * @param icall    Async request data
  */
-static void udp_callback_create_srv(udp_client_t *client, ipc_callid_t iid,
+static void udp_callback_create_srv(udp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -358,8 +358,8 @@
  * @param icall    Async request data
  */
-static void udp_assoc_create_srv(udp_client_t *client, ipc_callid_t iid,
+static void udp_assoc_create_srv(udp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	inet_ep2_t epp;
@@ -405,5 +405,5 @@
  * @param icall    Async request data
  */
-static void udp_assoc_destroy_srv(udp_client_t *client, ipc_callid_t iid,
+static void udp_assoc_destroy_srv(udp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -426,5 +426,5 @@
  * @param icall    Async request data
  */
-static void udp_assoc_set_nolocal_srv(udp_client_t *client, ipc_callid_t iid,
+static void udp_assoc_set_nolocal_srv(udp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -447,8 +447,8 @@
  * @param icall    Async request data
  */
-static void udp_assoc_send_msg_srv(udp_client_t *client, ipc_callid_t iid,
+static void udp_assoc_send_msg_srv(udp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	inet_ep_t dest;
@@ -545,8 +545,8 @@
  * @param icall    Async request data
  */
-static void udp_rmsg_info_srv(udp_client_t *client, ipc_callid_t iid,
+static void udp_rmsg_info_srv(udp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	udp_crcv_queue_entry_t *enext;
@@ -592,8 +592,8 @@
  * @param icall    Async request data
  */
-static void udp_rmsg_read_srv(udp_client_t *client, ipc_callid_t iid,
+static void udp_rmsg_read_srv(udp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t msg_size;
 	udp_crcv_queue_entry_t *enext;
@@ -648,5 +648,5 @@
  * @param icall    Async request data
  */
-static void udp_rmsg_discard_srv(udp_client_t *client, ipc_callid_t iid,
+static void udp_rmsg_discard_srv(udp_client_t *client, cap_call_handle_t iid,
     ipc_call_t *icall)
 {
@@ -674,5 +674,5 @@
  * @param arg   Connection argument
  */
-static void udp_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void udp_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	udp_client_t client;
@@ -691,5 +691,5 @@
 		log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_client_conn: wait req");
 		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);