Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision 8cd680c007c2a69075a82a05402c553e68bbac00)
+++ kernel/generic/src/ddi/ddi.c	(revision 1165a41982b3e702655a56bd998366ef0f55a919)
@@ -42,5 +42,5 @@
 #include <ddi/ddi.h>
 #include <proc/task.h>
-#include <security/cap.h>
+#include <security/perm.h>
 #include <mm/frame.h>
 #include <mm/as.h>
@@ -96,5 +96,5 @@
  *
  * @return EOK on success.
- * @return EPERM if the caller lacks capabilities to use this syscall.
+ * @return EPERM if the caller lacks permissions to use this syscall.
  * @return EBADMEM if phys is not page aligned.
  * @return ENOENT if there is no task matching the specified ID or
@@ -116,5 +116,5 @@
 	 */
 	bool priv =
-	    ((cap_get(TASK) & CAP_MEM_MANAGER) == CAP_MEM_MANAGER);
+	    ((perm_get(TASK) & PERM_MEM_MANAGER) == PERM_MEM_MANAGER);
 	
 	mem_backend_data_t backend_data;
@@ -260,5 +260,5 @@
  * @param size   Size of the enabled I/O space.
  *
- * @return 0 on success, EPERM if the caller lacks capabilities to use this
+ * @return 0 on success, EPERM if the caller lacks permissions to use this
  *           syscall, ENOENT if there is no task matching the specified ID.
  *
@@ -269,6 +269,6 @@
 	 * Make sure the caller is authorised to make this syscall.
 	 */
-	cap_t caps = cap_get(TASK);
-	if (!(caps & CAP_IO_MANAGER))
+	perm_t perms = perm_get(TASK);
+	if (!(perms & PERM_IO_MANAGER))
 		return EPERM;
 	
@@ -301,5 +301,5 @@
  * @param size   Size of the enabled I/O space.
  *
- * @return 0 on success, EPERM if the caller lacks capabilities to use this
+ * @return 0 on success, EPERM if the caller lacks permissions to use this
  *           syscall, ENOENT if there is no task matching the specified ID.
  *
@@ -310,6 +310,6 @@
 	 * Make sure the caller is authorised to make this syscall.
 	 */
-	cap_t caps = cap_get(TASK);
-	if (!(caps & CAP_IO_MANAGER))
+	perm_t perms = perm_get(TASK);
+	if (!(perms & PERM_IO_MANAGER))
 		return EPERM;