Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -68,5 +68,5 @@
 static void print_usage(void);
 static errno_t file_bd_init(const char *fname);
-static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
+static void file_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *);
 
 static errno_t file_bd_open(bd_srvs_t *, bd_srv_t *);
@@ -201,5 +201,5 @@
 }
 
-static void file_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void file_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	bd_conn(iid, icall, &bd_srvs);
Index: uspace/srv/bd/rd/rd.c
===================================================================
--- uspace/srv/bd/rd/rd.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/srv/bd/rd/rd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -94,5 +94,5 @@
 static bd_srvs_t bd_srvs;
 
-static void rd_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void rd_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	bd_conn(iid, icall, &bd_srvs);
Index: uspace/srv/bd/sata_bd/sata_bd.c
===================================================================
--- uspace/srv/bd/sata_bd/sata_bd.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/srv/bd/sata_bd/sata_bd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -167,5 +167,5 @@
 
 /** Block device connection handler. */
-static void sata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void sata_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	service_id_t dsid;
Index: uspace/srv/bd/vbd/disk.c
===================================================================
--- uspace/srv/bd/vbd/disk.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/srv/bd/vbd/disk.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -1068,5 +1068,5 @@
 }
 
-void vbds_bd_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+void vbds_bd_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	vbds_part_t *part;
Index: uspace/srv/bd/vbd/disk.h
===================================================================
--- uspace/srv/bd/vbd/disk.h	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/srv/bd/vbd/disk.h	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -55,5 +55,5 @@
 extern errno_t vbds_part_delete(vbds_part_id_t);
 extern errno_t vbds_suggest_ptype(service_id_t, label_pcnt_t, label_ptype_t *);
-extern void vbds_bd_conn(ipc_callid_t, ipc_call_t *, void *);
+extern void vbds_bd_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 #endif
Index: uspace/srv/bd/vbd/vbd.c
===================================================================
--- uspace/srv/bd/vbd/vbd.c	(revision a35b458e9db1ca95e679799dc7c1b12c83359ca3)
+++ uspace/srv/bd/vbd/vbd.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -53,5 +53,5 @@
 #define NAME  "vbd"
 
-static void vbds_client_conn(ipc_callid_t, ipc_call_t *, void *);
+static void vbds_client_conn(cap_call_handle_t, ipc_call_t *, void *);
 
 static service_id_t ctl_sid;
@@ -87,7 +87,7 @@
 }
 
-static void vbds_get_disks_srv(ipc_callid_t iid, ipc_call_t *icall)
-{
-	ipc_callid_t callid;
+static void vbds_get_disks_srv(cap_call_handle_t iid, ipc_call_t *icall)
+{
+	cap_call_handle_t callid;
 	size_t size;
 	size_t act_size;
@@ -121,5 +121,5 @@
 }
 
-static void vbds_disk_info_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_disk_info_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	service_id_t disk_sid;
@@ -136,5 +136,5 @@
 	}
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_read_receive(&callid, &size)) {
@@ -161,5 +161,5 @@
 }
 
-static void vbds_label_create_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_label_create_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	service_id_t disk_sid;
@@ -175,5 +175,5 @@
 }
 
-static void vbds_label_delete_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_label_delete_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	service_id_t disk_sid;
@@ -187,7 +187,7 @@
 }
 
-static void vbds_label_get_parts_srv(ipc_callid_t iid, ipc_call_t *icall)
-{
-	ipc_callid_t callid;
+static void vbds_label_get_parts_srv(cap_call_handle_t iid, ipc_call_t *icall)
+{
+	cap_call_handle_t callid;
 	size_t size;
 	size_t act_size;
@@ -225,5 +225,5 @@
 }
 
-static void vbds_part_get_info_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_part_get_info_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	vbds_part_id_t part;
@@ -240,5 +240,5 @@
 	}
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_read_receive(&callid, &size)) {
@@ -265,5 +265,5 @@
 }
 
-static void vbds_part_create_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_part_create_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	service_id_t disk_sid;
@@ -276,5 +276,5 @@
 	disk_sid = IPC_GET_ARG1(*icall);
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_write_receive(&callid, &size)) {
@@ -306,5 +306,5 @@
 }
 
-static void vbds_part_delete_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_part_delete_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	vbds_part_id_t part;
@@ -318,5 +318,5 @@
 }
 
-static void vbds_suggest_ptype_srv(ipc_callid_t iid, ipc_call_t *icall)
+static void vbds_suggest_ptype_srv(cap_call_handle_t iid, ipc_call_t *icall)
 {
 	service_id_t disk_sid;
@@ -336,5 +336,5 @@
 	}
 
-	ipc_callid_t callid;
+	cap_call_handle_t callid;
 	size_t size;
 	if (!async_data_read_receive(&callid, &size)) {
@@ -360,5 +360,5 @@
 }
 
-static void vbds_ctl_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void vbds_ctl_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	log_msg(LOG_DEFAULT, LVL_DEBUG, "vbds_client_conn()");
@@ -369,5 +369,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);
 
@@ -412,5 +412,5 @@
 }
 
-static void vbds_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void vbds_client_conn(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	service_id_t sid;