Index: uspace/lib/c/generic/adt/char_map.c
===================================================================
--- uspace/lib/c/generic/adt/char_map.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/c/generic/adt/char_map.c	(revision 0b4a67a31961a80515a7b28d5b2e27fbb8f7249d)
@@ -60,7 +60,7 @@
  * @param[in] value	The integral value to be stored for the key character
  *			string.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EEXIST if the key character string is already used.
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EEXIST if the key character string is already used.
  */
 static int
@@ -107,6 +107,6 @@
  *
  * @param[in] map	The character string to integer map.
- * @returns		TRUE if the map is valid.
- * @returns		FALSE otherwise.
+ * @return		TRUE if the map is valid.
+ * @return		FALSE otherwise.
  */
 static int char_map_is_valid(const char_map_t *map)
@@ -127,13 +127,13 @@
  * @param[in] value	The integral value to be stored for the key character
  *			string.
- * @returns		EOK on success.
- * @returns		EINVAL if the map is not valid.
- * @returns		EINVAL if the identifier parameter is NULL.
- * @returns		EINVAL if the length parameter zero (0) and the
+ * @return		EOK on success.
+ * @return		EINVAL if the map is not valid.
+ * @return		EINVAL if the identifier parameter is NULL.
+ * @return		EINVAL if the length parameter zero (0) and the
  *			identifier parameter is an empty character string (the
  *			first character is the terminating zero ('\0')
  *			character.
- * @returns		EEXIST if the key character string is already used.
- * @returns		Other error codes as defined for the
+ * @return		EEXIST if the key character string is already used.
+ * @return		Other error codes as defined for the
  *			char_map_add_item() function.
  */
@@ -196,7 +196,7 @@
  *			zero (0) which means that the string is processed until
  *			the terminating zero ('\0') character is found.
- * @returns		The node holding the integral value assigned to the key
+ * @return		The node holding the integral value assigned to the key
  *			character string.
- * @returns		NULL if the key is not assigned a node.
+ * @return		NULL if the key is not assigned a node.
  */
 static char_map_t *
@@ -239,6 +239,6 @@
  *			zero (0) which means that the string is processed until
  *			the terminating zero ('\0') character is found.
- * @returns		The integral value assigned to the key character string.
- * @returns		CHAR_MAP_NULL if the key is not assigned a value.
+ * @return		The integral value assigned to the key character string.
+ * @return		CHAR_MAP_NULL if the key is not assigned a value.
  */
 int char_map_exclude(char_map_t *map, const char *identifier, size_t length)
@@ -267,6 +267,6 @@
  *			zero (0) which means that the string is processed until
  *			the terminating zero ('\0') character is found.
- *  @returns		The integral value assigned to the key character string.
- *  @returns		CHAR_MAP_NULL if the key is not assigned a value.
+ *  @return		The integral value assigned to the key character string.
+ *  @return		CHAR_MAP_NULL if the key is not assigned a value.
  */
 int char_map_find(const char_map_t *map, const char *identifier, size_t length)
@@ -281,7 +281,7 @@
  *
  *  @param[in,out] map	The character string to integer map.
- *  @returns		EOK on success.
- *  @returns		EINVAL if the map parameter is NULL.
- *  @returns		ENOMEM if there is not enough memory left.
+ *  @return		EOK on success.
+ *  @return		EINVAL if the map parameter is NULL.
+ *  @return		ENOMEM if there is not enough memory left.
  */
 int char_map_initialize(char_map_t *map)
@@ -319,12 +319,12 @@
  *  @param[in] value	The integral value to be stored for the key character
  *			string.
- *  @returns		EOK on success.
- *  @returns		EINVAL if the map is not valid.
- *  @returns		EINVAL if the identifier parameter is NULL.
- *  @returns		EINVAL if the length parameter zero (0) and the
+ *  @return		EOK on success.
+ *  @return		EINVAL if the map is not valid.
+ *  @return		EINVAL if the identifier parameter is NULL.
+ *  @return		EINVAL if the length parameter zero (0) and the
  *			identifier parameter is an empty character string (the
  *			first character is the terminating zero ('\0) character.
- *  @returns		EEXIST if the key character string is already used.
- *  @returns		Other error codes as defined for the char_map_add_item()
+ *  @return		EEXIST if the key character string is already used.
+ *  @return		Other error codes as defined for the char_map_add_item()
  *			function.
  */
Index: uspace/lib/c/generic/adt/dynamic_fifo.c
===================================================================
--- uspace/lib/c/generic/adt/dynamic_fifo.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/c/generic/adt/dynamic_fifo.c	(revision 0b4a67a31961a80515a7b28d5b2e27fbb8f7249d)
@@ -56,6 +56,6 @@
  *
  * @param[in] fifo	The dynamic queue.
- * @returns		TRUE if the queue is valid.
- * @returns		FALSE otherwise.
+ * @return		TRUE if the queue is valid.
+ * @return		FALSE otherwise.
  */
 static int dyn_fifo_is_valid(dyn_fifo_t *fifo)
@@ -68,8 +68,8 @@
  * @param[in,out] fifo	The dynamic queue.
  * @param[in] size	The initial queue size.
- * @returns		EOK on success.
- * @returns		EINVAL if the queue is not valid.
- * @returns		EBADMEM if the fifo parameter is NULL.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the queue is not valid.
+ * @return		EBADMEM if the fifo parameter is NULL.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int dyn_fifo_initialize(dyn_fifo_t *fifo, int size)
@@ -100,7 +100,7 @@
  *			this limit. May be zero or negative to indicate no
  *			limit.
- * @returns		EOK on success.
- * @returns		EINVAL if the queue is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the queue is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int dyn_fifo_push(dyn_fifo_t *fifo, int value, int max_size)
@@ -150,7 +150,7 @@
  *
  * @param[in,out] fifo	The dynamic queue.
- * @returns		Value of the first item in the queue.
- * @returns		EINVAL if the queue is not valid.
- * @returns		ENOENT if the queue is empty.
+ * @return		Value of the first item in the queue.
+ * @return		EINVAL if the queue is not valid.
+ * @return		ENOENT if the queue is empty.
  */
 int dyn_fifo_pop(dyn_fifo_t *fifo)
@@ -172,7 +172,7 @@
  *
  * @param[in,out] fifo	The dynamic queue.
- * @returnsi		Value of the first item in the queue.
- * @returns		EINVAL if the queue is not valid.
- * @returns		ENOENT if the queue is empty.
+ * @return		Value of the first item in the queue.
+ * @return		EINVAL if the queue is not valid.
+ * @return		ENOENT if the queue is empty.
  */
 int dyn_fifo_value(dyn_fifo_t *fifo)
@@ -190,6 +190,6 @@
  *
  * @param[in,out] fifo	The dynamic queue.
- * @returns		EOK on success.
- * @returns		EINVAL if the queue is not valid.
+ * @return		EOK on success.
+ * @return		EINVAL if the queue is not valid.
  */
 int dyn_fifo_destroy(dyn_fifo_t *fifo)
Index: uspace/lib/c/generic/adt/measured_strings.c
===================================================================
--- uspace/lib/c/generic/adt/measured_strings.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/c/generic/adt/measured_strings.c	(revision 0b4a67a31961a80515a7b28d5b2e27fbb8f7249d)
@@ -55,6 +55,6 @@
  *			appended with the terminating zero ('\0') character
  *			otherwise.
- * @returns		The new bundled character string with measured length.
- * @returns		NULL if there is not enough memory left.
+ * @return		The new bundled character string with measured length.
+ * @return		NULL if there is not enough memory left.
  */
 measured_string_t *
@@ -84,7 +84,7 @@
  *
  * @param[in] source	The source measured string to be copied.
- * @returns		The copy of the given measured string.
- * @returns		NULL if the source parameter is NULL.
- * @returns		NULL if there is not enough memory left.
+ * @return		The copy of the given measured string.
+ * @return		NULL if the source parameter is NULL.
+ * @return		NULL if there is not enough memory left.
  */
 measured_string_t *measured_string_copy(measured_string_t *source)
@@ -120,12 +120,12 @@
  *			actual character strings.
  *  @param[in] count	The size of the measured strings array.
- *  @returns		EOK on success.
- *  @returns		EINVAL if the strings or data parameter is NULL.
- *  @returns		EINVAL if the count parameter is zero (0).
- *  @returns		EINVAL if the sent array differs in size.
- *  @returns		EINVAL if there is inconsistency in sent measured
+ *  @return		EOK on success.
+ *  @return		EINVAL if the strings or data parameter is NULL.
+ *  @return		EINVAL if the count parameter is zero (0).
+ *  @return		EINVAL if the sent array differs in size.
+ *  @return		EINVAL if there is inconsistency in sent measured
  *			strings' lengths (should not occur).
- *  @returns		ENOMEM if there is not enough memory left.
- *  @returns		Other error codes as defined for the
+ *  @return		ENOMEM if there is not enough memory left.
+ *  @return		Other error codes as defined for the
  *			async_data_write_finalize() function.
  */
@@ -209,6 +209,6 @@
  * @param[in] strings	The measured strings array to be processed.
  * @param[in] count	The measured strings array size.
- * @returns		The computed sizes array.
- * @returns		NULL if there is not enough memory left.
+ * @return		The computed sizes array.
+ * @return		NULL if there is not enough memory left.
  */
 static size_t *prepare_lengths(const measured_string_t *strings, size_t count)
@@ -238,12 +238,12 @@
  * @param[in] strings	The measured strings array to be transferred.
  * @param[in] count	The measured strings array size.
- * @returns		EOK on success.
- * @returns		EINVAL if the strings parameter is NULL.
- * @returns		EINVAL if the count parameter is zero (0).
- * @returns		EINVAL if the calling module does not accept the given
+ * @return		EOK on success.
+ * @return		EINVAL if the strings parameter is NULL.
+ * @return		EINVAL if the count parameter is zero (0).
+ * @return		EINVAL if the calling module does not accept the given
  *			array size.
- * @returns		EINVAL if there is inconsistency in sent measured
+ * @return		EINVAL if there is inconsistency in sent measured
  *			strings' lengths (should not occur).
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			async_data_read_finalize() function.
  */
@@ -302,10 +302,10 @@
  *			actual character strings.
  * @param[in] count	The size of the measured strings array.
- * @returns		EOK on success.
- * @returns		EINVAL if the strings or data parameter is NULL.
- * @returns		EINVAL if the phone or count parameter is not positive.
- * @returns		EINVAL if the sent array differs in size.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EINVAL if the strings or data parameter is NULL.
+ * @return		EINVAL if the phone or count parameter is not positive.
+ * @return		EINVAL if the sent array differs in size.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			async_data_read_start() function.
  */
@@ -378,8 +378,8 @@
  * @param[in] strings	The measured strings array to be transferred.
  * @param[in] count	The measured strings array size.
- * @returns		EOK on success.
- * @returns		EINVAL if the strings parameter is NULL.
- * @returns		EINVAL if the phone or count parameter is not positive.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EINVAL if the strings parameter is NULL.
+ * @return		EINVAL if the phone or count parameter is not positive.
+ * @return		Other error codes as defined for the
  *			async_data_write_start() function.
  */
