Index: kernel/generic/include/ddi/irq.h
===================================================================
--- kernel/generic/include/ddi/irq.h	(revision 01c3bb491370247ba1459d7e381e27022f09fed4)
+++ kernel/generic/include/ddi/irq.h	(revision 40fd6f0603f68e631684ecf21999cdf323028976)
@@ -132,5 +132,5 @@
 extern hash_table_t irq_uspace_hash_table;
 
-extern slab_cache_t *irq_slab;
+extern slab_cache_t *irq_cache;
 
 extern inr_t last_inr;
Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 01c3bb491370247ba1459d7e381e27022f09fed4)
+++ kernel/generic/include/ipc/ipc.h	(revision 40fd6f0603f68e631684ecf21999cdf323028976)
@@ -173,5 +173,5 @@
 } call_t;
 
-extern slab_cache_t *phone_slab;
+extern slab_cache_t *phone_cache;
 
 extern answerbox_t *ipc_phone_0;
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 01c3bb491370247ba1459d7e381e27022f09fed4)
+++ kernel/generic/include/proc/thread.h	(revision 40fd6f0603f68e631684ecf21999cdf323028976)
@@ -272,5 +272,5 @@
 
 /** Fpu context slab cache. */
-extern slab_cache_t *fpu_context_slab;
+extern slab_cache_t *fpu_context_cache;
 
 /* Thread syscall prototypes. */