Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 9e875620ecd41735d8a5759a1e6986978cb55507)
+++ kernel/generic/src/ipc/ipc.c	(revision dd20cbb2102cf289216c9c608ceeb8cdca8749b5)
@@ -790,5 +790,5 @@
 	 */
 	restart = false;
-	if (caps_apply_to_all(TASK, CAP_TYPE_PHONE, phone_cap_wait_cb,
+	if (caps_apply_to_type(TASK, CAP_TYPE_PHONE, phone_cap_wait_cb,
 	    &restart)) {
 		/* Got into cleanup */
@@ -840,5 +840,5 @@
 
 	/* Disconnect all our phones ('ipc_phone_hangup') */
-	caps_apply_to_all(TASK, CAP_TYPE_PHONE, phone_cap_cleanup_cb, NULL);
+	caps_apply_to_type(TASK, CAP_TYPE_PHONE, phone_cap_cleanup_cb, NULL);
 	
 	/* Unsubscribe from any event notifications. */
@@ -846,5 +846,5 @@
 	
 	/* Disconnect all connected IRQs */
-	caps_apply_to_all(TASK, CAP_TYPE_IRQ, irq_cap_cleanup_cb, NULL);
+	caps_apply_to_type(TASK, CAP_TYPE_IRQ, irq_cap_cleanup_cb, NULL);
 	
 	/* Disconnect all phones connected to our regular answerbox */
@@ -963,5 +963,5 @@
 	printf("[phone cap] [calls] [state\n");
 	
-	caps_apply_to_all(task, CAP_TYPE_PHONE, print_task_phone_cb, NULL);
+	caps_apply_to_type(task, CAP_TYPE_PHONE, print_task_phone_cb, NULL);
 	
 	irq_spinlock_lock(&task->lock, true);