Index: uspace/drv/char/ns8250/ns8250.c
===================================================================
--- uspace/drv/char/ns8250/ns8250.c	(revision 24abb85d299db39cc03f429adc41bb1ed4f23e23)
+++ uspace/drv/char/ns8250/ns8250.c	(revision e68765ee99cd285c57aa4a30d7ac3dfd1598259c)
@@ -160,5 +160,5 @@
 	/** The irq assigned to this device. */
 	int irq;
-	/** IRQ capability */
+	/** IRQ capability handle */
 	int irq_cap;
 	/** The base i/o address of the devices registers. */
Index: uspace/drv/nic/e1k/e1k.c
===================================================================
--- uspace/drv/nic/e1k/e1k.c	(revision 24abb85d299db39cc03f429adc41bb1ed4f23e23)
+++ uspace/drv/nic/e1k/e1k.c	(revision e68765ee99cd285c57aa4a30d7ac3dfd1598259c)
@@ -1253,5 +1253,5 @@
  * @param nic Driver data
  *
- * @return IRQ capability if the handler was registered
+ * @return IRQ capability handle if the handler was registered
  * @return Negative error code otherwise
  *
Index: uspace/drv/nic/rtl8139/driver.c
===================================================================
--- uspace/drv/nic/rtl8139/driver.c	(revision 24abb85d299db39cc03f429adc41bb1ed4f23e23)
+++ uspace/drv/nic/rtl8139/driver.c	(revision e68765ee99cd285c57aa4a30d7ac3dfd1598259c)
@@ -881,5 +881,5 @@
  *  @param nic_data  The driver data
  *
- *  @return IRQ capability if the handler was registered.
+ *  @return IRQ capability handle if the handler was registered.
  *  @return Negative error code otherwise.
  */
Index: uspace/lib/c/generic/async.c
===================================================================
--- uspace/lib/c/generic/async.c	(revision 24abb85d299db39cc03f429adc41bb1ed4f23e23)
+++ uspace/lib/c/generic/async.c	(revision e68765ee99cd285c57aa4a30d7ac3dfd1598259c)
@@ -1026,5 +1026,5 @@
  * @param ucode   Top-half pseudocode handler.
  *
- * @return IRQ capability on success.
+ * @return IRQ capability handle on success.
  * @return Negative error code.
  *
@@ -1056,5 +1056,5 @@
 /** Unsubscribe from IRQ notification.
  *
- * @param cap     IRQ capability. 
+ * @param cap     IRQ capability handle. 
  *
  * @return Zero on success or a negative error code.
Index: uspace/lib/c/generic/irq.c
===================================================================
--- uspace/lib/c/generic/irq.c	(revision 24abb85d299db39cc03f429adc41bb1ed4f23e23)
+++ uspace/lib/c/generic/irq.c	(revision e68765ee99cd285c57aa4a30d7ac3dfd1598259c)
@@ -58,5 +58,5 @@
  * @param ucode  Top-half pseudocode handler.
  *
- * @return IRQ capability returned by the kernel.
+ * @return IRQ capability handle returned by the kernel.
  * @return Error code returned by the kernel.
  *
@@ -72,5 +72,5 @@
 /** Unsubscribe from IRQ notification.
  *
- * @param cap   IRQ capability.
+ * @param cap   IRQ capability handle.
  *
  * @return Value returned by the kernel.
Index: uspace/lib/usbhost/src/ddf_helpers.c
===================================================================
--- uspace/lib/usbhost/src/ddf_helpers.c	(revision 24abb85d299db39cc03f429adc41bb1ed4f23e23)
+++ uspace/lib/usbhost/src/ddf_helpers.c	(revision e68765ee99cd285c57aa4a30d7ac3dfd1598259c)
@@ -748,5 +748,5 @@
  * @param[in] gen_irq_code IRQ code generator.
  *
- * @return IRQ kernel object capability on success.
+ * @return IRQ capability handle on success.
  * @return Negative error code.
  */