Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 67f11a04d9b9007cff6be59c182bd35c4f3ee076)
+++ kernel/generic/include/ipc/ipc.h	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -116,5 +116,5 @@
 	sysarg_t label;
 	/** Capability handle */
-	cap_handle_t cap_handle;
+	cap_call_handle_t cap_handle;
 } ipc_data_t;
 
Index: kernel/generic/include/ipc/ipcrsc.h
===================================================================
--- kernel/generic/include/ipc/ipcrsc.h	(revision 67f11a04d9b9007cff6be59c182bd35c4f3ee076)
+++ kernel/generic/include/ipc/ipcrsc.h	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -40,6 +40,6 @@
 #include <cap/cap.h>
 
-extern errno_t phone_alloc(task_t *, bool, cap_handle_t *, kobject_t **);
-extern void phone_dealloc(cap_handle_t);
+extern errno_t phone_alloc(task_t *, bool, cap_phone_handle_t *, kobject_t **);
+extern void phone_dealloc(cap_phone_handle_t);
 
 #endif
Index: kernel/generic/include/ipc/irq.h
===================================================================
--- kernel/generic/include/ipc/irq.h	(revision 67f11a04d9b9007cff6be59c182bd35c4f3ee076)
+++ kernel/generic/include/ipc/irq.h	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -52,6 +52,6 @@
 
 extern errno_t ipc_irq_subscribe(answerbox_t *, inr_t, sysarg_t, irq_code_t *,
-    cap_handle_t *);
-extern errno_t ipc_irq_unsubscribe(answerbox_t *, int);
+    cap_irq_handle_t *);
+extern errno_t ipc_irq_unsubscribe(answerbox_t *, cap_irq_handle_t);
 
 /*
Index: kernel/generic/include/ipc/kbox.h
===================================================================
--- kernel/generic/include/ipc/kbox.h	(revision 67f11a04d9b9007cff6be59c182bd35c4f3ee076)
+++ kernel/generic/include/ipc/kbox.h	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -50,5 +50,5 @@
 } kbox_t;
 
-extern errno_t ipc_connect_kbox(task_id_t, cap_handle_t *);
+extern errno_t ipc_connect_kbox(task_id_t, cap_phone_handle_t *);
 extern void ipc_kbox_cleanup(void);
 
Index: kernel/generic/include/ipc/sysipc.h
===================================================================
--- kernel/generic/include/ipc/sysipc.h	(revision 67f11a04d9b9007cff6be59c182bd35c4f3ee076)
+++ kernel/generic/include/ipc/sysipc.h	(revision a46e56be16ae82f0d007dd26c68b250f3f725ae0)
@@ -40,24 +40,26 @@
 #include <typedefs.h>
 
-extern errno_t ipc_req_internal(int, ipc_data_t *, sysarg_t);
+extern errno_t ipc_req_internal(cap_phone_handle_t, ipc_data_t *, sysarg_t);
 
-extern sys_errno_t sys_ipc_call_async_fast(sysarg_t, sysarg_t, sysarg_t,
+extern sys_errno_t sys_ipc_call_async_fast(cap_phone_handle_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t, sysarg_t);
+extern sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t, ipc_data_t *,
+    sysarg_t);
+extern sys_errno_t sys_ipc_answer_fast(cap_call_handle_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);
-extern sys_errno_t sys_ipc_call_async_slow(sysarg_t, ipc_data_t *, sysarg_t);
-extern sys_errno_t sys_ipc_answer_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t);
-extern sys_errno_t sys_ipc_answer_slow(sysarg_t, ipc_data_t *);
+extern sys_errno_t sys_ipc_answer_slow(cap_call_handle_t, ipc_data_t *);
 extern sys_errno_t sys_ipc_wait_for_call(ipc_data_t *, uint32_t, unsigned int);
 extern sys_errno_t sys_ipc_poke(void);
-extern sys_errno_t sys_ipc_forward_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, unsigned int);
-extern sys_errno_t sys_ipc_forward_slow(sysarg_t, sysarg_t, ipc_data_t *,
-    unsigned int);
-extern sys_errno_t sys_ipc_hangup(sysarg_t);
+extern sys_errno_t sys_ipc_forward_fast(cap_call_handle_t, cap_phone_handle_t,
+    sysarg_t, sysarg_t, sysarg_t, unsigned int);
+extern sys_errno_t sys_ipc_forward_slow(cap_call_handle_t, cap_phone_handle_t,
+    ipc_data_t *, unsigned int);
+extern sys_errno_t sys_ipc_hangup(cap_phone_handle_t);
 
-extern sys_errno_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *, cap_handle_t *);
-extern sys_errno_t sys_ipc_irq_unsubscribe(sysarg_t);
+extern sys_errno_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *,
+    cap_irq_handle_t *);
+extern sys_errno_t sys_ipc_irq_unsubscribe(cap_irq_handle_t);
 
-extern sys_errno_t sys_ipc_connect_kbox(task_id_t *, cap_handle_t *);
+extern sys_errno_t sys_ipc_connect_kbox(task_id_t *, cap_phone_handle_t *);
 
 #endif