Index: kernel/generic/include/cap/cap.h
===================================================================
--- kernel/generic/include/cap/cap.h	(revision 9e875620ecd41735d8a5759a1e6986978cb55507)
+++ kernel/generic/include/cap/cap.h	(revision 6abfd250b332c7fec99a5c8647d7dc3d22442cb3)
@@ -77,5 +77,5 @@
 extern void caps_task_free(struct task *);
 extern void caps_task_init(struct task *);
-extern bool caps_apply_to_all(struct task *, cap_type_t,
+extern bool caps_apply_to_type(struct task *, cap_type_t,
     bool (*)(cap_t *, void *), void *);
 extern void caps_lock(struct task *);
Index: kernel/generic/src/cap/cap.c
===================================================================
--- kernel/generic/src/cap/cap.c	(revision 9e875620ecd41735d8a5759a1e6986978cb55507)
+++ kernel/generic/src/cap/cap.c	(revision 6abfd250b332c7fec99a5c8647d7dc3d22442cb3)
@@ -71,5 +71,5 @@
 }
 
-bool caps_apply_to_all(task_t *task, cap_type_t type,
+bool caps_apply_to_type(task_t *task, cap_type_t type,
     bool (*cb)(cap_t *, void *), void *arg)
 {
Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 9e875620ecd41735d8a5759a1e6986978cb55507)
+++ kernel/generic/src/ipc/ipc.c	(revision 6abfd250b332c7fec99a5c8647d7dc3d22442cb3)
@@ -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);