Index: uspace/lib/c/generic/ddi.c
===================================================================
--- uspace/lib/c/generic/ddi.c	(revision f2460a50f76f92f3a70ead8969f2bffd83b3a7a4)
+++ uspace/lib/c/generic/ddi.c	(revision 134e3f1a80ec0d352640b930a5d562bc0793f61b)
@@ -63,5 +63,5 @@
 /** Map a piece of physical memory to task.
  *
- * Caller of this function must have the CAP_MEM_MANAGER capability.
+ * Caller of this function must have the PERM_MEM_MANAGER permission.
  *
  * @param phys  Physical address of the starting frame.
@@ -74,5 +74,5 @@
  *
  * @return EOK on success.
- * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability.
+ * @return EPERM if the caller lacks the PERM_MEM_MANAGER permission.
  * @return ENOMEM if there was some problem in creating
  *         the address space area.
@@ -87,10 +87,10 @@
 /** Unmap a piece of physical memory to task.
  *
- * Caller of this function must have the CAP_MEM_MANAGER capability.
+ * Caller of this function must have the PERM_MEM_MANAGER permission.
  *
  * @param virt Virtual address from the phys-mapped region.
  *
  * @return EOK on success.
- * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability.
+ * @return EPERM if the caller lacks the PERM_MEM_MANAGER permission.
  *
  */
@@ -106,5 +106,5 @@
  * make it safe for DMA transferts.
  *
- * Caller of this function must have the CAP_MEM_MANAGER capability.
+ * Caller of this function must have the PERM_MEM_MANAGER permission.
  *
  * @param virt      Virtual address of the memory to be locked.
@@ -115,5 +115,5 @@
  *
  * @return EOK on success.
- * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability.
+ * @return EPERM if the caller lacks the PERM_MEM_MANAGER permission.
  * @return ENOMEM if there was some problem in creating
  *         the address space area.
@@ -130,5 +130,5 @@
 /** Map a piece of physical memory suitable for DMA transfers.
  *
- * Caller of this function must have the CAP_MEM_MANAGER capability.
+ * Caller of this function must have the PERM_MEM_MANAGER permission.
  *
  * @param size       Number of bytes to map.
@@ -143,5 +143,5 @@
  *
  * @return EOK on success.
- * @return EPERM if the caller lacks the CAP_MEM_MANAGER capability.
+ * @return EPERM if the caller lacks the PERM_MEM_MANAGER permission.
  * @return ENOMEM if there was some problem in creating
  *         the address space area.
@@ -171,5 +171,5 @@
 /** Enable I/O space range to task.
  *
- * Caller of this function must have the IO_MEM_MANAGER capability.
+ * Caller of this function must have the PERM_IO_MANAGER permission.
  *
  * @param id     Task ID.
@@ -178,5 +178,5 @@
  *
  * @return EOK on success
- * @return EPERM if the caller lacks the CAP_IO_MANAGER capability
+ * @return EPERM if the caller lacks the PERM_IO_MANAGER permission
  * @return ENOENT if there is no task with specified ID
  * @return ENOMEM if there was some problem in allocating memory.
@@ -196,5 +196,5 @@
 /** Disable I/O space range to task.
  *
- * Caller of this function must have the IO_MEM_MANAGER capability.
+ * Caller of this function must have the PERM_IO_MANAGER permission.
  *
  * @param id     Task ID.
@@ -203,5 +203,5 @@
  *
  * @return EOK on success
- * @return EPERM if the caller lacks the CAP_IO_MANAGER capability
+ * @return EPERM if the caller lacks the PERM_IO_MANAGER permission
  * @return ENOENT if there is no task with specified ID
  *