Index: uspace/drv/block/ata_bd/main.c
===================================================================
--- uspace/drv/block/ata_bd/main.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/block/ata_bd/main.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -47,5 +47,5 @@
 static errno_t ata_fun_offline(ddf_fun_t *fun);
 
-static void ata_bd_connection(ipc_callid_t, ipc_call_t *, void *);
+static void ata_bd_connection(cap_call_handle_t, ipc_call_t *, void *);
 
 static driver_ops_t driver_ops = {
@@ -313,5 +313,5 @@
 
 /** Block device connection handler */
-static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ata_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	ata_fun_t *afun;
Index: uspace/drv/block/ddisk/ddisk.c
===================================================================
--- uspace/drv/block/ddisk/ddisk.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/block/ddisk/ddisk.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -62,5 +62,5 @@
 static errno_t ddisk_fun_offline(ddf_fun_t *);
 
-static void ddisk_bd_connection(ipc_callid_t, ipc_call_t *, void *);
+static void ddisk_bd_connection(cap_call_handle_t, ipc_call_t *, void *);
 
 static void ddisk_irq_handler(ipc_call_t *, ddf_dev_t *);
@@ -587,5 +587,5 @@
 
 /** Block device connection handler */
-static void ddisk_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+static void ddisk_bd_connection(cap_call_handle_t iid, ipc_call_t *icall, void *arg)
 {
 	ddisk_t *ddisk;
Index: uspace/drv/block/usbmast/main.c
===================================================================
--- uspace/drv/block/usbmast/main.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ uspace/drv/block/usbmast/main.c	(revision 3be9d10120f7923a0b3d52282b8de0b670566c71)
@@ -79,5 +79,5 @@
 
 static errno_t usbmast_fun_create(usbmast_dev_t *mdev, unsigned lun);
-static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
+static void usbmast_bd_connection(cap_call_handle_t iid, ipc_call_t *icall,
     void *arg);
 
@@ -317,5 +317,5 @@
 
 /** Blockdev client connection handler. */
-static void usbmast_bd_connection(ipc_callid_t iid, ipc_call_t *icall,
+static void usbmast_bd_connection(cap_call_handle_t iid, ipc_call_t *icall,
     void *arg)
 {