Index: uspace/lib/net/tl/icmp_client.c
===================================================================
--- uspace/lib/net/tl/icmp_client.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/tl/icmp_client.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -57,6 +57,6 @@
  * @param[out] pointer	The ICMP header pointer.
  * @param[out] mtu	The ICMP header MTU.
- * @returns		The ICMP header length.
- * @returns		Zero if the packet contains no data.
+ * @return		The ICMP header length.
+ * @return		Zero if the packet contains no data.
  */
 int
@@ -92,5 +92,5 @@
  *
  * @param[in] packet	The packet.
- * @returns		The ICMP header length in bytes.
+ * @return		The ICMP header length in bytes.
  */
 size_t icmp_client_header_length(packet_t packet)
Index: uspace/lib/net/tl/icmp_remote.c
===================================================================
--- uspace/lib/net/tl/icmp_remote.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/tl/icmp_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -57,7 +57,7 @@
  * @param[in] mtu	The error MTU value.
  * @param[in] packet	The original packet.
- * @returns		EOK on success.
- * @returns		EPERM if the ICMP error notifications are disabled.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EPERM if the ICMP error notifications are disabled.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -78,7 +78,7 @@
  * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
  * @param[in] packet	The original packet.
- * @returns		EOK on success.
- * @returns		EPERM if the ICMP error notifications are disabled.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EPERM if the ICMP error notifications are disabled.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int icmp_source_quench_msg(int icmp_phone, packet_t packet)
@@ -98,7 +98,7 @@
  * @param[in] code	The error specific code.
  * @param[in] packet	The original packet.
- * @returns		EOK on success.
- * @returns		EPERM if the ICMP error notifications are disabled.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EPERM if the ICMP error notifications are disabled.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet)
@@ -119,7 +119,7 @@
  * @param[in] pointer	The problematic parameter offset.
  * @param[in] packet	The original packet.
- * @returns		EOK on success.
- * @returns		EPERM if the ICMP error notifications are disabled.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EPERM if the ICMP error notifications are disabled.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code,
Index: uspace/lib/net/tl/socket_core.c
===================================================================
--- uspace/lib/net/tl/socket_core.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/tl/socket_core.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -156,6 +156,6 @@
  * @param[in] key	The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int
@@ -194,7 +194,7 @@
  * @param[in] socket	The socket to be added.
  * @param[in] port	The port number to be bound to.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			 socket_ports_add() function.
  */
@@ -248,11 +248,11 @@
  * @param[in] free_ports_end The maximum free port.
  * @param[in] last_used_port The last used free port.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket was not found.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		EADDRINUSE if the port is already in use.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket was not found.
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		EADDRINUSE if the port is already in use.
+ * @return		Other error codes as defined for the
  *			socket_bind_free_port() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			socket_bind_insert() function.
  */
@@ -322,7 +322,7 @@
  * @param[in] free_ports_end The maximum free port.
  * @param[in] last_used_port The last used free port.
- * @returns		EOK on success.
- * @returns		ENOTCONN if no free port was found.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOTCONN if no free port was found.
+ * @return		Other error codes as defined for the
  *			socket_bind_insert() function.
  */
@@ -367,6 +367,6 @@
  *			requested. A negative identifier is requested if set to
  *			false.
- * @returns		The new socket identifier.
- * @returns		ELIMIT if there is no socket identifier available.
+ * @return		The new socket identifier.
+ * @return		ELIMIT if there is no socket identifier available.
  */
 static int socket_generate_new_id(socket_cores_t *local_sockets, int positive)
@@ -410,7 +410,7 @@
  *			chosen if set to zero or negative. A negative identifier
  *			is chosen if set to negative.
- * @returns		EOK on success.
- * @returns		EINVAL if the socket_id parameter is NULL.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the socket_id parameter is NULL.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -482,6 +482,6 @@
  * @param[in,out] global_sockets The global sockets to be updated.
  * @param[in] socket_release The client release callback function.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
  */
 int
@@ -516,8 +516,8 @@
  * @param[in] packet	The packet to be transfered.
  * @param[out] length	The total data length.
- * @returns		EOK on success.
- * @returns		EBADMEM if the length parameter is NULL.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the data_reply()
+ * @return		EOK on success.
+ * @return		EBADMEM if the length parameter is NULL.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the data_reply()
  *			function.
  */
@@ -598,6 +598,6 @@
  * @param[in] key	The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns		The found socket.
- * @returns		NULL if no socket was found.
+ * @return		The found socket.
+ * @return		NULL if no socket was found.
  */
 socket_core_t *
@@ -673,7 +673,7 @@
  * @param[in] key	The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns		EOK on success.
- * @returns		ENOENT if the port is not already used.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOENT if the port is not already used.
+ * @return		Other error codes as defined for the
  *			socket_port_add_core() function.
  */
Index: uspace/lib/net/tl/tl_common.c
===================================================================
--- uspace/lib/net/tl/tl_common.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/tl/tl_common.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -64,8 +64,8 @@
  * @param[in] addrlen	The address length.
  * @param[out] port	The set port.
- * @returns		EOK on success.
- * @returns		EINVAL if the address length does not match the address
+ * @return		EOK on success.
+ * @return		EINVAL if the address length does not match the address
  *			family.
- * @returns		EAFNOSUPPORT if the address family is not supported.
+ * @return		EAFNOSUPPORT if the address family is not supported.
  */
 int
@@ -158,5 +158,5 @@
  * @param[in] device_id	The device identifier.
  * @param[in] content	The new maximum content size.
- * @returns		EOK on success.
+ * @return		EOK on success.
  * @return		ENOENT if the packet dimension is not cached.
  */
@@ -196,8 +196,8 @@
  * @param[in] addrlen	The address length.
  * @param[in] port	The port to be set.
- * @returns		EOK on success.
- * @returns		EINVAL if the address length does not match the address
+ * @return		EOK on success.
+ * @return		EINVAL if the address length does not match the address
  *			family.
- * @returns		EAFNOSUPPORT if the address family is not supported.
+ * @return		EAFNOSUPPORT if the address family is not supported.
  */
 int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port)
@@ -244,6 +244,6 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		ENOENT if no packet may be sent.
+ * @return		EOK on success.
+ * @return		ENOENT if no packet may be sent.
  */
 int
@@ -280,8 +280,8 @@
  * @param[in] addr	The destination address.
  * @param[in] addrlen	The address length.
- * @returns		Number of bytes received.
- * @returns		EINVAL if the client does not send data.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		Number of bytes received.
+ * @return		EINVAL if the client does not send data.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			async_data_read_finalize() function.
  */