Index: kernel/arch/amd64/include/mm/as.h
===================================================================
--- kernel/arch/amd64/include/mm/as.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ kernel/arch/amd64/include/mm/as.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -36,11 +36,14 @@
 #define KERN_amd64_AS_H_
 
+#define ADDRESS_SPACE_HOLE_START	0x0000800000000000ULL
+#define ADDRESS_SPACE_HOLE_END		0xffff7fffffffffffULL
+
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH  (unsigned long) 0xffff800000000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH    (unsigned long) 0xffffffffffffffff
+#define KERNEL_ADDRESS_SPACE_START_ARCH	0xffff800000000000ULL
+#define KERNEL_ADDRESS_SPACE_END_ARCH	0xffffffffffffffffULL
 
-#define USER_ADDRESS_SPACE_START_ARCH    (unsigned long) 0x0000000000000000
-#define USER_ADDRESS_SPACE_END_ARCH      (unsigned long) 0x00007fffffffffff
+#define USER_ADDRESS_SPACE_START_ARCH	0x0000000000000000ULL
+#define USER_ADDRESS_SPACE_END_ARCH	0x00007fffffffffffULL
 
 #define USTACK_ADDRESS_ARCH  (USER_ADDRESS_SPACE_END_ARCH - (PAGE_SIZE - 1))
Index: kernel/generic/include/typedefs.h
===================================================================
--- kernel/generic/include/typedefs.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ kernel/generic/include/typedefs.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -40,5 +40,5 @@
 #include <arch/types.h>
 
-#define NULL  0
+#define NULL  0UL
 
 #define false  0
Index: kernel/generic/src/syscall/copy.c
===================================================================
--- kernel/generic/src/syscall/copy.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ kernel/generic/src/syscall/copy.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -68,5 +68,6 @@
 	if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
 		if (overlaps((uintptr_t) uspace_src, size,
-			KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) {
+			KERNEL_ADDRESS_SPACE_START,
+			KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START)) {
 			/*
 			 * The userspace source block conflicts with kernel address space.
@@ -75,4 +76,13 @@
 		}
 	}
+
+#ifdef ADDRESS_SPACE_HOLE_START
+	/*
+	 * Check whether the address is outside the address space hole.
+	 */
+	if (overlaps((uintptr_t) uspace_src, size, ADDRESS_SPACE_HOLE_START,
+	    ADDRESS_SPACE_HOLE_END - ADDRESS_SPACE_HOLE_START))
+		return EPERM;
+#endif
 	
 	ipl = interrupts_disable();
@@ -109,5 +119,6 @@
 	if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
 		if (overlaps((uintptr_t) uspace_dst, size,
-			KERNEL_ADDRESS_SPACE_START, KERNEL_ADDRESS_SPACE_END-KERNEL_ADDRESS_SPACE_START)) {
+			KERNEL_ADDRESS_SPACE_START,
+			KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START)) {
 			/*
 			 * The userspace destination block conflicts with kernel address space.
@@ -116,4 +127,13 @@
 		}
 	}
+
+#ifdef ADDRESS_SPACE_HOLE_START
+	/*
+	 * Check whether the address is outside the address space hole.
+	 */
+	if (overlaps((uintptr_t) uspace_dst, size, ADDRESS_SPACE_HOLE_START,
+	    ADDRESS_SPACE_HOLE_END - ADDRESS_SPACE_HOLE_START))
+		return EPERM;
+#endif
 	
 	ipl = interrupts_disable();
Index: kernel/generic/src/udebug/udebug_ops.c
===================================================================
--- kernel/generic/src/udebug/udebug_ops.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ kernel/generic/src/udebug/udebug_ops.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -428,5 +428,5 @@
  * @param data_size Place to store size of the data.
  *
- * @returns EOK.
+ * @return EOK.
  *
  */
Index: uspace/Makefile
===================================================================
--- uspace/Makefile	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/Makefile	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -50,5 +50,4 @@
 	app/trace \
 	app/top \
-	app/netstart \
 	app/netecho \
 	app/nettest1 \
Index: uspace/app/bdsh/cmds/modules/bdd/bdd.c
===================================================================
--- uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/app/bdsh/cmds/modules/bdd/bdd.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -68,5 +68,5 @@
 	unsigned int argc;
 	unsigned int i, j;
-	dev_handle_t handle;
+	devmap_handle_t handle;
 	uint8_t *blk;
 	size_t size, bytes, rows;
Index: uspace/app/getterm/getterm.c
===================================================================
--- uspace/app/getterm/getterm.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/app/getterm/getterm.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -84,5 +84,6 @@
 	bool print_wmsg;
 
-	++argv; --argc;
+	argv++;
+	argc--;
 	if (argc < 1) {
 		usage();
@@ -92,5 +93,6 @@
 	if (str_cmp(*argv, "-w") == 0) {
 		print_wmsg = true;
-		++argv; --argc;
+		argv++;
+		argc--;
 	} else {
 		print_wmsg = false;
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/app/init/init.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -185,5 +185,5 @@
 	
 	/* Wait for the input device to be ready */
-	dev_handle_t handle;
+	devmap_handle_t handle;
 	rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
 	if (rc != EOK) {
@@ -210,5 +210,5 @@
 	
 	/* Wait for the terminal device to be ready */
-	dev_handle_t handle;
+	devmap_handle_t handle;
 	rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
 	if (rc != EOK) {
Index: uspace/app/mkfat/mkfat.c
===================================================================
--- uspace/app/mkfat/mkfat.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/app/mkfat/mkfat.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -85,5 +85,5 @@
     struct fat_params *par);
 static int fat_blocks_write(struct fat_params const *par,
-    dev_handle_t handle);
+    devmap_handle_t handle);
 static void fat_bootsec_create(struct fat_params const *par, struct fat_bs *bs);
 
@@ -95,5 +95,5 @@
 	int rc;
 	char *dev_path;
-	dev_handle_t handle;
+	devmap_handle_t handle;
 	size_t block_size;
 	char *endptr;
@@ -234,5 +234,5 @@
 
 /** Create file system with the given parameters. */
-static int fat_blocks_write(struct fat_params const *par, dev_handle_t handle)
+static int fat_blocks_write(struct fat_params const *par, devmap_handle_t handle)
 {
 	aoff64_t addr;
Index: uspace/app/netecho/print_error.h
===================================================================
--- uspace/app/netecho/print_error.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/app/netecho/print_error.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -43,5 +43,5 @@
  *
  * @param[in] error_code The error code.
- * @returns A value indicating whether the error code may be an ICMP error code.
+ * @return A value indicating whether the error code may be an ICMP error code.
  */
 #define IS_ICMP_ERROR(error_code)	((error_code) > 0)
@@ -50,5 +50,5 @@
  *
  * @param[in] error_code The error code.
- * @returns A value indicating whether the error code may be a socket error code.
+ * @return A value indicating whether the error code may be a socket error code.
  */
 #define IS_SOCKET_ERROR(error_code)	((error_code) < 0)
Index: pace/app/netstart/Makefile
===================================================================
--- uspace/app/netstart/Makefile	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ 	(revision )
@@ -1,39 +1,0 @@
-#
-# Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-# - The name of the author may not be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-USPACE_PREFIX = ../..
-LIBS = 
-EXTRA_CFLAGS = 
-
-BINARY = netstart
-
-SOURCES = \
-	netstart.c
-
-include $(USPACE_PREFIX)/Makefile.common
Index: pace/app/netstart/netstart.c
===================================================================
--- uspace/app/netstart/netstart.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ 	(revision )
@@ -1,91 +1,0 @@
-/*
- * Copyright (c) 2009 Lukas Mejdrech
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup net
- * @{
- */
-
-/** @file
- * Start the networking subsystem.
- */
-
-#define NAME  "netstart"
-
-#include <async.h>
-#include <stdio.h>
-#include <task.h>
-#include <str_error.h>
-#include <ipc/ipc.h>
-#include <ipc/services.h>
-#include <ipc/net_net.h>
-
-#include <net/modules.h>
-
-/** Start a module.
- *
- * @param[in] desc	The module description
- * @param[in] path	The module absolute path.
- * @returns		True on succesful spanwning.
- * @returns		False on failure
- */
-static bool spawn(const char *desc, const char *path)
-{
-	int rc;
-
-	printf("%s: Spawning %s (%s)\n", NAME, desc, path);
-	rc = task_spawnl(NULL, path, path, NULL);
-	if (rc != EOK) {
-		fprintf(stderr, "%s: Error spawning %s (%s)\n", NAME, path,
-		    str_error(rc));
-		return false;
-	}
-	
-	return true;
-}
-
-int main(int argc, char *argv[])
-{
-	int rc;
-	
-	if (!spawn("networking service", "/srv/net"))
-		return EINVAL;
-	
-	printf("%s: Initializing networking\n", NAME);
-	
-	int net_phone = connect_to_service(SERVICE_NETWORKING);
-	rc = ipc_call_sync_0_0(net_phone, NET_NET_STARTUP);
-	if (rc != EOK) {
-		fprintf(stderr, "%s: Startup error %d\n", NAME, rc);
-		return rc;
-	}
-	
-	return EOK;
-}
-
-/** @}
- */
Index: uspace/app/nettest1/nettest.c
===================================================================
--- uspace/app/nettest1/nettest.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/app/nettest1/nettest.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -49,6 +49,6 @@
  * @param[in] family The socket address family.
  * @param[in] type The socket type.
- * @returns EOK on success.
- * @returns Other error codes as defined for the socket() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the socket() function.
  */
 int sockets_create(int verbose, int *socket_ids, int sockets, int family, sock_type_t type)
@@ -80,6 +80,6 @@
  * @param[in] socket_ids A field of stored socket identifiers.
  * @param[in] sockets The number of sockets in the field. Should be at most the size of the field.
- * @returns EOK on success.
- * @returns Other error codes as defined for the closesocket() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the closesocket() function.
  */
 int sockets_close(int verbose, int *socket_ids, int sockets)
@@ -114,6 +114,6 @@
  * @param[in] address The destination host address to connect to.
  * @param[in] addrlen The length of the destination address in bytes.
- * @returns EOK on success.
- * @returns Other error codes as defined for the connect() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the connect() function.
  */
 int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen)
@@ -150,6 +150,6 @@
  * @param[in] size The data size in bytes.
  * @param[in] messages The number of datagrams per socket to be sent.
- * @returns EOK on success.
- * @returns Other error codes as defined for the sendto() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the sendto() function.
  */
 int sockets_sendto(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen, char *data, int size, int messages)
@@ -190,6 +190,6 @@
  * @param[in] size The maximum data size in bytes.
  * @param[in] messages The number of datagrams per socket to be received.
- * @returns EOK on success.
- * @returns Other error codes as defined for the recvfrom() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the recvfrom() function.
  */
 int sockets_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
@@ -232,6 +232,6 @@
  * @param[in] size The data size in bytes.
  * @param[in] messages The number of datagrams per socket to be received.
- * @returns EOK on success.
- * @returns Other error codes as defined for the recvfrom() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the recvfrom() function.
  */
 int sockets_sendto_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages)
Index: uspace/app/test_serial/test_serial.c
===================================================================
--- uspace/app/test_serial/test_serial.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/app/test_serial/test_serial.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -69,5 +69,5 @@
 	int res;
 	res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
-	device_handle_t handle;
+	devman_handle_t handle;
 	
 	res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,
Index: uspace/drv/ns8250/cyclic_buffer.h
===================================================================
--- uspace/drv/ns8250/cyclic_buffer.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/drv/ns8250/cyclic_buffer.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -45,5 +45,5 @@
 
 /*
- * @returns		False if the buffer is full.
+ * @return		False if the buffer is full.
  */
 static inline bool buf_push_back(cyclic_buffer_t *buf, uint8_t item)
Index: uspace/lib/block/libblock.c
===================================================================
--- uspace/lib/block/libblock.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/block/libblock.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -75,5 +75,5 @@
 typedef struct {
 	link_t link;
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 	int dev_phone;
 	fibril_mutex_t comm_area_lock;
@@ -91,5 +91,5 @@
 static int get_num_blocks(int dev_phone, aoff64_t *nblocks);
 
-static devcon_t *devcon_search(dev_handle_t dev_handle)
+static devcon_t *devcon_search(devmap_handle_t devmap_handle)
 {
 	link_t *cur;
@@ -98,5 +98,5 @@
 	for (cur = dcl_head.next; cur != &dcl_head; cur = cur->next) {
 		devcon_t *devcon = list_get_instance(cur, devcon_t, link);
-		if (devcon->dev_handle == dev_handle) {
+		if (devcon->devmap_handle == devmap_handle) {
 			fibril_mutex_unlock(&dcl_lock);
 			return devcon;
@@ -107,5 +107,5 @@
 }
 
-static int devcon_add(dev_handle_t dev_handle, int dev_phone, size_t bsize,
+static int devcon_add(devmap_handle_t devmap_handle, int dev_phone, size_t bsize,
     void *comm_area, size_t comm_size)
 {
@@ -121,5 +121,5 @@
 	
 	link_initialize(&devcon->link);
-	devcon->dev_handle = dev_handle;
+	devcon->devmap_handle = devmap_handle;
 	devcon->dev_phone = dev_phone;
 	fibril_mutex_initialize(&devcon->comm_area_lock);
@@ -134,5 +134,5 @@
 	for (cur = dcl_head.next; cur != &dcl_head; cur = cur->next) {
 		devcon_t *d = list_get_instance(cur, devcon_t, link);
-		if (d->dev_handle == dev_handle) {
+		if (d->devmap_handle == devmap_handle) {
 			fibril_mutex_unlock(&dcl_lock);
 			free(devcon);
@@ -152,5 +152,5 @@
 }
 
-int block_init(dev_handle_t dev_handle, size_t comm_size)
+int block_init(devmap_handle_t devmap_handle, size_t comm_size)
 {
 	int rc;
@@ -165,5 +165,5 @@
 	}
 
-	dev_phone = devmap_device_connect(dev_handle, IPC_FLAG_BLOCKING);
+	dev_phone = devmap_device_connect(devmap_handle, IPC_FLAG_BLOCKING);
 	if (dev_phone < 0) {
 		munmap(comm_area, comm_size);
@@ -185,5 +185,5 @@
 	}
 	
-	rc = devcon_add(dev_handle, dev_phone, bsize, comm_area, comm_size);
+	rc = devcon_add(devmap_handle, dev_phone, bsize, comm_area, comm_size);
 	if (rc != EOK) {
 		munmap(comm_area, comm_size);
@@ -195,11 +195,11 @@
 }
 
-void block_fini(dev_handle_t dev_handle)
-{
-	devcon_t *devcon = devcon_search(dev_handle);
+void block_fini(devmap_handle_t devmap_handle)
+{
+	devcon_t *devcon = devcon_search(devmap_handle);
 	assert(devcon);
 	
 	if (devcon->cache)
-		(void) block_cache_fini(dev_handle);
+		(void) block_cache_fini(devmap_handle);
 
 	devcon_remove(devcon);
@@ -214,10 +214,10 @@
 }
 
-int block_bb_read(dev_handle_t dev_handle, aoff64_t ba)
+int block_bb_read(devmap_handle_t devmap_handle, aoff64_t ba)
 {
 	void *bb_buf;
 	int rc;
 
-	devcon_t *devcon = devcon_search(dev_handle);
+	devcon_t *devcon = devcon_search(devmap_handle);
 	if (!devcon)
 		return ENOENT;
@@ -244,7 +244,7 @@
 }
 
-void *block_bb_get(dev_handle_t dev_handle)
-{
-	devcon_t *devcon = devcon_search(dev_handle);
+void *block_bb_get(devmap_handle_t devmap_handle)
+{
+	devcon_t *devcon = devcon_search(devmap_handle);
 	assert(devcon);
 	return devcon->bb_buf;
@@ -272,8 +272,8 @@
 };
 
-int block_cache_init(dev_handle_t dev_handle, size_t size, unsigned blocks,
+int block_cache_init(devmap_handle_t devmap_handle, size_t size, unsigned blocks,
     enum cache_mode mode)
 {
-	devcon_t *devcon = devcon_search(dev_handle);
+	devcon_t *devcon = devcon_search(devmap_handle);
 	cache_t *cache;
 	if (!devcon)
@@ -305,7 +305,7 @@
 }
 
-int block_cache_fini(dev_handle_t dev_handle)
-{
-	devcon_t *devcon = devcon_search(dev_handle);
+int block_cache_fini(devmap_handle_t devmap_handle)
+{
+	devcon_t *devcon = devcon_search(devmap_handle);
 	cache_t *cache;
 	int rc;
@@ -374,5 +374,5 @@
  * @param block			Pointer to where the function will store the
  * 				block pointer on success.
- * @param dev_handle		Device handle of the block device.
+ * @param devmap_handle		Device handle of the block device.
  * @param boff			Block offset.
  * @param flags			If BLOCK_FLAGS_NOREAD is specified, block_get()
@@ -382,5 +382,5 @@
  * @return			EOK on success or a negative error code.
  */
-int block_get(block_t **block, dev_handle_t dev_handle, aoff64_t boff, int flags)
+int block_get(block_t **block, devmap_handle_t devmap_handle, aoff64_t boff, int flags)
 {
 	devcon_t *devcon;
@@ -391,5 +391,5 @@
 	int rc;
 	
-	devcon = devcon_search(dev_handle);
+	devcon = devcon_search(devmap_handle);
 
 	assert(devcon);
@@ -500,5 +500,5 @@
 
 		block_initialize(b);
-		b->dev_handle = dev_handle;
+		b->devmap_handle = devmap_handle;
 		b->size = cache->lblock_size;
 		b->boff = boff;
@@ -549,5 +549,5 @@
 int block_put(block_t *block)
 {
-	devcon_t *devcon = devcon_search(block->dev_handle);
+	devcon_t *devcon = devcon_search(block->devmap_handle);
 	cache_t *cache;
 	unsigned blocks_cached;
@@ -645,5 +645,5 @@
 /** Read sequential data from a block device.
  *
- * @param dev_handle	Device handle of the block device.
+ * @param devmap_handle	Device handle of the block device.
  * @param bufpos	Pointer to the first unread valid offset within the
  * 			communication buffer.
@@ -657,5 +657,5 @@
  * @return		EOK on success or a negative return code on failure.
  */
-int block_seqread(dev_handle_t dev_handle, size_t *bufpos, size_t *buflen,
+int block_seqread(devmap_handle_t devmap_handle, size_t *bufpos, size_t *buflen,
     aoff64_t *pos, void *dst, size_t size)
 {
@@ -665,5 +665,5 @@
 	devcon_t *devcon;
 
-	devcon = devcon_search(dev_handle);
+	devcon = devcon_search(devmap_handle);
 	assert(devcon);
 	block_size = devcon->pblock_size;
@@ -711,5 +711,5 @@
 /** Read blocks directly from device (bypass cache).
  *
- * @param dev_handle	Device handle of the block device.
+ * @param devmap_handle	Device handle of the block device.
  * @param ba		Address of first block.
  * @param cnt		Number of blocks.
@@ -718,10 +718,10 @@
  * @return		EOK on success or negative error code on failure.
  */
-int block_read_direct(dev_handle_t dev_handle, aoff64_t ba, size_t cnt, void *buf)
+int block_read_direct(devmap_handle_t devmap_handle, aoff64_t ba, size_t cnt, void *buf)
 {
 	devcon_t *devcon;
 	int rc;
 
-	devcon = devcon_search(dev_handle);
+	devcon = devcon_search(devmap_handle);
 	assert(devcon);
 	
@@ -739,5 +739,5 @@
 /** Write blocks directly to device (bypass cache).
  *
- * @param dev_handle	Device handle of the block device.
+ * @param devmap_handle	Device handle of the block device.
  * @param ba		Address of first block.
  * @param cnt		Number of blocks.
@@ -746,5 +746,5 @@
  * @return		EOK on success or negative error code on failure.
  */
-int block_write_direct(dev_handle_t dev_handle, aoff64_t ba, size_t cnt,
+int block_write_direct(devmap_handle_t devmap_handle, aoff64_t ba, size_t cnt,
     const void *data)
 {
@@ -752,5 +752,5 @@
 	int rc;
 
-	devcon = devcon_search(dev_handle);
+	devcon = devcon_search(devmap_handle);
 	assert(devcon);
 	
@@ -767,14 +767,14 @@
 /** Get device block size.
  *
- * @param dev_handle	Device handle of the block device.
+ * @param devmap_handle	Device handle of the block device.
  * @param bsize		Output block size.
  *
  * @return		EOK on success or negative error code on failure.
  */
-int block_get_bsize(dev_handle_t dev_handle, size_t *bsize)
+int block_get_bsize(devmap_handle_t devmap_handle, size_t *bsize)
 {
 	devcon_t *devcon;
 
-	devcon = devcon_search(dev_handle);
+	devcon = devcon_search(devmap_handle);
 	assert(devcon);
 	
@@ -784,14 +784,14 @@
 /** Get number of blocks on device.
  *
- * @param dev_handle	Device handle of the block device.
+ * @param devmap_handle	Device handle of the block device.
  * @param nblocks	Output number of blocks.
  *
  * @return		EOK on success or negative error code on failure.
  */
-int block_get_nblocks(dev_handle_t dev_handle, aoff64_t *nblocks)
+int block_get_nblocks(devmap_handle_t devmap_handle, aoff64_t *nblocks)
 {
 	devcon_t *devcon;
 
-	devcon = devcon_search(dev_handle);
+	devcon = devcon_search(devmap_handle);
 	assert(devcon);
 	
@@ -818,5 +818,5 @@
 		printf("Error %d reading %d blocks starting at block %" PRIuOFF64
 		    " from device handle %d\n", rc, cnt, ba,
-		    devcon->dev_handle);
+		    devcon->devmap_handle);
 #ifndef NDEBUG
 		stacktrace_print();
@@ -844,5 +844,5 @@
 	if (rc != EOK) {
 		printf("Error %d writing %d blocks starting at block %" PRIuOFF64
-		    " to device handle %d\n", rc, cnt, ba, devcon->dev_handle);
+		    " to device handle %d\n", rc, cnt, ba, devcon->devmap_handle);
 #ifndef NDEBUG
 		stacktrace_print();
Index: uspace/lib/block/libblock.h
===================================================================
--- uspace/lib/block/libblock.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/block/libblock.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -72,5 +72,5 @@
 	fibril_rwlock_t contents_lock;
 	/** Handle of the device where the block resides. */
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 	/** Block offset on the block device. Counted in 'size'-byte blocks. */
 	aoff64_t boff;
@@ -93,23 +93,23 @@
 };
 
-extern int block_init(dev_handle_t, size_t);
-extern void block_fini(dev_handle_t);
+extern int block_init(devmap_handle_t, size_t);
+extern void block_fini(devmap_handle_t);
 
-extern int block_bb_read(dev_handle_t, aoff64_t);
-extern void *block_bb_get(dev_handle_t);
+extern int block_bb_read(devmap_handle_t, aoff64_t);
+extern void *block_bb_get(devmap_handle_t);
 
-extern int block_cache_init(dev_handle_t, size_t, unsigned, enum cache_mode);
-extern int block_cache_fini(dev_handle_t);
+extern int block_cache_init(devmap_handle_t, size_t, unsigned, enum cache_mode);
+extern int block_cache_fini(devmap_handle_t);
 
-extern int block_get(block_t **, dev_handle_t, aoff64_t, int);
+extern int block_get(block_t **, devmap_handle_t, aoff64_t, int);
 extern int block_put(block_t *);
 
-extern int block_seqread(dev_handle_t, size_t *, size_t *, aoff64_t *, void *,
+extern int block_seqread(devmap_handle_t, size_t *, size_t *, aoff64_t *, void *,
     size_t);
 
-extern int block_get_bsize(dev_handle_t, size_t *);
-extern int block_get_nblocks(dev_handle_t, aoff64_t *);
-extern int block_read_direct(dev_handle_t, aoff64_t, size_t, void *);
-extern int block_write_direct(dev_handle_t, aoff64_t, size_t, const void *);
+extern int block_get_bsize(devmap_handle_t, size_t *);
+extern int block_get_nblocks(devmap_handle_t, aoff64_t *);
+extern int block_read_direct(devmap_handle_t, aoff64_t, size_t, void *);
+extern int block_write_direct(devmap_handle_t, aoff64_t, size_t, const void *);
 
 #endif
Index: uspace/lib/c/generic/adt/char_map.c
===================================================================
--- uspace/lib/c/generic/adt/char_map.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/adt/char_map.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -60,17 +60,17 @@
  * @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
-char_map_add_item(char_map_ref map, const char *identifier, size_t length,
+char_map_add_item(char_map_t *map, const char *identifier, size_t length,
     const int value)
 {
 	if (map->next == (map->size - 1)) {
-		char_map_ref *tmp;
-
-		tmp = (char_map_ref *) realloc(map->items,
-		    sizeof(char_map_ref) * 2 * map->size);
+		char_map_t **tmp;
+
+		tmp = (char_map_t **) realloc(map->items,
+		    sizeof(char_map_t *) * 2 * map->size);
 		if (!tmp)
 			return ENOMEM;
@@ -80,5 +80,5 @@
 	}
 
-	map->items[map->next] = (char_map_ref) malloc(sizeof(char_map_t));
+	map->items[map->next] = (char_map_t *) malloc(sizeof(char_map_t));
 	if (!map->items[map->next])
 		return ENOMEM;
@@ -107,8 +107,8 @@
  *
  * @param[in] map	The character string to integer map.
- * @returns		TRUE if the map is valid.
- * @returns		FALSE otherwise.
- */
-static int char_map_is_valid(const char_map_ref map)
+ * @return		TRUE if the map is valid.
+ * @return		FALSE otherwise.
+ */
+static int char_map_is_valid(const char_map_t *map)
 {
 	return map && (map->magic == CHAR_MAP_MAGIC_VALUE);
@@ -127,17 +127,17 @@
  * @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.
  */
 int
-char_map_add(char_map_ref map, const char *identifier, size_t length,
+char_map_add(char_map_t *map, const char *identifier, size_t length,
     const int value)
 {
@@ -172,5 +172,5 @@
  * @param[in,out] map	The character string to integer map.
  */
-void char_map_destroy(char_map_ref map)
+void char_map_destroy(char_map_t *map)
 {
 	if (char_map_is_valid(map)) {
@@ -196,10 +196,10 @@
  *			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.
- */
-static char_map_ref
-char_map_find_node(const char_map_ref map, const char *identifier,
+ * @return		NULL if the key is not assigned a node.
+ */
+static char_map_t *
+char_map_find_node(const char_map_t *map, const char *identifier,
     size_t length)
 {
@@ -224,5 +224,5 @@
 	}
 
-	return map;
+	return (char_map_t *) map;
 }
 
@@ -239,10 +239,10 @@
  *			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.
- */
-int char_map_exclude(char_map_ref map, const char *identifier, size_t length)
-{
-	char_map_ref node;
+ * @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)
+{
+	char_map_t *node;
 
 	node = char_map_find_node(map, identifier, length);
@@ -267,10 +267,10 @@
  *			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.
- */
-int char_map_find(const char_map_ref map, const char *identifier, size_t length)
-{
-	char_map_ref node;
+ *  @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)
+{
+	char_map_t *node;
 
 	node = char_map_find_node(map, identifier, length);
@@ -281,9 +281,9 @@
  *
  *  @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.
- */
-int char_map_initialize(char_map_ref map)
+ *  @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)
 {
 	if (!map)
@@ -295,5 +295,5 @@
 	map->next = 0;
 
-	map->items = malloc(sizeof(char_map_ref) * map->size);
+	map->items = malloc(sizeof(char_map_t *) * map->size);
 	if (!map->items) {
 		map->magic = 0;
@@ -319,19 +319,19 @@
  *  @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.
  */
 int
-char_map_update(char_map_ref map, const char *identifier, const size_t length,
+char_map_update(char_map_t *map, const char *identifier, const size_t length,
     const int value)
 {
-	char_map_ref node;
+	char_map_t *node;
 
 	node = char_map_find_node(map, identifier, length);
Index: uspace/lib/c/generic/adt/dynamic_fifo.c
===================================================================
--- uspace/lib/c/generic/adt/dynamic_fifo.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/adt/dynamic_fifo.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -56,8 +56,8 @@
  *
  * @param[in] fifo	The dynamic queue.
- * @returns		TRUE if the queue is valid.
- * @returns		FALSE otherwise.
- */
-static int dyn_fifo_is_valid(dyn_fifo_ref fifo)
+ * @return		TRUE if the queue is valid.
+ * @return		FALSE otherwise.
+ */
+static int dyn_fifo_is_valid(dyn_fifo_t *fifo)
 {
 	return fifo && (fifo->magic_value == DYN_FIFO_MAGIC_VALUE);
@@ -68,10 +68,10 @@
  * @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.
- */
-int dyn_fifo_initialize(dyn_fifo_ref fifo, int size)
+ * @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)
 {
 	if (!fifo)
@@ -100,9 +100,9 @@
  *			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.
- */
-int dyn_fifo_push(dyn_fifo_ref fifo, int value, int max_size)
+ * @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)
 {
 	int *new_items;
@@ -150,9 +150,9 @@
  *
  * @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.
- */
-int dyn_fifo_pop(dyn_fifo_ref fifo)
+ * @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)
 {
 	int value;
@@ -172,9 +172,9 @@
  *
  * @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.
- */
-int dyn_fifo_value(dyn_fifo_ref fifo)
+ * @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)
 {
 	if (!dyn_fifo_is_valid(fifo))
@@ -190,8 +190,8 @@
  *
  * @param[in,out] fifo	The dynamic queue.
- * @returns		EOK on success.
- * @returns		EINVAL if the queue is not valid.
- */
-int dyn_fifo_destroy(dyn_fifo_ref fifo)
+ * @return		EOK on success.
+ * @return		EINVAL if the queue is not valid.
+ */
+int dyn_fifo_destroy(dyn_fifo_t *fifo)
 {
 	if (!dyn_fifo_is_valid(fifo))
Index: uspace/lib/c/generic/adt/measured_strings.c
===================================================================
--- uspace/lib/c/generic/adt/measured_strings.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/adt/measured_strings.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -55,11 +55,11 @@
  *			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.
- */
-measured_string_ref
+ * @return		The new bundled character string with measured length.
+ * @return		NULL if there is not enough memory left.
+ */
+measured_string_t *
 measured_string_create_bulk(const char *string, size_t length)
 {
-	measured_string_ref new;
+	measured_string_t *new;
 
 	if (length == 0) {
@@ -67,5 +67,5 @@
 			length++;
 	}
-	new = (measured_string_ref) malloc(sizeof(measured_string_t) +
+	new = (measured_string_t *) malloc(sizeof(measured_string_t) +
 	    (sizeof(char) * (length + 1)));
 	if (!new)
@@ -84,16 +84,16 @@
  *
  * @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.
- */
-measured_string_ref measured_string_copy(measured_string_ref source)
-{
-	measured_string_ref new;
+ * @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)
+{
+	measured_string_t *new;
 
 	if (!source)
 		return NULL;
 
-	new = (measured_string_ref) malloc(sizeof(measured_string_t));
+	new = (measured_string_t *) malloc(sizeof(measured_string_t));
 	if (new) {
 		new->value = (char *) malloc(source->length + 1);
@@ -120,16 +120,16 @@
  *			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.
  */
 int
-measured_strings_receive(measured_string_ref *strings, char **data,
+measured_strings_receive(measured_string_t **strings, char **data,
     size_t count)
 {
@@ -166,5 +166,5 @@
 	(*data)[lengths[count] - 1] = '\0';
 
-	*strings = (measured_string_ref) malloc(sizeof(measured_string_t) *
+	*strings = (measured_string_t *) malloc(sizeof(measured_string_t) *
 	    count);
 	if (!*strings) {
@@ -209,8 +209,8 @@
  * @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.
- */
-static size_t *prepare_lengths(const measured_string_ref strings, size_t count)
+ * @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)
 {
 	size_t *lengths;
@@ -238,15 +238,15 @@
  * @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.
  */
-int measured_strings_reply(const measured_string_ref strings, size_t count)
+int measured_strings_reply(const measured_string_t *strings, size_t count)
 {
 	size_t *lengths;
@@ -302,14 +302,14 @@
  *			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.
  */
 int
-measured_strings_return(int phone, measured_string_ref *strings, char **data,
+measured_strings_return(int phone, measured_string_t **strings, char **data,
     size_t count)
 {
@@ -339,5 +339,5 @@
 	}
 
-	*strings = (measured_string_ref) malloc(sizeof(measured_string_t) *
+	*strings = (measured_string_t *) malloc(sizeof(measured_string_t) *
 	    count);
 	if (!*strings) {
@@ -378,12 +378,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 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.
  */
 int
-measured_strings_send(int phone, const measured_string_ref strings,
+measured_strings_send(int phone, const measured_string_t *strings,
     size_t count)
 {
Index: uspace/lib/c/generic/devman.c
===================================================================
--- uspace/lib/c/generic/devman.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/devman.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -141,5 +141,5 @@
 
 int devman_child_device_register(
-	const char *name, match_id_list_t *match_ids, device_handle_t parent_handle, device_handle_t *handle)
+	const char *name, match_id_list_t *match_ids, devman_handle_t parent_handle, devman_handle_t *handle)
 {		
 	int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
@@ -180,5 +180,5 @@
 }
 
-int devman_add_device_to_class(device_handle_t dev_handle, const char *class_name)
+int devman_add_device_to_class(devman_handle_t devman_handle, const char *class_name)
 {
 	int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
@@ -189,5 +189,5 @@
 	async_serialize_start();
 	ipc_call_t answer;
-	aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, dev_handle, &answer);
+	aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, devman_handle, &answer);
 	
 	ipcarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
@@ -224,5 +224,5 @@
 }
 
-int devman_device_connect(device_handle_t handle, unsigned int flags)
+int devman_device_connect(devman_handle_t handle, unsigned int flags)
 {
 	int phone;
@@ -239,5 +239,5 @@
 }
 
-int devman_parent_device_connect(device_handle_t handle, unsigned int flags)
+int devman_parent_device_connect(devman_handle_t handle, unsigned int flags)
 {
 	int phone;
@@ -254,5 +254,5 @@
 }
 
-int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags)
+int devman_device_get_handle(const char *pathname, devman_handle_t *handle, unsigned int flags)
 {
 	int phone = devman_get_phone(DEVMAN_CLIENT, flags);
@@ -280,10 +280,10 @@
 	if (retval != EOK) {
 		if (handle != NULL)
-			*handle = (device_handle_t) -1;
+			*handle = (devman_handle_t) -1;
 		return retval;
 	}
 	
 	if (handle != NULL)
-		*handle = (device_handle_t) IPC_GET_ARG1(answer);
+		*handle = (devman_handle_t) IPC_GET_ARG1(answer);
 	
 	return retval;
Index: uspace/lib/c/generic/devmap.c
===================================================================
--- uspace/lib/c/generic/devmap.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/devmap.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -132,5 +132,5 @@
  *
  */
-int devmap_device_register(const char *fqdn, dev_handle_t *handle)
+int devmap_device_register(const char *fqdn, devmap_handle_t *handle)
 {
 	int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
@@ -163,10 +163,10 @@
 	
 	if (handle != NULL)
-		*handle = (dev_handle_t) IPC_GET_ARG1(answer);
+		*handle = (devmap_handle_t) IPC_GET_ARG1(answer);
 	
 	return retval;
 }
 
-int devmap_device_get_handle(const char *fqdn, dev_handle_t *handle, unsigned int flags)
+int devmap_device_get_handle(const char *fqdn, devmap_handle_t *handle, unsigned int flags)
 {
 	int phone = devmap_get_phone(DEVMAP_CLIENT, flags);
@@ -194,15 +194,15 @@
 	if (retval != EOK) {
 		if (handle != NULL)
-			*handle = (dev_handle_t) -1;
+			*handle = (devmap_handle_t) -1;
 		return retval;
 	}
 	
 	if (handle != NULL)
-		*handle = (dev_handle_t) IPC_GET_ARG1(answer);
+		*handle = (devmap_handle_t) IPC_GET_ARG1(answer);
 	
 	return retval;
 }
 
-int devmap_namespace_get_handle(const char *name, dev_handle_t *handle, unsigned int flags)
+int devmap_namespace_get_handle(const char *name, devmap_handle_t *handle, unsigned int flags)
 {
 	int phone = devmap_get_phone(DEVMAP_CLIENT, flags);
@@ -230,15 +230,15 @@
 	if (retval != EOK) {
 		if (handle != NULL)
-			*handle = (dev_handle_t) -1;
+			*handle = (devmap_handle_t) -1;
 		return retval;
 	}
 	
 	if (handle != NULL)
-		*handle = (dev_handle_t) IPC_GET_ARG1(answer);
+		*handle = (devmap_handle_t) IPC_GET_ARG1(answer);
 	
 	return retval;
 }
 
-devmap_handle_type_t devmap_handle_probe(dev_handle_t handle)
+devmap_handle_type_t devmap_handle_probe(devmap_handle_t handle)
 {
 	int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
@@ -255,5 +255,5 @@
 }
 
-int devmap_device_connect(dev_handle_t handle, unsigned int flags)
+int devmap_device_connect(devmap_handle_t handle, unsigned int flags)
 {
 	int phone;
@@ -305,5 +305,5 @@
 }
 
-static size_t devmap_count_devices_internal(int phone, dev_handle_t ns_handle)
+static size_t devmap_count_devices_internal(int phone, devmap_handle_t ns_handle)
 {
 	ipcarg_t count;
@@ -325,5 +325,5 @@
 }
 
-size_t devmap_count_devices(dev_handle_t ns_handle)
+size_t devmap_count_devices(devmap_handle_t ns_handle)
 {
 	int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
@@ -387,5 +387,5 @@
 }
 
-size_t devmap_get_devices(dev_handle_t ns_handle, dev_desc_t **data)
+size_t devmap_get_devices(devmap_handle_t ns_handle, dev_desc_t **data)
 {
 	int phone = devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING);
Index: uspace/lib/c/generic/net/icmp_api.c
===================================================================
--- uspace/lib/c/generic/net/icmp_api.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/net/icmp_api.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -66,12 +66,12 @@
  * @param[in] addr	The target host address.
  * @param[in] addrlen	The torget host address length.
- * @returns		ICMP_ECHO on success.
- * @returns		ETIMEOUT if the reply has not arrived before the
+ * @return		ICMP_ECHO on success.
+ * @return		ETIMEOUT if the reply has not arrived before the
  *			timeout.
- * @returns		ICMP type of the received error notification.
- * @returns		EINVAL if the addrlen parameter is less or equal to
+ * @return		ICMP type of the received error notification.
+ * @return		EINVAL if the addrlen parameter is less or equal to
  *			zero.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EPARTY if there was an internal error.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EPARTY if there was an internal error.
  */
 int
Index: uspace/lib/c/generic/net/icmp_common.c
===================================================================
--- uspace/lib/c/generic/net/icmp_common.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/net/icmp_common.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -50,6 +50,6 @@
  * @param[in] timeout	The connection timeout in microseconds. No timeout if
  *			set to zero.
- * @returns		The ICMP module phone on success.
- * @returns		ETIMEOUT if the connection timeouted.
+ * @return		The ICMP module phone on success.
+ * @return		ETIMEOUT if the connection timeouted.
  */
 int icmp_connect_module(services_t service, suseconds_t timeout)
Index: uspace/lib/c/generic/net/inet.c
===================================================================
--- uspace/lib/c/generic/net/inet.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/net/inet.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -51,8 +51,8 @@
  *  @param[out] address	The character buffer to be filled.
  *  @param[in] length	The buffer length.
- *  @returns		EOK on success.
- *  @returns		EINVAL if the data or address parameter is NULL.
- *  @returns		ENOMEM if the character buffer is not long enough.
- *  @returns		ENOTSUP if the address family is not supported.
+ *  @return		EOK on success.
+ *  @return		EINVAL if the data or address parameter is NULL.
+ *  @return		ENOMEM if the character buffer is not long enough.
+ *  @return		ENOTSUP if the address family is not supported.
  */
 int
@@ -101,8 +101,8 @@
  *  @param[in] address	The character buffer to be parsed.
  *  @param[out] data	The address data to be filled.
- *  @returns		EOK on success.
- *  @returns		EINVAL if the data parameter is NULL.
- *  @returns		ENOENT if the address parameter is NULL.
- *  @returns		ENOTSUP if the address family is not supported.
+ *  @return		EOK on success.
+ *  @return		EINVAL if the data parameter is NULL.
+ *  @return		ENOENT if the address parameter is NULL.
+ *  @return		ENOTSUP if the address family is not supported.
  */
 int inet_pton(uint16_t family, const char *address, uint8_t *data)
Index: uspace/lib/c/generic/net/modules.c
===================================================================
--- uspace/lib/c/generic/net/modules.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/net/modules.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -159,5 +159,5 @@
  *
  * @param[in] need	The needed module service.
- * @returns		The phone of the needed service.
+ * @return		The phone of the needed service.
  */
 int connect_to_service(services_t need)
@@ -171,6 +171,6 @@
  *  @param[in] timeout	The connection timeout in microseconds. No timeout if
  *			set to zero (0).
- *  @returns		The phone of the needed service.
- *  @returns		ETIMEOUT if the connection timeouted.
+ *  @return		The phone of the needed service.
+ *  @return		ETIMEOUT if the connection timeouted.
  */
 int connect_to_service_timeout(services_t need, suseconds_t timeout)
@@ -204,9 +204,9 @@
  * @param[out] data	The data buffer to be filled.
  * @param[out] length	The buffer length.
- * @returns		EOK on success.
- * @returns		EBADMEM if the data or the length parameter is NULL.
- * @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		EOK on success.
+ * @return		EBADMEM if the data or the length parameter is NULL.
+ * @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_write_finalize() function.
  */
@@ -242,9 +242,9 @@
  * @param[in] data	The data buffer to be sent.
  * @param[in] data_length The buffer length.
- * @returns		EOK on success.
- * @returns		EINVAL if the client does not expect the data.
- * @returns		EOVERFLOW if the client does not expect all the data.
+ * @return		EOK on success.
+ * @return		EINVAL if the client does not expect the data.
+ * @return		EOVERFLOW if the client does not expect all the data.
  *			Only partial data are transfered.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			async_data_read_finalize() function.
  */
Index: uspace/lib/c/generic/net/packet.c
===================================================================
--- uspace/lib/c/generic/net/packet.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/net/packet.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -64,7 +64,4 @@
 typedef packet_t packet_map_t[PACKET_MAP_SIZE];
 
-/** Type definition of the packet map page pointer. */
-typedef packet_map_t * packet_map_ref;
-
 /** Packet map.
  * Maps packet identifiers to the packet references.
@@ -85,6 +82,6 @@
 /** Initializes the packet map.
  *
- * @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.
  */
 int pm_init(void)
@@ -104,10 +101,10 @@
  *
  * @param[in] packet_id	The packet identifier to be found.
- * @returns		The found packet reference.
- * @returns		NULL if the mapping does not exist.
+ * @return		The found packet reference.
+ * @return		NULL if the mapping does not exist.
  */
 packet_t pm_find(packet_id_t packet_id)
 {
-	packet_map_ref map;
+	packet_map_t *map;
 	packet_t packet;
 
@@ -133,12 +130,12 @@
  *
  * @param[in] packet	The packet to be remembered.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		EINVAL if the packet map is not initialized.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		EINVAL if the packet map is not initialized.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int pm_add(packet_t packet)
 {
-	packet_map_ref map;
+	packet_map_t *map;
 	int rc;
 
@@ -154,5 +151,5 @@
 	} else {
 		do {
-			map = (packet_map_ref) malloc(sizeof(packet_map_t));
+			map = (packet_map_t *) malloc(sizeof(packet_map_t));
 			if (!map) {
 				fibril_rwlock_write_unlock(&pm_globals.lock);
@@ -180,5 +177,5 @@
 	int count;
 	int index;
-	packet_map_ref map;
+	packet_map_t *map;
 	packet_t packet;
 
@@ -208,7 +205,7 @@
  * @param[in] order	The packet order value.
  * @param[in] metric	The metric value of the packet.
- * @returns		EOK on success.
- * @returns		EINVAL if the first parameter is NULL.
- * @returns		EINVAL if the packet is not valid.
+ * @return		EOK on success.
+ * @return		EINVAL if the first parameter is NULL.
+ * @return		EINVAL if the packet is not valid.
  */
 int pq_add(packet_t * first, packet_t packet, size_t order, size_t metric)
@@ -252,7 +249,7 @@
  * @param[in] first	The first packet of the queue.
  * @param[in] order	The packet order value.
- * @returns		The packet with the given order.
- * @returns		NULL if the first packet is not valid.
- * @returns		NULL if the packet is not found.
+ * @return		The packet with the given order.
+ * @return		NULL if the first packet is not valid.
+ * @return		NULL if the packet is not found.
  */
 packet_t pq_find(packet_t packet, size_t order)
@@ -278,6 +275,6 @@
  * @param[in] packet	The packet in the queue.
  * @param[in] new_packet The new packet to be inserted.
- * @returns		EOK on success.
- * @returns		EINVAL if etiher of the packets is invalid.
+ * @return		EOK on success.
+ * @return		EINVAL if etiher of the packets is invalid.
  */
 int pq_insert_after(packet_t packet, packet_t new_packet)
@@ -301,8 +298,8 @@
  *
  * @param[in] packet	The packet to be detached.
- * @returns		The next packet in the queue. If the packet is the first
+ * @return		The next packet in the queue. If the packet is the first
  *			one of the queue, this becomes the new first one.
- * @returns		NULL if there is no packet left.
- * @returns		NULL if the packet is not valid.
+ * @return		NULL if there is no packet left.
+ * @return		NULL if the packet is not valid.
  */
 packet_t pq_detach(packet_t packet)
@@ -331,6 +328,6 @@
  * @param[in] order	The packet order value.
  * @param[in] metric	The metric value of the packet.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is invalid.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is invalid.
  */
 int pq_set_order(packet_t packet, size_t order, size_t metric)
@@ -349,6 +346,6 @@
  * @param[out] order	The packet order value.
  * @param[out] metric	The metric value of the packet.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is invalid.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is invalid.
  */
 int pq_get_order(packet_t packet, size_t *order, size_t *metric)
@@ -394,7 +391,7 @@
  *
  * @param[in] packet	The packet queue member.
- * @returns		The next packet in the queue.
- * @returns		NULL if there is no next packet.
- * @returns		NULL if the packet is not valid.
+ * @return		The next packet in the queue.
+ * @return		NULL if there is no next packet.
+ * @return		NULL if the packet is not valid.
  */
 packet_t pq_next(packet_t packet)
@@ -409,7 +406,7 @@
  *
  * @param[in] packet	The packet queue member.
- * @returns		The previous packet in the queue.
- * @returns		NULL if there is no previous packet.
- * @returns		NULL if the packet is not valid.
+ * @return		The previous packet in the queue.
+ * @return		NULL if there is no previous packet.
+ * @return		NULL if the packet is not valid.
  */
 packet_t pq_previous(packet_t packet)
Index: uspace/lib/c/generic/net/socket_client.c
===================================================================
--- uspace/lib/c/generic/net/socket_client.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/net/socket_client.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -79,9 +79,4 @@
 typedef struct socket socket_t;
 
-/** Type definition of the socket specific data pointer.
- * @see socket
- */
-typedef socket_t *socket_ref;
-
 /** Socket specific data.
  *
@@ -162,5 +157,5 @@
 
 	/** Active sockets. */
-	sockets_ref sockets;
+	sockets_t *sockets;
 
 	/** Safety lock.
@@ -183,11 +178,11 @@
 /** Returns the active sockets.
  *
- *  @returns		The active sockets.
- */
-static sockets_ref socket_get_sockets(void)
+ *  @return		The active sockets.
+ */
+static sockets_t *socket_get_sockets(void)
 {
 	if (!socket_globals.sockets) {
 		socket_globals.sockets =
-		    (sockets_ref) malloc(sizeof(sockets_t));
+		    (sockets_t *) malloc(sizeof(sockets_t));
 		if (!socket_globals.sockets)
 			return NULL;
@@ -213,5 +208,5 @@
 	ipc_callid_t callid;
 	ipc_call_t call;
-	socket_ref socket;
+	socket_t *socket;
 	int rc;
 
@@ -291,6 +286,6 @@
  * Connects to the TCP module if necessary.
  *
- * @returns		The TCP module phone.
- * @returns		Other error codes as defined for the
+ * @return		The TCP module phone.
+ * @return		Other error codes as defined for the
  *			bind_service_timeout() function.
  */
@@ -310,6 +305,6 @@
  * Connects to the UDP module if necessary.
  *
- * @returns		The UDP module phone.
- * @returns		Other error codes as defined for the
+ * @return		The UDP module phone.
+ * @return		Other error codes as defined for the
  *			bind_service_timeout() function.
  */
@@ -327,10 +322,10 @@
 /** Tries to find a new free socket identifier.
  *
- * @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(void)
 {
-	sockets_ref sockets;
+	sockets_t *sockets;
 	int socket_id = 0;
 	int count;
@@ -372,5 +367,5 @@
  */
 static void
-socket_initialize(socket_ref socket, int socket_id, int phone,
+socket_initialize(socket_t *socket, int socket_id, int phone,
     services_t service)
 {
@@ -392,18 +387,18 @@
  * @param[in] type	Socket type.
  * @param[in] protocol	Socket protocol.
- * @returns		The socket identifier on success.
- * @returns		EPFNOTSUPPORT if the protocol family is not supported.
- * @returns		ESOCKNOTSUPPORT if the socket type is not supported.
- * @returns		EPROTONOSUPPORT if the protocol is not supported.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		ELIMIT if there was not a free socket identifier found
+ * @return		The socket identifier on success.
+ * @return		EPFNOTSUPPORT if the protocol family is not supported.
+ * @return		ESOCKNOTSUPPORT if the socket type is not supported.
+ * @return		EPROTONOSUPPORT if the protocol is not supported.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		ELIMIT if there was not a free socket identifier found
  *			this time.
- * @returns		Other error codes as defined for the NET_SOCKET message.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the NET_SOCKET message.
+ * @return		Other error codes as defined for the
  *			bind_service_timeout() function.
  */
 int socket(int domain, int type, int protocol)
 {
-	socket_ref socket;
+	socket_t *socket;
 	int phone;
 	int socket_id;
@@ -463,5 +458,5 @@
 
 	// create a new socket structure
-	socket = (socket_ref) malloc(sizeof(socket_t));
+	socket = (socket_t *) malloc(sizeof(socket_t));
 	if (!socket)
 		return ENOMEM;
@@ -514,9 +509,9 @@
  * @param[in] data	The data to be sent.
  * @param[in] datalength The data length.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the data parameter is NULL.
- * @returns		NO_DATA if the datalength parameter is zero (0).
- * @returns		Other error codes as defined for the spcific message.
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the data parameter is NULL.
+ * @return		NO_DATA if the datalength parameter is zero (0).
+ * @return		Other error codes as defined for the spcific message.
  */
 static int
@@ -524,5 +519,5 @@
     const void *data, size_t datalength)
 {
-	socket_ref socket;
+	socket_t *socket;
 	aid_t message_id;
 	ipcarg_t result;
@@ -559,9 +554,9 @@
  * @param[in] my_addr	The port address.
  * @param[in] addrlen	The address length.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the my_addr parameter is NULL.
- * @returns		NO_DATA if the addlen parameter is zero.
- * @returns		Other error codes as defined for the NET_SOCKET_BIND
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the my_addr parameter is NULL.
+ * @return		NO_DATA if the addlen parameter is zero.
+ * @return		Other error codes as defined for the NET_SOCKET_BIND
  *			message.
  */
@@ -580,13 +575,13 @@
  * @param[in] socket_id	Socket identifier.
  * @param[in] backlog	The maximum number of waiting sockets to be accepted.
- * @returns		EOK on success.
- * @returns		EINVAL if the backlog parameter is not positive (<=0).
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		Other error codes as defined for the NET_SOCKET_LISTEN
+ * @return		EOK on success.
+ * @return		EINVAL if the backlog parameter is not positive (<=0).
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		Other error codes as defined for the NET_SOCKET_LISTEN
  *			message.
  */
 int listen(int socket_id, int backlog)
 {
-	socket_ref socket;
+	socket_t *socket;
 	int result;
 
@@ -618,15 +613,15 @@
  * @param[out] cliaddr	The remote client address.
  * @param[in] addrlen	The address length.
- * @returns		EOK on success.
- * @returns		EBADMEM if the cliaddr or addrlen parameter is NULL.
- * @returns		EINVAL if the backlog parameter is not positive (<=0).
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		Other error codes as defined for the NET_SOCKET_ACCEPT
+ * @return		EOK on success.
+ * @return		EBADMEM if the cliaddr or addrlen parameter is NULL.
+ * @return		EINVAL if the backlog parameter is not positive (<=0).
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		Other error codes as defined for the NET_SOCKET_ACCEPT
  *			message.
  */
 int accept(int socket_id, struct sockaddr * cliaddr, socklen_t * addrlen)
 {
-	socket_ref socket;
-	socket_ref new_socket;
+	socket_t *socket;
+	socket_t *new_socket;
 	aid_t message_id;
 	ipcarg_t ipc_result;
@@ -661,5 +656,5 @@
 
 	// create a new scoket
-	new_socket = (socket_ref) malloc(sizeof(socket_t));
+	new_socket = (socket_t *) malloc(sizeof(socket_t));
 	if (!new_socket) {
 		fibril_mutex_unlock(&socket->accept_lock);
@@ -721,9 +716,9 @@
  * @param[in] serv_addr	The remote server address.
  * @param[in] addrlen	The address length.
- * @returns		EOK on success.
- * @returns		EBADMEM if the serv_addr parameter is NULL.
- * @returns		NO_DATA if the addlen parameter is zero.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		Other error codes as defined for the NET_SOCKET_CONNECT
+ * @return		EOK on success.
+ * @return		EBADMEM if the serv_addr parameter is NULL.
+ * @return		NO_DATA if the addlen parameter is zero.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		Other error codes as defined for the NET_SOCKET_CONNECT
  *			message.
  */
@@ -745,5 +740,5 @@
  * @param[in] socket	The socket to be destroyed.
  */
-static void socket_destroy(socket_ref socket)
+static void socket_destroy(socket_t *socket)
 {
 	int accepted_id;
@@ -761,14 +756,14 @@
  *
  * @param[in] socket_id	Socket identifier.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EINPROGRESS if there is another blocking function in
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EINPROGRESS if there is another blocking function in
  *			progress.
- * @returns		Other error codes as defined for the NET_SOCKET_CLOSE
+ * @return		Other error codes as defined for the NET_SOCKET_CLOSE
  *			message.
  */
 int closesocket(int socket_id)
 {
-	socket_ref socket;
+	socket_t *socket;
 	int rc;
 
@@ -811,10 +806,10 @@
  *			sockets.
  * @param[in] addrlen	The address length. Used only if toaddr is not NULL.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the data or toaddr parameter is NULL.
- * @returns		NO_DATA if the datalength or the addrlen parameter is
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the data or toaddr parameter is NULL.
+ * @return		NO_DATA if the datalength or the addrlen parameter is
  *			zero (0).
- * @returns		Other error codes as defined for the NET_SOCKET_SENDTO
+ * @return		Other error codes as defined for the NET_SOCKET_SENDTO
  *			message.
  */
@@ -824,5 +819,5 @@
     socklen_t addrlen)
 {
-	socket_ref socket;
+	socket_t *socket;
 	aid_t message_id;
 	ipcarg_t result;
@@ -913,9 +908,9 @@
  * @param[in] datalength The data length.
  * @param[in] flags	Various send flags.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the data parameter is NULL.
- * @returns		NO_DATA if the datalength parameter is zero.
- * @returns		Other error codes as defined for the NET_SOCKET_SEND
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the data parameter is NULL.
+ * @return		NO_DATA if the datalength parameter is zero.
+ * @return		Other error codes as defined for the NET_SOCKET_SEND
  *			message.
  */
@@ -937,10 +932,10 @@
  * @param[in] toaddr	The destination address.
  * @param[in] addrlen	The address length.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the data or toaddr parameter is NULL.
- * @returns		NO_DATA if the datalength or the addrlen parameter is
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the data or toaddr parameter is NULL.
+ * @return		NO_DATA if the datalength or the addrlen parameter is
  *			zero.
- * @returns		Other error codes as defined for the NET_SOCKET_SENDTO
+ * @return		Other error codes as defined for the NET_SOCKET_SENDTO
  *			message.
  */
@@ -971,9 +966,9 @@
  *			read. The actual address length is set. Used only if
  *			fromaddr is not NULL.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the data parameter is NULL.
- * @returns		NO_DATA if the datalength or addrlen parameter is zero.
- * @returns		Other error codes as defined for the spcific message.
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the data parameter is NULL.
+ * @return		NO_DATA if the datalength or addrlen parameter is zero.
+ * @return		Other error codes as defined for the spcific message.
  */
 static int
@@ -981,5 +976,5 @@
     int flags, struct sockaddr *fromaddr, socklen_t *addrlen)
 {
-	socket_ref socket;
+	socket_t *socket;
 	aid_t message_id;
 	ipcarg_t ipc_result;
@@ -1100,9 +1095,9 @@
  * @param[in] datalength The data length.
  * @param[in] flags	Various receive flags.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the data parameter is NULL.
- * @returns		NO_DATA if the datalength parameter is zero.
- * @returns		Other error codes as defined for the NET_SOCKET_RECV
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the data parameter is NULL.
+ * @return		NO_DATA if the datalength parameter is zero.
+ * @return		Other error codes as defined for the NET_SOCKET_RECV
  *			message.
  */
@@ -1123,9 +1118,9 @@
  * @param[in,out] addrlen The address length. The maximum address length is
  *			read. The actual address length is set.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the data or fromaddr parameter is NULL.
- * @returns		NO_DATA if the datalength or addrlen parameter is zero.
- * @returns		Other error codes as defined for the NET_SOCKET_RECVFROM
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the data or fromaddr parameter is NULL.
+ * @return		NO_DATA if the datalength or addrlen parameter is zero.
+ * @return		Other error codes as defined for the NET_SOCKET_RECVFROM
  *			message.
  */
@@ -1153,9 +1148,9 @@
  * @param[in,out] optlen The value buffer length. The maximum length is read.
  *			The actual length is set.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the value or optlen parameter is NULL.
- * @returns		NO_DATA if the optlen parameter is zero.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the value or optlen parameter is NULL.
+ * @return		NO_DATA if the optlen parameter is zero.
+ * @return		Other error codes as defined for the
  *			NET_SOCKET_GETSOCKOPT message.
  */
@@ -1163,5 +1158,5 @@
 getsockopt(int socket_id, int level, int optname, void *value, size_t *optlen)
 {
-	socket_ref socket;
+	socket_t *socket;
 	aid_t message_id;
 	ipcarg_t result;
@@ -1206,9 +1201,9 @@
  * @param[in] value	The value to be set.
  * @param[in] optlen	The value length.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EBADMEM if the value parameter is NULL.
- * @returns		NO_DATA if the optlen parameter is zero.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EBADMEM if the value parameter is NULL.
+ * @return		NO_DATA if the optlen parameter is zero.
+ * @return		Other error codes as defined for the
  *			NET_SOCKET_SETSOCKOPT message.
  */
Index: uspace/lib/c/generic/vfs/vfs.c
===================================================================
--- uspace/lib/c/generic/vfs/vfs.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/generic/vfs/vfs.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -136,6 +136,6 @@
 	}
 	
-	dev_handle_t dev_handle;
-	int res = devmap_device_get_handle(fqdn, &dev_handle, flags);
+	devmap_handle_t devmap_handle;
+	int res = devmap_device_get_handle(fqdn, &devmap_handle, flags);
 	if (res != EOK) {
 		if (null_id != -1)
@@ -159,5 +159,5 @@
 	
 	ipcarg_t rc_orig;
-	aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
+	aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, devmap_handle, flags, NULL);
 	ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
 	if (rc != EOK) {
@@ -328,5 +328,5 @@
 	ipc_call_t answer;
 	aid_t req = async_send_4(vfs_phone, VFS_IN_OPEN_NODE, node->fs_handle,
-	    node->dev_handle, node->index, oflag, &answer);
+	    node->devmap_handle, node->index, oflag, &answer);
 	
 	ipcarg_t rc;
@@ -797,5 +797,5 @@
 	if (rc == EOK) {
 		node->fs_handle = stat.fs_handle;
-		node->dev_handle = stat.dev_handle;
+		node->devmap_handle = stat.devmap_handle;
 		node->index = stat.index;
 	}
Index: uspace/lib/c/include/adt/char_map.h
===================================================================
--- uspace/lib/c/include/adt/char_map.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/adt/char_map.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -48,9 +48,4 @@
 typedef struct char_map	char_map_t;
 
-/** Type definition of the character string to integer map pointer.
- *  @see char_map
- */
-typedef char_map_t *char_map_ref;
-
 /** Character string to integer map item.
  *
@@ -69,15 +64,15 @@
 	int next;
 	/** Next character array. */
-	char_map_ref *items;
+	char_map_t **items;
 	/** Consistency check magic value. */
 	int magic;
 };
 
-extern int char_map_initialize(char_map_ref);
-extern void char_map_destroy(char_map_ref);
-extern int char_map_exclude(char_map_ref, const char *, size_t);
-extern int char_map_add(char_map_ref, const char *, size_t, const int);
-extern int char_map_find(const char_map_ref, const char *, size_t);
-extern int char_map_update(char_map_ref, const char *, size_t, const int);
+extern int char_map_initialize(char_map_t *);
+extern void char_map_destroy(char_map_t *);
+extern int char_map_exclude(char_map_t *, const char *, size_t);
+extern int char_map_add(char_map_t *, const char *, size_t, const int);
+extern int char_map_find(const char_map_t *, const char *, size_t);
+extern int char_map_update(char_map_t *, const char *, size_t, const int);
 
 #endif
Index: uspace/lib/c/include/adt/dynamic_fifo.h
===================================================================
--- uspace/lib/c/include/adt/dynamic_fifo.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/adt/dynamic_fifo.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -44,9 +44,4 @@
 typedef struct dyn_fifo	dyn_fifo_t;
 
-/** Type definition of the dynamic fifo queue pointer.
- *  @see dyn_fifo
- */
-typedef dyn_fifo_t *dyn_fifo_ref;
-
 /** Dynamic first in first out positive integer queue.
  * Possitive integer values only.
@@ -66,9 +61,9 @@
 };
 
-extern int dyn_fifo_initialize(dyn_fifo_ref, int);
-extern int dyn_fifo_destroy(dyn_fifo_ref);
-extern int dyn_fifo_push(dyn_fifo_ref, int, int);
-extern int dyn_fifo_pop(dyn_fifo_ref);
-extern int dyn_fifo_value(dyn_fifo_ref);
+extern int dyn_fifo_initialize(dyn_fifo_t *, int);
+extern int dyn_fifo_destroy(dyn_fifo_t *);
+extern int dyn_fifo_push(dyn_fifo_t *, int, int);
+extern int dyn_fifo_pop(dyn_fifo_t *);
+extern int dyn_fifo_value(dyn_fifo_t *);
 
 #endif
Index: uspace/lib/c/include/adt/generic_char_map.h
===================================================================
--- uspace/lib/c/include/adt/generic_char_map.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/adt/generic_char_map.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -55,5 +55,4 @@
 	\
 	typedef	struct name name##_t; \
-	typedef	name##_t *name##_ref; \
 	\
 	struct	name { \
@@ -63,11 +62,11 @@
 	}; \
 	\
-	int name##_add(name##_ref, const char *, const size_t, type *); \
-	int name##_count(name##_ref); \
-	void name##_destroy(name##_ref); \
-	void name##_exclude(name##_ref, const char *, const size_t); \
-	type *name##_find(name##_ref, const char *, const size_t); \
-	int name##_initialize(name##_ref); \
-	int name##_is_valid(name##_ref);
+	int name##_add(name##_t *, const char *, const size_t, type *); \
+	int name##_count(name##_t *); \
+	void name##_destroy(name##_t *); \
+	void name##_exclude(name##_t *, const char *, const size_t); \
+	type *name##_find(name##_t *, const char *, const size_t); \
+	int name##_initialize(name##_t *); \
+	int name##_is_valid(name##_t *);
 
 /** Character string to generic type map implementation.
@@ -81,5 +80,5 @@
 	GENERIC_FIELD_IMPLEMENT(name##_items, type) \
 	\
-	int name##_add(name##_ref map, const char *name, const size_t length, \
+	int name##_add(name##_t *map, const char *name, const size_t length, \
 	     type *value) \
 	{ \
@@ -99,5 +98,5 @@
 	} \
 	\
-	int name##_count(name##_ref map) \
+	int name##_count(name##_t *map) \
 	{ \
 		return name##_is_valid(map) ? \
@@ -105,5 +104,5 @@
 	} \
 	\
-	void name##_destroy(name##_ref map) \
+	void name##_destroy(name##_t *map) \
 	{ \
 		if (name##_is_valid(map)) { \
@@ -113,5 +112,5 @@
 	} \
 	\
-	void name##_exclude(name##_ref map, const char *name, \
+	void name##_exclude(name##_t *map, const char *name, \
 	    const size_t length) \
 	{ \
@@ -125,5 +124,5 @@
 	} \
 	\
-	type *name##_find(name##_ref map, const char *name, \
+	type *name##_find(name##_t *map, const char *name, \
 	    const size_t length) \
 	{ \
@@ -138,5 +137,5 @@
 	} \
 	\
-	int name##_initialize(name##_ref map) \
+	int name##_initialize(name##_t *map) \
 	{ \
 		int rc; \
@@ -155,5 +154,5 @@
 	} \
 	\
-	int name##_is_valid(name##_ref map) \
+	int name##_is_valid(name##_t *map) \
 	{ \
 		return map && (map->magic == GENERIC_CHAR_MAP_MAGIC_VALUE); \
Index: uspace/lib/c/include/adt/generic_field.h
===================================================================
--- uspace/lib/c/include/adt/generic_field.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/adt/generic_field.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -53,5 +53,4 @@
 #define GENERIC_FIELD_DECLARE(name, type) \
 	typedef	struct name name##_t; \
-	typedef	name##_t *name##_ref; \
 	\
 	struct	name { \
@@ -62,12 +61,12 @@
 	}; \
 	\
-	int name##_add(name##_ref, type *); \
-	int name##_count(name##_ref); \
-	void name##_destroy(name##_ref); \
-	void name##_exclude_index(name##_ref, int); \
-	type **name##_get_field(name##_ref); \
-	type *name##_get_index(name##_ref, int); \
-	int name##_initialize(name##_ref); \
-	int name##_is_valid(name##_ref);
+	int name##_add(name##_t *, type *); \
+	int name##_count(name##_t *); \
+	void name##_destroy(name##_t *); \
+	void name##_exclude_index(name##_t *, int); \
+	type **name##_get_field(name##_t *); \
+	type *name##_get_index(name##_t *, int); \
+	int name##_initialize(name##_t *); \
+	int name##_is_valid(name##_t *);
 
 /** Generic type field implementation.
@@ -79,5 +78,5 @@
  */
 #define GENERIC_FIELD_IMPLEMENT(name, type) \
-	int name##_add(name##_ref field, type *value) \
+	int name##_add(name##_t *field, type *value) \
 	{ \
 		if (name##_is_valid(field)) { \
@@ -99,10 +98,10 @@
 	} \
 	\
-	int name##_count(name##_ref field) \
+	int name##_count(name##_t *field) \
 	{ \
 		return name##_is_valid(field) ? field->next : -1; \
 	} \
 	\
-	void name##_destroy(name##_ref field) \
+	void name##_destroy(name##_t *field) \
 	{ \
 		if (name##_is_valid(field)) { \
@@ -117,5 +116,5 @@
 	} \
 	 \
-	void name##_exclude_index(name##_ref field, int index) \
+	void name##_exclude_index(name##_t *field, int index) \
 	{ \
 		if (name##_is_valid(field) && (index >= 0) && \
@@ -126,5 +125,5 @@
 	} \
 	 \
-	type *name##_get_index(name##_ref field, int index) \
+	type *name##_get_index(name##_t *field, int index) \
 	{ \
 		if (name##_is_valid(field) && (index >= 0) && \
@@ -134,10 +133,10 @@
 	} \
 	\
-	type **name##_get_field(name##_ref field) \
+	type **name##_get_field(name##_t *field) \
 	{ \
 		return name##_is_valid(field) ? field->items : NULL; \
 	} \
 	\
-	int name##_initialize(name##_ref field) \
+	int name##_initialize(name##_t *field) \
 	{ \
 		if (!field) \
@@ -153,5 +152,5 @@
 	} \
 	\
-	int name##_is_valid(name##_ref field) \
+	int name##_is_valid(name##_t *field) \
 	{ \
 		return field && (field->magic == GENERIC_FIELD_MAGIC_VALUE); \
Index: uspace/lib/c/include/adt/int_map.h
===================================================================
--- uspace/lib/c/include/adt/int_map.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/adt/int_map.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -56,7 +56,5 @@
 #define INT_MAP_DECLARE(name, type) \
 	typedef	struct name name##_t; \
-	typedef	name##_t *name##_ref; \
 	typedef	struct name##_item name##_item_t; \
-	typedef	name##_item_t *name##_item_ref; \
 	\
 	struct	name##_item { \
@@ -69,21 +67,21 @@
 		int size; \
 		int next; \
-		name##_item_ref items; \
+		name##_item_t *items; \
 		int magic; \
 	}; \
 	\
-	int name##_add(name##_ref, int, type *); \
-	void name##_clear(name##_ref); \
-	int name##_count(name##_ref); \
-	void name##_destroy(name##_ref); \
-	void name##_exclude(name##_ref, int); \
-	void name##_exclude_index(name##_ref, int); \
-	type *name##_find(name##_ref, int); \
-	int name##_update(name##_ref, int, int); \
-	type *name##_get_index(name##_ref, int); \
-	int name##_initialize(name##_ref); \
-	int name##_is_valid(name##_ref); \
-	void name##_item_destroy(name##_item_ref); \
-	int name##_item_is_valid(name##_item_ref);
+	int name##_add(name##_t *, int, type *); \
+	void name##_clear(name##_t *); \
+	int name##_count(name##_t *); \
+	void name##_destroy(name##_t *); \
+	void name##_exclude(name##_t *, int); \
+	void name##_exclude_index(name##_t *, int); \
+	type *name##_find(name##_t *, int); \
+	int name##_update(name##_t *, int, int); \
+	type *name##_get_index(name##_t *, int); \
+	int name##_initialize(name##_t *); \
+	int name##_is_valid(name##_t *); \
+	void name##_item_destroy(name##_item_t *); \
+	int name##_item_is_valid(name##_item_t *);
 
 /** Integer to generic type map implementation.
@@ -95,10 +93,10 @@
  */
 #define INT_MAP_IMPLEMENT(name, type) \
-	int name##_add(name##_ref map, int key, type *value) \
+	int name##_add(name##_t *map, int key, type *value) \
 	{ \
 		if (name##_is_valid(map)) { \
 			if (map->next == (map->size - 1)) { \
-				name##_item_ref tmp; \
-				tmp = (name##_item_ref) realloc(map->items, \
+				name##_item_t *tmp; \
+				tmp = (name##_item_t *) realloc(map->items, \
 				    sizeof(name##_item_t) * 2 * map->size); \
 				if (!tmp) \
@@ -117,5 +115,5 @@
 	} \
 	\
-	void name##_clear(name##_ref map) \
+	void name##_clear(name##_t *map) \
 	{ \
 		if (name##_is_valid(map)) { \
@@ -132,10 +130,10 @@
 	} \
 	\
-	int name##_count(name##_ref map) \
+	int name##_count(name##_t *map) \
 	{ \
 		return name##_is_valid(map) ? map->next : -1; \
 	} \
 	\
-	void name##_destroy(name##_ref map) \
+	void name##_destroy(name##_t *map) \
 	{ \
 		if (name##_is_valid(map)) { \
@@ -152,5 +150,5 @@
 	} \
 	\
-	void name##_exclude(name##_ref map, int key) \
+	void name##_exclude(name##_t *map, int key) \
 	{ \
 		if (name##_is_valid(map)) { \
@@ -166,5 +164,5 @@
 	} \
 	\
-	void name##_exclude_index(name##_ref map, int index) \
+	void name##_exclude_index(name##_t *map, int index) \
 	{ \
 		if (name##_is_valid(map) && (index >= 0) && \
@@ -175,5 +173,5 @@
 	} \
 	\
-	type *name##_find(name##_ref map, int key) \
+	type *name##_find(name##_t *map, int key) \
 	{ \
 		if (name##_is_valid(map)) { \
@@ -189,5 +187,5 @@
 	} \
 	\
-	int name##_update(name##_ref map, int key, int new_key) \
+	int name##_update(name##_t *map, int key, int new_key) \
 	{ \
 		if (name##_is_valid(map)) { \
@@ -208,5 +206,5 @@
 	} \
 	\
-	type *name##_get_index(name##_ref map, int index) \
+	type *name##_get_index(name##_t *map, int index) \
 	{ \
 		if (name##_is_valid(map) && (index >= 0) && \
@@ -218,5 +216,5 @@
 	} \
 	\
-	int name##_initialize(name##_ref map) \
+	int name##_initialize(name##_t *map) \
 	{ \
 		if (!map) \
@@ -224,5 +222,5 @@
 		map->size = 2; \
 		map->next = 0; \
-		map->items = (name##_item_ref) malloc(sizeof(name##_item_t) * \
+		map->items = (name##_item_t *) malloc(sizeof(name##_item_t) * \
 		    map->size); \
 		if (!map->items) \
@@ -233,10 +231,10 @@
 	} \
 	\
-	int name##_is_valid(name##_ref map) \
+	int name##_is_valid(name##_t *map) \
 	{ \
 		return map && (map->magic == INT_MAP_MAGIC_VALUE); \
 	} \
 	\
-	void name##_item_destroy(name##_item_ref item) \
+	void name##_item_destroy(name##_item_t *item) \
 	{ \
 		if (name##_item_is_valid(item)) { \
@@ -249,5 +247,5 @@
 	} \
 	\
-	int name##_item_is_valid(name##_item_ref item) \
+	int name##_item_is_valid(name##_item_t *item) \
 	{ \
 		return item && (item->magic == INT_MAP_ITEM_MAGIC_VALUE); \
Index: uspace/lib/c/include/adt/measured_strings.h
===================================================================
--- uspace/lib/c/include/adt/measured_strings.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/adt/measured_strings.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -47,9 +47,4 @@
 typedef struct measured_string measured_string_t;
 
-/** Type definition of the character string with measured length pointer.
- * @see measured_string
- */
-typedef measured_string_t *measured_string_ref;
-
 /** Character string with measured length.
  *
@@ -64,10 +59,10 @@
 };
 
-extern measured_string_ref measured_string_create_bulk(const char *, size_t);
-extern measured_string_ref measured_string_copy(measured_string_ref);
-extern int measured_strings_receive(measured_string_ref *, char **, size_t);
-extern int measured_strings_reply(const measured_string_ref, size_t);
-extern int measured_strings_return(int, measured_string_ref *, char **, size_t);
-extern int measured_strings_send(int, const measured_string_ref, size_t);
+extern measured_string_t *measured_string_create_bulk(const char *, size_t);
+extern measured_string_t *measured_string_copy(measured_string_t *);
+extern int measured_strings_receive(measured_string_t **, char **, size_t);
+extern int measured_strings_reply(const measured_string_t *, size_t);
+extern int measured_strings_return(int, measured_string_t **, char **, size_t);
+extern int measured_strings_send(int, const measured_string_t *, size_t);
 
 #endif
Index: uspace/lib/c/include/devman.h
===================================================================
--- uspace/lib/c/include/devman.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/devman.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -42,16 +42,18 @@
 
 
-int devman_get_phone(devman_interface_t, unsigned int);
-void devman_hangup_phone(devman_interface_t iface);
+extern int devman_get_phone(devman_interface_t, unsigned int);
+extern void devman_hangup_phone(devman_interface_t);
 
-int devman_driver_register(const char *, async_client_conn_t);
-int devman_child_device_register(const char *, match_id_list_t *, device_handle_t, device_handle_t *);
+extern int devman_driver_register(const char *, async_client_conn_t);
+extern int devman_child_device_register(const char *, match_id_list_t *,
+    devman_handle_t, devman_handle_t *);
 
-int devman_device_connect(device_handle_t handle, unsigned int flags);
-int devman_parent_device_connect(device_handle_t handle, unsigned int flags);
+extern int devman_device_connect(devman_handle_t, unsigned int);
+extern int devman_parent_device_connect(devman_handle_t, unsigned int);
 
-int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags);
+extern int devman_device_get_handle(const char *, devman_handle_t *,
+    unsigned int);
 
-int devman_add_device_to_class(device_handle_t dev_handle, const char *class_name);
+extern int devman_add_device_to_class(devman_handle_t, const char *);
 
 #endif
Index: uspace/lib/c/include/devmap.h
===================================================================
--- uspace/lib/c/include/devmap.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/devmap.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -44,11 +44,11 @@
 
 extern int devmap_driver_register(const char *, async_client_conn_t);
-extern int devmap_device_register(const char *, dev_handle_t *);
+extern int devmap_device_register(const char *, devmap_handle_t *);
 
-extern int devmap_device_get_handle(const char *, dev_handle_t *, unsigned int);
-extern int devmap_namespace_get_handle(const char *, dev_handle_t *, unsigned int);
-extern devmap_handle_type_t devmap_handle_probe(dev_handle_t);
+extern int devmap_device_get_handle(const char *, devmap_handle_t *, unsigned int);
+extern int devmap_namespace_get_handle(const char *, devmap_handle_t *, unsigned int);
+extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t);
 
-extern int devmap_device_connect(dev_handle_t, unsigned int);
+extern int devmap_device_connect(devmap_handle_t, unsigned int);
 
 extern int devmap_null_create(void);
@@ -56,8 +56,8 @@
 
 extern size_t devmap_count_namespaces(void);
-extern size_t devmap_count_devices(dev_handle_t);
+extern size_t devmap_count_devices(devmap_handle_t);
 
 extern size_t devmap_get_namespaces(dev_desc_t **);
-extern size_t devmap_get_devices(dev_handle_t, dev_desc_t **);
+extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **);
 
 #endif
Index: uspace/lib/c/include/ipc/devman.h
===================================================================
--- uspace/lib/c/include/ipc/devman.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/ipc/devman.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -42,5 +42,5 @@
 #define DEVMAN_NAME_MAXLEN 256
 
-typedef ipcarg_t device_handle_t;
+typedef ipcarg_t devman_handle_t;
 
 /** Ids of device models used for device-to-driver matching.
Index: uspace/lib/c/include/ipc/devmap.h
===================================================================
--- uspace/lib/c/include/ipc/devmap.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/ipc/devmap.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -40,5 +40,5 @@
 #define DEVMAP_NAME_MAXLEN  255
 
-typedef ipcarg_t dev_handle_t;
+typedef ipcarg_t devmap_handle_t;
 
 typedef enum {
@@ -81,5 +81,5 @@
 
 typedef struct {
-	dev_handle_t handle;
+	devmap_handle_t handle;
 	char name[DEVMAP_NAME_MAXLEN + 1];
 } dev_desc_t;
Index: pace/lib/c/include/ipc/serial.h
===================================================================
--- uspace/lib/c/include/ipc/serial.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ 	(revision )
@@ -1,14 +1,0 @@
-#ifndef LIBC_FB_H_
-#define LIBC_FB_H_
-
-#include <ipc/ipc.h>
-
-typedef enum {
-	SERIAL_PUTCHAR = IPC_FIRST_USER_METHOD,
-	SERIAL_GETCHAR,
-	SERIAL_READ,
-	SERIAL_WRITE,
-} serial_request_t;
-
-
-#endif
Index: uspace/lib/c/include/net/device.h
===================================================================
--- uspace/lib/c/include/net/device.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/net/device.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -59,9 +59,4 @@
  */
 typedef struct device_stats device_stats_t;
-
-/** Type definition of the device usage statistics pointer.
- * @see device_stats
- */
-typedef device_stats_t *device_stats_ref;
 
 /** Device state. */
Index: uspace/lib/c/include/net/modules.h
===================================================================
--- uspace/lib/c/include/net/modules.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/net/modules.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -69,5 +69,5 @@
  *
  * @param[in] need	The needed module service.
- * @returns		The phone of the needed service.
+ * @return		The phone of the needed service.
  */
 typedef int connect_module_t(services_t need);
Index: uspace/lib/c/include/net/packet.h
===================================================================
--- uspace/lib/c/include/net/packet.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/net/packet.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -48,18 +48,8 @@
 typedef struct packet * packet_t;
 
-/** Type definition of the packet pointer.
- * @see packet
- */
-typedef packet_t * packet_ref;
-
 /** Type definition of the packet dimension.
  * @see packet_dimension
  */
 typedef struct packet_dimension	packet_dimension_t;
-
-/** Type definition of the packet dimension pointer.
- * @see packet_dimension
- */
-typedef packet_dimension_t * packet_dimension_ref;
 
 /** Packet dimension. */
Index: uspace/lib/c/include/net/packet_header.h
===================================================================
--- uspace/lib/c/include/net/packet_header.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/net/packet_header.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -124,7 +124,7 @@
 /** Returns whether the packet is valid.
  * @param[in] packet	The packet to be checked.
- * @returns		True if the packet is not NULL and the magic value is
+ * @return		True if the packet is not NULL and the magic value is
  *			correct.
- * @returns		False otherwise.
+ * @return		False otherwise.
  */
 static inline int packet_is_valid(const packet_t packet)
Index: uspace/lib/c/include/sys/stat.h
===================================================================
--- uspace/lib/c/include/sys/stat.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/sys/stat.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -43,5 +43,5 @@
 struct stat {
 	fs_handle_t fs_handle;
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 	fs_index_t index;
 	unsigned int lnkcnt;
@@ -49,5 +49,5 @@
 	bool is_directory;
 	aoff64_t size;
-	dev_handle_t device;
+	devmap_handle_t device;
 };
 
Index: uspace/lib/c/include/unistd.h
===================================================================
--- uspace/lib/c/include/unistd.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/unistd.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -41,5 +41,5 @@
 
 #ifndef NULL
-	#define NULL  0
+	#define NULL  0UL
 #endif
 
Index: uspace/lib/c/include/vfs/vfs.h
===================================================================
--- uspace/lib/c/include/vfs/vfs.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/c/include/vfs/vfs.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -47,5 +47,5 @@
 typedef struct {
 	fs_handle_t fs_handle;
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 	fs_index_t index;
 } fdi_node_t;
Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/drv/generic/driver.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -139,5 +139,5 @@
 }
 
-static device_t * driver_get_device(link_t *devices, device_handle_t handle)
+static device_t * driver_get_device(link_t *devices, devman_handle_t handle)
 {
 	device_t *dev = NULL;
@@ -163,5 +163,5 @@
 	int res = EOK;
 	
-	device_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+	devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
 	device_t *dev = create_device();
 	dev->handle = dev_handle;
@@ -221,5 +221,5 @@
 	 * the device to which the client connected.
 	 */
-	device_handle_t handle = IPC_GET_ARG2(*icall);
+	devman_handle_t handle = IPC_GET_ARG2(*icall);
 	device_t *dev = driver_get_device(&devices, handle);
 
Index: uspace/lib/drv/include/driver.h
===================================================================
--- uspace/lib/drv/include/driver.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/drv/include/driver.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -118,5 +118,5 @@
 	 * device manager).
 	 */
-	device_handle_t handle;
+	devman_handle_t handle;
 	
 	/**
Index: uspace/lib/fs/libfs.c
===================================================================
--- uspace/lib/fs/libfs.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/fs/libfs.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -150,8 +150,8 @@
     ipc_call_t *request)
 {
-	dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t mp_devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request);
 	fs_handle_t mr_fs_handle = (fs_handle_t) IPC_GET_ARG3(*request);
-	dev_handle_t mr_dev_handle = (dev_handle_t) IPC_GET_ARG4(*request);
+	devmap_handle_t mr_devmap_handle = (devmap_handle_t) IPC_GET_ARG4(*request);
 	int res;
 	ipcarg_t rc;
@@ -174,5 +174,5 @@
 	
 	fs_node_t *fn;
-	res = ops->node_get(&fn, mp_dev_handle, mp_fs_index);
+	res = ops->node_get(&fn, mp_devmap_handle, mp_fs_index);
 	if ((res != EOK) || (!fn)) {
 		ipc_hangup(mountee_phone);
@@ -201,10 +201,10 @@
 	ipc_call_t answer;
 	rc = async_data_write_forward_1_1(mountee_phone, VFS_OUT_MOUNTED,
-	    mr_dev_handle, &answer);
+	    mr_devmap_handle, &answer);
 	
 	if (rc == EOK) {
 		fn->mp_data.mp_active = true;
 		fn->mp_data.fs_handle = mr_fs_handle;
-		fn->mp_data.dev_handle = mr_dev_handle;
+		fn->mp_data.devmap_handle = mr_devmap_handle;
 		fn->mp_data.phone = mountee_phone;
 	}
@@ -219,10 +219,10 @@
 void libfs_unmount(libfs_ops_t *ops, ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t mp_dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t mp_devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t mp_fs_index = (fs_index_t) IPC_GET_ARG2(*request);
 	fs_node_t *fn;
 	int res;
 
-	res = ops->node_get(&fn, mp_dev_handle, mp_fs_index);
+	res = ops->node_get(&fn, mp_devmap_handle, mp_fs_index);
 	if ((res != EOK) || (!fn)) {
 		ipc_answer_0(rid, combine_rc(res, ENOENT));
@@ -243,5 +243,5 @@
 	 */
 	res = async_req_1_0(fn->mp_data.phone, VFS_OUT_UNMOUNTED,
-	    fn->mp_data.dev_handle);
+	    fn->mp_data.devmap_handle);
 
 	/*
@@ -252,5 +252,5 @@
 		fn->mp_data.mp_active = false;
 		fn->mp_data.fs_handle = 0;
-		fn->mp_data.dev_handle = 0;
+		fn->mp_data.devmap_handle = 0;
 		fn->mp_data.phone = 0;
 		/* Drop the reference created in libfs_mount(). */
@@ -281,5 +281,5 @@
 	unsigned int last = IPC_GET_ARG2(*request);
 	unsigned int next = first;
-	dev_handle_t dev_handle = IPC_GET_ARG3(*request);
+	devmap_handle_t devmap_handle = IPC_GET_ARG3(*request);
 	int lflag = IPC_GET_ARG4(*request);
 	fs_index_t index = IPC_GET_ARG5(*request);
@@ -295,10 +295,10 @@
 	fs_node_t *tmp = NULL;
 	
-	rc = ops->root_get(&cur, dev_handle);
+	rc = ops->root_get(&cur, devmap_handle);
 	on_error(rc, goto out_with_answer);
 	
 	if (cur->mp_data.mp_active) {
 		ipc_forward_slow(rid, cur->mp_data.phone, VFS_OUT_LOOKUP,
-		    next, last, cur->mp_data.dev_handle, lflag, index,
+		    next, last, cur->mp_data.devmap_handle, lflag, index,
 		    IPC_FF_ROUTE_FROM_ME);
 		(void) ops->node_put(cur);
@@ -358,5 +358,5 @@
 			
 			ipc_forward_slow(rid, tmp->mp_data.phone,
-			    VFS_OUT_LOOKUP, next, last, tmp->mp_data.dev_handle,
+			    VFS_OUT_LOOKUP, next, last, tmp->mp_data.devmap_handle,
 			    lflag, index, IPC_FF_ROUTE_FROM_ME);
 			(void) ops->node_put(cur);
@@ -385,8 +385,8 @@
 				fs_node_t *fn;
 				if (lflag & L_CREATE)
-					rc = ops->create(&fn, dev_handle,
+					rc = ops->create(&fn, devmap_handle,
 					    lflag);
 				else
-					rc = ops->node_get(&fn, dev_handle,
+					rc = ops->node_get(&fn, devmap_handle,
 					    index);
 				on_error(rc, goto out_with_answer);
@@ -401,5 +401,5 @@
 						aoff64_t size = ops->size_get(fn);
 						ipc_answer_5(rid, fs_handle,
-						    dev_handle,
+						    devmap_handle,
 						    ops->index_get(fn),
 						    LOWER32(size),
@@ -469,7 +469,7 @@
 			fs_node_t *fn;
 			if (lflag & L_CREATE)
-				rc = ops->create(&fn, dev_handle, lflag);
+				rc = ops->create(&fn, devmap_handle, lflag);
 			else
-				rc = ops->node_get(&fn, dev_handle, index);
+				rc = ops->node_get(&fn, devmap_handle, index);
 			on_error(rc, goto out_with_answer);
 			
@@ -483,5 +483,5 @@
 					aoff64_t size = ops->size_get(fn);
 					ipc_answer_5(rid, fs_handle,
-					    dev_handle,
+					    devmap_handle,
 					    ops->index_get(fn),
 					    LOWER32(size),
@@ -509,5 +509,5 @@
 		if (rc == EOK) {
 			aoff64_t size = ops->size_get(cur);
-			ipc_answer_5(rid, fs_handle, dev_handle,
+			ipc_answer_5(rid, fs_handle, devmap_handle,
 			    ops->index_get(cur), LOWER32(size), UPPER32(size),
 			    old_lnkcnt);
@@ -547,5 +547,5 @@
 		if (rc == EOK) {
 			aoff64_t size = ops->size_get(cur);
-			ipc_answer_5(rid, fs_handle, dev_handle,
+			ipc_answer_5(rid, fs_handle, devmap_handle,
 			    ops->index_get(cur), LOWER32(size), UPPER32(size),
 			    ops->lnkcnt_get(cur));
@@ -571,9 +571,9 @@
     ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 	
 	fs_node_t *fn;
-	int rc = ops->node_get(&fn, dev_handle, index);
+	int rc = ops->node_get(&fn, devmap_handle, index);
 	on_error(rc, answer_and_return(rid, rc));
 	
@@ -592,5 +592,5 @@
 	
 	stat.fs_handle = fs_handle;
-	stat.dev_handle = dev_handle;
+	stat.devmap_handle = devmap_handle;
 	stat.index = index;
 	stat.lnkcnt = ops->lnkcnt_get(fn);
@@ -617,9 +617,9 @@
     ipc_call_t *request)
 {
-	dev_handle_t dev_handle = IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = IPC_GET_ARG1(*request);
 	fs_index_t index = IPC_GET_ARG2(*request);
 	
 	fs_node_t *fn;
-	int rc = ops->node_get(&fn, dev_handle, index);
+	int rc = ops->node_get(&fn, devmap_handle, index);
 	on_error(rc, answer_and_return(rid, rc));
 	
Index: uspace/lib/fs/libfs.h
===================================================================
--- uspace/lib/fs/libfs.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/fs/libfs.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -47,5 +47,5 @@
 	int phone;
 	fs_handle_t fs_handle;
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 } mp_data_t;
 
@@ -61,10 +61,10 @@
 	 * argument holds the output argument.
 	 */
-	int (* root_get)(fs_node_t **, dev_handle_t);
+	int (* root_get)(fs_node_t **, devmap_handle_t);
 	int (* match)(fs_node_t **, fs_node_t *, const char *);
-	int (* node_get)(fs_node_t **, dev_handle_t, fs_index_t);
+	int (* node_get)(fs_node_t **, devmap_handle_t, fs_index_t);
 	int (* node_open)(fs_node_t *);
 	int (* node_put)(fs_node_t *);
-	int (* create)(fs_node_t **, dev_handle_t, int);
+	int (* create)(fs_node_t **, devmap_handle_t, int);
 	int (* destroy)(fs_node_t *);
 	int (* link)(fs_node_t *, fs_node_t *, const char *);
@@ -81,5 +81,5 @@
 	bool (* is_directory)(fs_node_t *);
 	bool (* is_file)(fs_node_t *);
-	dev_handle_t (* device_get)(fs_node_t *);
+	devmap_handle_t (* device_get)(fs_node_t *);
 } libfs_ops_t;
 
Index: uspace/lib/net/adt/module_map.c
===================================================================
--- uspace/lib/net/adt/module_map.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/adt/module_map.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -59,16 +59,16 @@
  *			running.
  * @param[in] connect_module The module connecting function.
- * @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.
  */
 int
-add_module(module_ref *module, modules_ref modules, const char *name,
+add_module(module_t **module, modules_t *modules, const char *name,
     const char *filename, services_t service, task_id_t task_id,
     connect_module_t connect_module)
 {
-	module_ref tmp_module;
+	module_t *tmp_module;
 	int rc;
 
-	tmp_module = (module_ref) malloc(sizeof(module_t));
+	tmp_module = (module_t *) malloc(sizeof(module_t));
 	if (!tmp_module)
 		return ENOMEM;
@@ -100,11 +100,11 @@
  * @param[in] modules	The module map.
  * @param[in] name	The module name.
- * @returns		The running module found. It does not have to be
+ * @return		The running module found. It does not have to be
  *			connected.
- * @returns		NULL if there is no such module.
+ * @return		NULL if there is no such module.
  */
-module_ref get_running_module(modules_ref modules, char *name)
+module_t *get_running_module(modules_t *modules, char *name)
 {
-	module_ref module;
+	module_t *module;
 
 	module = modules_find(modules, name, 0);
@@ -126,6 +126,6 @@
  *
  * @param[in] fname	The module full or relative path filename.
- * @returns		The new module task identifier on success.
- * @returns		Zero if there is no such module.
+ * @return		The new module task identifier on success.
+ * @return		Zero if there is no such module.
  */
 task_id_t spawn(const char *fname)
Index: uspace/lib/net/generic/generic.c
===================================================================
--- uspace/lib/net/generic/generic.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/generic/generic.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -92,13 +92,13 @@
  * @param[out] address	The desired address.
  * @param[out] data	The address data container.
- * @returns		EOK on success.
- * @returns		EBADMEM if the address parameter and/or the data
+ * @return		EOK on success.
+ * @return		EBADMEM if the address parameter and/or the data
  *			parameter is NULL.
- * @returns		Other error codes as defined for the specific service
+ * @return		Other error codes as defined for the specific service
  *			message.
  */
 int
 generic_get_addr_req(int phone, int message, device_id_t device_id,
-    measured_string_ref *address, char ** data)
+    measured_string_t **address, char ** data)
 {
 	aid_t message_id;
@@ -138,5 +138,5 @@
 int
 generic_packet_size_req_remote(int phone, int message, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
+    packet_dimension_t *packet_dimension)
 {
 	if (!packet_dimension)
@@ -223,16 +223,16 @@
  * @param[out] translation The translated values.
  * @param[out] data	The translation data container.
- * @returns		EOK on success.
- * @returns		EINVAL if the configuration parameter is NULL.
- * @returns		EINVAL if the count parameter is zero.
- * @returns		EBADMEM if the translation or the data parameters are
+ * @return		EOK on success.
+ * @return		EINVAL if the configuration parameter is NULL.
+ * @return		EINVAL if the count parameter is zero.
+ * @return		EBADMEM if the translation or the data parameters are
  *			NULL.
- * @returns		Other error codes as defined for the specific service
+ * @return		Other error codes as defined for the specific service
  *			message.
  */
 int
 generic_translate_req(int phone, int message, device_id_t device_id,
-    services_t service, measured_string_ref configuration, size_t count,
-    measured_string_ref *translation, char **data)
+    services_t service, measured_string_t *configuration, size_t count,
+    measured_string_t **translation, char **data)
 {
 	aid_t message_id;
Index: uspace/lib/net/generic/net_checksum.c
===================================================================
--- uspace/lib/net/generic/net_checksum.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/generic/net_checksum.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -48,5 +48,5 @@
  *
  * @param[in] sum	Computed checksum.
- * @returns		Compacted computed checksum to the 16 bits.
+ * @return		Compacted computed checksum to the 16 bits.
  */
 uint16_t compact_checksum(uint32_t sum)
@@ -66,5 +66,5 @@
  * @param[in] data	Pointer to the beginning of data to process.
  * @param[in] length	Length of the data in bytes.
- * @returns		The computed checksum of the length bytes of the data.
+ * @return		The computed checksum of the length bytes of the data.
  */
 uint32_t compute_checksum(uint32_t seed, uint8_t *data, size_t length)
@@ -88,5 +88,5 @@
  * @param[in] data	Pointer to the beginning of data to process.
  * @param[in] length	Length of the data in bits.
- * @returns		The computed CRC32 of the length bits of the data.
+ * @return		The computed CRC32 of the length bits of the data.
  */
 uint32_t compute_crc32_be(uint32_t seed, uint8_t * data, size_t length)
@@ -142,5 +142,5 @@
  * @param[in] data	Pointer to the beginning of data to process.
  * @param[in] length	Length of the data in bits.
- * @returns		The computed CRC32 of the length bits of the data.
+ * @return		The computed CRC32 of the length bits of the data.
  */
 uint32_t compute_crc32_le(uint32_t seed, uint8_t * data, size_t length)
@@ -193,6 +193,6 @@
  *
  * @param[in] checksum	The computed checksum.
- * @returns		The internet protocol header checksum.
- * @returns		0xFFFF if the computed checksum is zero.
+ * @return		The internet protocol header checksum.
+ * @return		0xFFFF if the computed checksum is zero.
  */
 uint16_t flip_checksum(uint16_t checksum)
@@ -211,6 +211,6 @@
  * @param[in] data	The header data.
  * @param[in] length	The header length in bytes.
- * @returns		The internet protocol header checksum.
- * @returns		0xFFFF if the computed checksum is zero.
+ * @return		The internet protocol header checksum.
+ * @return		0xFFFF if the computed checksum is zero.
  */
 uint16_t ip_checksum(uint8_t *data, size_t length)
Index: uspace/lib/net/generic/net_remote.c
===================================================================
--- uspace/lib/net/generic/net_remote.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/generic/net_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -49,5 +49,5 @@
 /** Connects to the networking module.
  *
- * @returns		The networking module phone on success.
+ * @return		The networking module phone on success.
  */
 int net_connect_module(void)
@@ -63,5 +63,5 @@
  * @see net_get_conf_req()
  */
-void net_free_settings(measured_string_ref settings, char *data)
+void net_free_settings(measured_string_t *settings, char *data)
 {
 	if (settings)
@@ -83,12 +83,12 @@
  * @param[in] count	The configuration entries count.
  * @param[in,out] data	The configuration and settings data.
- * @returns		EOK on success.
- * @returns		EINVAL if the configuration is NULL.
- * @returns		EINVAL if the count is zero.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EINVAL if the configuration is NULL.
+ * @return		EINVAL if the count is zero.
+ * @return		Other error codes as defined for the
  *			generic_translate_req() function.
  */
 int
-net_get_conf_req(int net_phone, measured_string_ref *configuration,
+net_get_conf_req(int net_phone, measured_string_t **configuration,
     size_t count, char **data)
 {
@@ -110,13 +110,13 @@
  * @param[in] count	The configuration entries count.
  * @param[in,out] data	The configuration and settings data.
- * @returns		EOK on success.
- * @returns		EINVAL if the configuration is NULL.
- * @returns		EINVAL if the count is zero.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EINVAL if the configuration is NULL.
+ * @return		EINVAL if the count is zero.
+ * @return		Other error codes as defined for the
  *			generic_translate_req() function.
  */
 int
 net_get_device_conf_req(int net_phone, device_id_t device_id,
-    measured_string_ref *configuration, size_t count, char **data)
+    measured_string_t **configuration, size_t count, char **data)
 {
 	return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,
Index: uspace/lib/net/generic/packet_client.c
===================================================================
--- uspace/lib/net/generic/packet_client.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/generic/packet_client.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -53,7 +53,7 @@
  * @param[in] data	The data to be copied.
  * @param[in] length	The length of the copied data.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int packet_copy_data(packet_t packet, const void *data, size_t length)
@@ -78,6 +78,6 @@
  * @param[in] length	The space length to be allocated at the beginning of the
  *			packet content.
- * @returns		The pointer to the allocated memory.
- * @returns		NULL if there is not enough memory left.
+ * @return		The pointer to the allocated memory.
+ * @return		NULL if there is not enough memory left.
  */
 void *packet_prefix(packet_t packet, size_t length)
@@ -99,6 +99,6 @@
  * @param[in] length	The space length to be allocated at the end of the
  *			 packet content.
- * @returns		The pointer to the allocated memory.
- * @returns		NULL if there is not enough memory left.
+ * @return		The pointer to the allocated memory.
+ * @return		NULL if there is not enough memory left.
  */
 void *packet_suffix(packet_t packet, size_t length)
@@ -120,7 +120,7 @@
  * @param[in] suffix	The suffix length to be removed from the end of the
  *			packet content.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int packet_trim(packet_t packet, size_t prefix, size_t suffix)
@@ -140,6 +140,6 @@
  *
  * @param[in] packet	The packet.
- * @returns		The packet identifier.
- * @returns		Zero if the packet is not valid.
+ * @return		The packet identifier.
+ * @return		Zero if the packet is not valid.
  */
 packet_id_t packet_get_id(const packet_t packet)
@@ -153,7 +153,7 @@
  * @param[out] src	The source address. May be NULL if not desired.
  * @param[out] dest	The destination address. May be NULL if not desired.
- * @returns		The stored addresses length.
- * @returns		Zero if the addresses are not present.
- * @returns		EINVAL if the packet is not valid.
+ * @return		The stored addresses length.
+ * @return		Zero if the addresses are not present.
+ * @return		EINVAL if the packet is not valid.
  */
 int packet_get_addr(const packet_t packet, uint8_t **src, uint8_t **dest)
@@ -174,6 +174,6 @@
  *
  * @param[in] packet	The packet.
- * @returns		The packet content length in bytes.
- * @returns		Zero if the packet is not valid.
+ * @return		The packet content length in bytes.
+ * @return		Zero if the packet is not valid.
  */
 size_t packet_get_data_length(const packet_t packet)
@@ -188,6 +188,6 @@
  *
  * @param[in] packet	The packet.
- * @returns		The pointer to the beginning of the packet content.
- * @returns		NULL if the packet is not valid.
+ * @return		The pointer to the beginning of the packet content.
+ * @return		NULL if the packet is not valid.
  */
 void *packet_get_data(const packet_t packet)
@@ -205,7 +205,7 @@
  * @param[in] dest	The new destination address. May be NULL.
  * @param[in] addr_len	The addresses length.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -254,6 +254,6 @@
  * @param[in] phone	The packet server module phone.
  * @param[in] packet	The original packet.
- * @returns		The packet copy.
- * @returns		NULL on error.
+ * @return		The packet copy.
+ * @return		NULL on error.
  */
 packet_t packet_get_copy(int phone, packet_t packet)
Index: uspace/lib/net/generic/packet_remote.c
===================================================================
--- uspace/lib/net/generic/packet_remote.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/generic/packet_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -64,5 +64,5 @@
  */
 static int
-packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
+packet_return(int phone, packet_t *packet, packet_id_t packet_id, size_t size)
 {
 	ipc_call_t answer;
@@ -100,12 +100,12 @@
  * @param[out] packet	The packet reference.
  * @param[in] packet_id	The packet identifier.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet parameter is NULL.
- * @returns		Other error codes as defined for the NET_PACKET_GET_SIZE
+ * @return		EOK on success.
+ * @return		EINVAL if the packet parameter is NULL.
+ * @return		Other error codes as defined for the NET_PACKET_GET_SIZE
  *			message.
- * @returns		Other error codes as defined for the packet_return()
+ * @return		Other error codes as defined for the packet_return()
  *			function.
  */
-int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id)
+int packet_translate_remote(int phone, packet_t *packet, packet_id_t packet_id)
 {
 	int rc;
@@ -145,6 +145,6 @@
  * @param[in] max_content The maximal content length in bytes.
  * @param[in] max_suffix The maximal suffix length in bytes.
- * @returns		The packet reference.
- * @returns		NULL on error.
+ * @return		The packet reference.
+ * @return		NULL on error.
  */
 packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
@@ -177,6 +177,6 @@
  * @param[in] phone	The packet server module phone.
  * @param[in] content	The maximal content length in bytes.
- * @returns		The packet reference.
- * @returns		NULL on error.
+ * @return		The packet reference.
+ * @return		NULL on error.
  */
 packet_t packet_get_1_remote(int phone, size_t content)
Index: uspace/lib/net/generic/protocol_map.c
===================================================================
--- uspace/lib/net/generic/protocol_map.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/generic/protocol_map.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -42,7 +42,7 @@
  * @param[in] nil	Network interface layer service.
  * @param[in] il	Internetwork layer service.
- * @returns		Network interface layer type of the internetworking
+ * @return		Network interface layer type of the internetworking
  *			layer service.
- * @returns		Zero if mapping is not found.
+ * @return		Zero if mapping is not found.
  */
 eth_type_t protocol_map(services_t nil, services_t il)
@@ -68,7 +68,7 @@
  * @param[in] nil	Network interface layer service.
  * @param[in] protocol	Network interface layer type.
- * @returns		Internetwork layer service of the network interface
+ * @return		Internetwork layer service of the network interface
  *			layer type.
- * @returns		Zero if mapping is not found.
+ * @return		Zero if mapping is not found.
  */
 services_t protocol_unmap(services_t nil, int protocol)
@@ -94,7 +94,7 @@
  *
  * @param[in] lsap	Link service access point identifier.
- * @returns		Ethernet protocol identifier of the link service access
+ * @return		Ethernet protocol identifier of the link service access
  *			point identifier.
- * @returns		ETH_LSAP_NULL if mapping is not found.
+ * @return		ETH_LSAP_NULL if mapping is not found.
  */
 eth_type_t lsap_map(eth_lsap_t lsap)
@@ -114,6 +114,6 @@
  *
  * @param[in] ethertype	Ethernet protocol identifier.
- * @returns		Link service access point identifier.
- * @returns		Zero if mapping is not found.
+ * @return		Link service access point identifier.
+ * @return		Zero if mapping is not found.
  */
 eth_lsap_t lsap_unmap(eth_type_t ethertype)
@@ -132,6 +132,6 @@
  *
  * @param[in] nil	The network interface service.
- * @returns		The hardware type of the network interface service.
- * @returns		Zero if mapping is not found.
+ * @return		The hardware type of the network interface service.
+ * @return		Zero if mapping is not found.
  */
 hw_type_t hardware_map(services_t nil)
Index: uspace/lib/net/il/arp_remote.c
===================================================================
--- uspace/lib/net/il/arp_remote.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/il/arp_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -52,5 +52,5 @@
  *
  * @param service	The ARP module service. Ignored parameter.
- * @returns		The ARP module phone on success.
+ * @return		The ARP module phone on success.
  */
 int arp_connect_module(services_t service)
@@ -65,5 +65,5 @@
  *
  * @param[in] arp_phone	The ARP module phone used for (semi)remote calls.
- * @returns		EOK on success.
+ * @return		EOK on success.
  */
 int arp_clean_cache_req(int arp_phone)
@@ -78,10 +78,10 @@
  * @param[in] protocol	The requesting protocol service.
  * @param[in] address	The protocol address to be cleared.
- * @returns		EOK on success.
- * @returns		ENOENT if the mapping is not found.
+ * @return		EOK on success.
+ * @return		ENOENT if the mapping is not found.
  */
 int
 arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address)
+    measured_string_t *address)
 {
 	aid_t message_id;
@@ -100,6 +100,6 @@
  * @param[in] arp_phone	The ARP module phone used for (semi)remote calls.
  * @param[in] device_id	The device identifier.
- * @returns		EOK on success.
- * @returns		ENOENT if the device is not found.
+ * @return		EOK on success.
+ * @return		ENOENT if the device is not found.
  */
 int arp_clear_device_req(int arp_phone, device_id_t device_id)
@@ -119,19 +119,19 @@
  * @param[in] netif	The underlying device network interface layer service.
  * @param[in] address	The local requesting protocol address of the device.
- * @returns		EOK on success.
- * @returns		EEXIST if the device is already used.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		ENOENT if the network interface service is not known.
- * @returns		EREFUSED if the network interface service is not
+ * @return		EOK on success.
+ * @return		EEXIST if the device is already used.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		ENOENT if the network interface service is not known.
+ * @return		EREFUSED if the network interface service is not
  *			responding.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			nil_packet_get_size() function.
- * @returns		Other error codes as defined for the nil_get_addr()
+ * @return		Other error codes as defined for the nil_get_addr()
  *			function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			nil_get_broadcast_addr() function.
  */
 int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol,
-    services_t netif, measured_string_ref address)
+    services_t netif, measured_string_t *address)
 {
 	aid_t message_id;
@@ -157,13 +157,13 @@
  * @param[out] translation The translation of the local protocol address.
  * @param[out] data	The allocated raw translation data container.
- * @returns		EOK on success.
- * @returns		EINVAL if the address parameter is NULL.
- * @returns		EBADMEM if the translation or the data parameters are
+ * @return		EOK on success.
+ * @return		EINVAL if the address parameter is NULL.
+ * @return		EBADMEM if the translation or the data parameters are
  *			NULL.
- * @returns		ENOENT if the mapping is not found.
+ * @return		ENOENT if the mapping is not found.
  */
 int
 arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address, measured_string_ref *translation, char **data)
+    measured_string_t *address, measured_string_t **translation, char **data)
 {
 	return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id,
Index: uspace/lib/net/il/ip_client.c
===================================================================
--- uspace/lib/net/il/ip_client.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/il/ip_client.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -48,12 +48,12 @@
  *
  * @param[in] packet	The packet.
- * @returns		The IP header length in bytes.
- * @returns		Zero if there is no IP header.
+ * @return		The IP header length in bytes.
+ * @return		Zero if there is no IP header.
  */
 size_t ip_client_header_length(packet_t packet)
 {
-	ip_header_ref header;
-
-	header = (ip_header_ref) packet_get_data(packet);
+	ip_header_t *header;
+
+	header = (ip_header_t *) packet_get_data(packet);
 	if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
 		return 0;
@@ -72,17 +72,17 @@
  * @param[out] header	The constructed IPv4 pseudo header.
  * @param[out] headerlen The length of the IP pseudo header in bytes.
- * @returns		EOK on success.
- * @returns		EBADMEM if the header and/or the headerlen parameter is
+ * @return		EOK on success.
+ * @return		EBADMEM if the header and/or the headerlen parameter is
  *			NULL.
- * @returns		EINVAL if the source address and/or the destination
+ * @return		EINVAL if the source address and/or the destination
  *			address parameter is NULL.
- * @returns		EINVAL if the source address length is less than struct
+ * @return		EINVAL if the source address length is less than struct
  *			sockaddr length.
- * @returns		EINVAL if the source address length differs from the
+ * @return		EINVAL if the source address length differs from the
  *			destination address length.
- * @returns		EINVAL if the source address family differs from the
+ * @return		EINVAL if the source address family differs from the
  *			destination family.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -91,5 +91,5 @@
     size_t data_length, void **header, size_t *headerlen)
 {
-	ipv4_pseudo_header_ref header_in;
+	ipv4_pseudo_header_t *header_in;
 	struct sockaddr_in *address_in;
 
@@ -109,5 +109,5 @@
 		
 		*headerlen = sizeof(*header_in);
-		header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+		header_in = (ipv4_pseudo_header_t *) malloc(*headerlen);
 		if (!header_in)
 			return ENOMEM;
@@ -148,6 +148,6 @@
  *			disabled.
  * @param[in] ipopt_length The prefixed IP options length in bytes.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left in the packet.
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left in the packet.
  */
 int
@@ -155,5 +155,5 @@
     ip_tos_t tos, int dont_fragment, size_t ipopt_length)
 {
-	ip_header_ref header;
+	ip_header_t *header;
 	uint8_t *data;
 	size_t padding;
@@ -177,5 +177,5 @@
 
 	// set the header
-	header = (ip_header_ref) data;
+	header = (ip_header_t *) data;
 	header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +
 	    ipopt_length);
@@ -203,6 +203,6 @@
  * @param[out] ipopt_length The IP options length in bytes. May be NULL if not
  *			desired.
- * @returns		The prefixed IP header length in bytes on success.
- * @returns		ENOMEM if the packet is too short to contain the IP
+ * @return		The prefixed IP header length in bytes on success.
+ * @return		ENOMEM if the packet is too short to contain the IP
  *			header.
  */
@@ -211,7 +211,7 @@
     ip_ttl_t *ttl, ip_tos_t *tos, int *dont_fragment, size_t *ipopt_length)
 {
-	ip_header_ref header;
-
-	header = (ip_header_ref) packet_get_data(packet);
+	ip_header_t *header;
+
+	header = (ip_header_t *) packet_get_data(packet);
 	if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
 		return ENOMEM;
@@ -238,7 +238,7 @@
  * @param[in] headerlen	The length of the IP pseudo header in bytes.
  * @param[in] data_length The data length to be set.
- * @returns		EOK on success.
- * @returns		EBADMEM if the header parameter is NULL.
- * @returns		EINVAL if the headerlen parameter is not IPv4 pseudo
+ * @return		EOK on success.
+ * @return		EBADMEM if the header parameter is NULL.
+ * @return		EINVAL if the headerlen parameter is not IPv4 pseudo
  *			header length.
  */
@@ -247,5 +247,5 @@
     size_t data_length)
 {
-	ipv4_pseudo_header_ref header_in;
+	ipv4_pseudo_header_t *header_in;
 
 	if (!header)
@@ -253,5 +253,5 @@
 
 	if (headerlen == sizeof(ipv4_pseudo_header_t)) {
-		header_in = (ipv4_pseudo_header_ref) header;
+		header_in = (ipv4_pseudo_header_t *) header;
 		header_in->data_length = htons(data_length);
 		return EOK;
Index: uspace/lib/net/il/ip_remote.c
===================================================================
--- uspace/lib/net/il/ip_remote.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/il/ip_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -78,7 +78,7 @@
  * @param[in] me	The requesting module service.
  * @param[in] receiver	The message receiver. Used for remote connection.
- * @returns		The phone of the needed service.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the bind_service()
+ * @return		The phone of the needed service.
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the bind_service()
  *			function.
  */
@@ -93,5 +93,5 @@
  *
  * @param service	The IP module service. Ignored parameter.
- * @returns		The IP module phone on success.
+ * @return		The IP module phone on success.
  */
 int ip_connect_module(services_t service)
@@ -186,5 +186,5 @@
  */
 int ip_packet_size_req_remote(int ip_phone, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
+    packet_dimension_t *packet_dimension)
 {
 	return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,
Index: uspace/lib/net/include/adt/module_map.h
===================================================================
--- uspace/lib/net/include/adt/module_map.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/adt/module_map.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -48,9 +48,4 @@
 typedef struct module_struct module_t;
 
-/** Type definition of the module structure pointer.
- * @see module_struct
- */
-typedef module_t *module_ref;
-
 /** Module map.
  * Sorted by module names.
@@ -77,7 +72,7 @@
 };
 
-extern int add_module(module_ref *, modules_ref, const char *, const char *,
+extern int add_module(module_t **, modules_t *, const char *, const char *,
     services_t, task_id_t, connect_module_t *);
-extern module_ref get_running_module(modules_ref, char *);
+extern module_t *get_running_module(modules_t *, char *);
 extern task_id_t spawn(const char *);
 
Index: uspace/lib/net/include/arp_interface.h
===================================================================
--- uspace/lib/net/include/arp_interface.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/arp_interface.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -48,10 +48,10 @@
 
 extern int arp_device_req(int, device_id_t, services_t, services_t,
-    measured_string_ref);
-extern int arp_translate_req(int, device_id_t, services_t, measured_string_ref,
-    measured_string_ref *, char **);
+    measured_string_t *);
+extern int arp_translate_req(int, device_id_t, services_t, measured_string_t *,
+    measured_string_t **, char **);
 extern int arp_clear_device_req(int, device_id_t);
 extern int arp_clear_address_req(int, device_id_t, services_t,
-    measured_string_ref);
+    measured_string_t *);
 extern int arp_clean_cache_req(int);
 extern int arp_connect_module(services_t);
Index: uspace/lib/net/include/generic.h
===================================================================
--- uspace/lib/net/include/generic.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/generic.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -49,8 +49,8 @@
     services_t);
 extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
-extern int generic_get_addr_req(int, int, device_id_t, measured_string_ref *,
+extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **,
     char **);
 extern int generic_packet_size_req_remote(int, int, device_id_t,
-    packet_dimension_ref);
+    packet_dimension_t *);
 extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t,
     services_t, services_t);
@@ -58,5 +58,5 @@
     services_t, services_t);
 extern int generic_translate_req(int, int, device_id_t, services_t,
-    measured_string_ref, size_t, measured_string_ref *, char **);
+    measured_string_t *, size_t, measured_string_t **, char **);
 
 #endif
Index: uspace/lib/net/include/icmp_header.h
===================================================================
--- uspace/lib/net/include/icmp_header.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/icmp_header.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -52,9 +52,4 @@
 typedef struct icmp_echo icmp_echo_t;
 
-/** Type definition of the echo specific data pointer.
- * @see icmp_echo
- */
-typedef icmp_echo_t *icmp_echo_ref;
-
 /** Echo specific data. */
 struct icmp_echo {
@@ -69,9 +64,4 @@
  */
 typedef struct icmp_header icmp_header_t;
-
-/** Type definition of the internet control message header pointer.
- * @see icmp_header
- */
-typedef icmp_header_t *icmp_header_ref;
 
 /** Internet control message header. */
Index: uspace/lib/net/include/il_local.h
===================================================================
--- uspace/lib/net/include/il_local.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/il_local.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -44,6 +44,6 @@
  * @param[out]		answer_count The last parameter for the actual answer in
  *			the answer parameter.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the arp_message()
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the arp_message()
  *			function.
  */
@@ -59,8 +59,8 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @returns		EOK on successful module termination.
- * @returns		Other error codes as defined for the arp_initialize()
+ * @return		EOK on successful module termination.
+ * @return		Other error codes as defined for the arp_initialize()
  *			function.
- * @returns		Other error codes as defined for the REGISTER_ME() macro
+ * @return		Other error codes as defined for the REGISTER_ME() macro
  *			function.
  */
Index: uspace/lib/net/include/ip_header.h
===================================================================
--- uspace/lib/net/include/ip_header.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/ip_header.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -127,9 +127,4 @@
 typedef struct ip_header ip_header_t;
 
-/** Type definition of the internet header pointer.
- * @see ip_header
- */
-typedef ip_header_t *ip_header_ref;
-
 /** Type definition of the internet option header.
  * @see ip_header
@@ -137,18 +132,8 @@
 typedef struct ip_option ip_option_t;
 
-/** Type definition of the internet option header pointer.
- * @see ip_header
- */
-typedef ip_option_t *ip_option_ref;
-
 /** Type definition of the internet version 4 pseudo header.
  * @see ipv4_pseudo_header
  */
 typedef struct ipv4_pseudo_header ipv4_pseudo_header_t;
-
-/** Type definition of the internet version 4 pseudo header pointer.
- * @see ipv4_pseudo_header
- */
-typedef ipv4_pseudo_header_t *ipv4_pseudo_header_ref;
 
 /** Internet header.
Index: uspace/lib/net/include/ip_interface.h
===================================================================
--- uspace/lib/net/include/ip_interface.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/ip_interface.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -68,5 +68,5 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
+ * @return		EOK on success.
  */
 typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t packet,
Index: uspace/lib/net/include/ip_remote.h
===================================================================
--- uspace/lib/net/include/ip_remote.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/ip_remote.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -44,5 +44,5 @@
 
 extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);
-extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_ref);
+extern int ip_packet_size_req_remote(int, device_id_t, packet_dimension_t *);
 extern int ip_received_error_msg_remote(int, device_id_t, packet_t, services_t,
     services_t);
Index: uspace/lib/net/include/net_interface.h
===================================================================
--- uspace/lib/net/include/net_interface.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/net_interface.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -44,8 +44,8 @@
 /*@{*/
 
-extern int net_get_device_conf_req(int, device_id_t, measured_string_ref *,
+extern int net_get_device_conf_req(int, device_id_t, measured_string_t **,
     size_t, char **);
-extern int net_get_conf_req(int, measured_string_ref *, size_t, char **);
-extern void net_free_settings(measured_string_ref, char *);
+extern int net_get_conf_req(int, measured_string_t **, size_t, char **);
+extern void net_free_settings(measured_string_t *, char *);
 extern int net_connect_module(void);
 
Index: uspace/lib/net/include/netif_local.h
===================================================================
--- uspace/lib/net/include/netif_local.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/netif_local.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -158,5 +158,5 @@
  */
 extern int netif_get_addr_message(device_id_t device_id,
-    measured_string_ref address);
+    measured_string_t *address);
 
 /** Process the netif driver specific message.
@@ -193,7 +193,7 @@
  */
 extern int netif_get_device_stats(device_id_t device_id,
-    device_stats_ref stats);
-
-extern int netif_get_addr_req_local(int, device_id_t, measured_string_ref *,
+    device_stats_t *stats);
+
+extern int netif_get_addr_req_local(int, device_id_t, measured_string_t **,
     char **);
 extern int netif_probe_req_local(int, device_id_t, int, int);
@@ -201,10 +201,10 @@
 extern int netif_start_req_local(int, device_id_t);
 extern int netif_stop_req_local(int, device_id_t);
-extern int netif_stats_req_local(int, device_id_t, device_stats_ref);
+extern int netif_stats_req_local(int, device_id_t, device_stats_t *);
 extern int netif_bind_service_local(services_t, device_id_t, services_t,
     async_client_conn_t);
 
 extern int find_device(device_id_t, netif_device_t **);
-extern void null_device_stats(device_stats_ref);
+extern void null_device_stats(device_stats_t *);
 extern void netif_pq_release(packet_id_t);
 extern packet_t netif_packet_get_1(size_t);
Index: uspace/lib/net/include/netif_remote.h
===================================================================
--- uspace/lib/net/include/netif_remote.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/netif_remote.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -41,5 +41,5 @@
 #include <net/packet.h>
 
-extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,
+extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **,
     char **);
 extern int netif_probe_req_remote(int, device_id_t, int, int);
@@ -47,5 +47,5 @@
 extern int netif_start_req_remote(int, device_id_t);
 extern int netif_stop_req_remote(int, device_id_t);
-extern int netif_stats_req_remote(int, device_id_t, device_stats_ref);
+extern int netif_stats_req_remote(int, device_id_t, device_stats_t *);
 extern int netif_bind_service_remote(services_t, device_id_t, services_t,
     async_client_conn_t);
Index: uspace/lib/net/include/packet_client.h
===================================================================
--- uspace/lib/net/include/packet_client.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/packet_client.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -61,7 +61,7 @@
  * @param[in] type	The type to be allocated at the beginning of the packet
  *			content.
- * @returns		The typed pointer to the allocated memory.
- * @returns		NULL if the packet is not valid.
- * @returns		NULL if there is not enough memory left.
+ * @return		The typed pointer to the allocated memory.
+ * @return		NULL if the packet is not valid.
+ * @return		NULL if there is not enough memory left.
  */
 #define PACKET_PREFIX(packet, type) \
@@ -76,7 +76,7 @@
  * @param[in] type	The type to be allocated at the end of the packet
  *			content.
- * @returns		The typed pointer to the allocated memory.
- * @returns		NULL if the packet is not valid.
- * @returns		NULL if there is not enough memory left.
+ * @return		The typed pointer to the allocated memory.
+ * @return		NULL if the packet is not valid.
+ * @return		NULL if there is not enough memory left.
  */
 #define PACKET_SUFFIX(packet, type) \
@@ -92,7 +92,7 @@
  * @param[in] suffix	The type of the suffix to be removed from the end of
  *			the packet content.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 #define PACKET_TRIM(packet, prefix, suffix) \
Index: uspace/lib/net/include/packet_remote.h
===================================================================
--- uspace/lib/net/include/packet_remote.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/packet_remote.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -37,5 +37,5 @@
 #include <sys/types.h>
 
-extern int packet_translate_remote(int, packet_ref, packet_id_t);
+extern int packet_translate_remote(int, packet_t *, packet_id_t);
 extern packet_t packet_get_4_remote(int, size_t, size_t, size_t, size_t);
 extern packet_t packet_get_1_remote(int, size_t);
Index: uspace/lib/net/include/socket_core.h
===================================================================
--- uspace/lib/net/include/socket_core.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/socket_core.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -66,18 +66,8 @@
 typedef struct socket_core socket_core_t;
 
-/** Type definition of the socket core pointer.
- * @see socket_core
- */
-typedef socket_core_t *socket_core_ref;
-
 /** Type definition of the socket port.
  * @see socket_port
  */
 typedef struct socket_port socket_port_t;
-
-/** Type definition of the socket port pointer.
- * @see socket_port
- */
-typedef socket_port_t *socket_port_ref;
 
 /** Socket core. */
@@ -111,5 +101,5 @@
  * the other use the remote addresses.
  */
-GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_ref);
+GENERIC_CHAR_MAP_DECLARE(socket_port_map, socket_core_t *);
 
 /** Ports map.
@@ -118,18 +108,18 @@
 INT_MAP_DECLARE(socket_ports, socket_port_t);
 
-extern void socket_cores_release(int, socket_cores_ref, socket_ports_ref,
-    void (*)(socket_core_ref));
-extern int socket_bind(socket_cores_ref, socket_ports_ref, int, void *, size_t,
+extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *,
+    void (*)(socket_core_t *));
+extern int socket_bind(socket_cores_t *, socket_ports_t *, int, void *, size_t,
     int, int, int);
-extern int socket_bind_free_port(socket_ports_ref, socket_core_ref, int, int,
+extern int socket_bind_free_port(socket_ports_t *, socket_core_t *, int, int,
     int);
-extern int socket_create(socket_cores_ref, int, void *, int *);
-extern int socket_destroy(int, int, socket_cores_ref, socket_ports_ref,
-    void (*)(socket_core_ref));
+extern int socket_create(socket_cores_t *, int, void *, int *);
+extern int socket_destroy(int, int, socket_cores_t *, socket_ports_t *,
+    void (*)(socket_core_t *));
 extern int socket_reply_packets(packet_t, size_t *);
-extern socket_core_ref socket_port_find(socket_ports_ref, int, const char *,
+extern socket_core_t *socket_port_find(socket_ports_t *, int, const char *,
     size_t);
-extern void socket_port_release(socket_ports_ref, socket_core_ref);
-extern int socket_port_add(socket_ports_ref, int, socket_core_ref,
+extern void socket_port_release(socket_ports_t *, socket_core_t *);
+extern int socket_port_add(socket_ports_t *, int, socket_core_t *,
     const char *, size_t);
 
Index: uspace/lib/net/include/tl_common.h
===================================================================
--- uspace/lib/net/include/tl_common.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/tl_common.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -51,13 +51,13 @@
 DEVICE_MAP_DECLARE(packet_dimensions, packet_dimension_t);
 
-extern int tl_get_ip_packet_dimension(int, packet_dimensions_ref,
-    device_id_t, packet_dimension_ref *);
+extern int tl_get_ip_packet_dimension(int, packet_dimensions_t *,
+    device_id_t, packet_dimension_t **);
 extern int tl_get_address_port(const struct sockaddr *, int, uint16_t *);
-extern int tl_update_ip_packet_dimension(packet_dimensions_ref, device_id_t,
+extern int tl_update_ip_packet_dimension(packet_dimensions_t *, device_id_t,
     size_t);
 extern int tl_set_address_port(struct sockaddr *, int, uint16_t);
 extern int tl_prepare_icmp_packet(int, int, packet_t, services_t);
-extern int tl_socket_read_packet_data(int, packet_ref, size_t,
-    const packet_dimension_ref, const struct sockaddr *, socklen_t);
+extern int tl_socket_read_packet_data(int, packet_t *, size_t,
+    const packet_dimension_t *, const struct sockaddr *, socklen_t);
 
 #endif
Index: uspace/lib/net/include/tl_local.h
===================================================================
--- uspace/lib/net/include/tl_local.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/include/tl_local.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -45,8 +45,8 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @returns		EOK on successful module termination.
- * @returns		Other error codes as defined for the module initialize
+ * @return		EOK on successful module termination.
+ * @return		Other error codes as defined for the module initialize
  *			function.
- * @returns		Other error codes as defined for the REGISTER_ME() macro
+ * @return		Other error codes as defined for the REGISTER_ME() macro
  *			function.
  */
@@ -62,6 +62,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the module's message
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the module's message
  *			standalone function.
  */
Index: uspace/lib/net/netif/netif_local.c
===================================================================
--- uspace/lib/net/netif/netif_local.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/netif/netif_local.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -181,5 +181,5 @@
  */
 int netif_stats_req_local(int netif_phone, device_id_t device_id,
-    device_stats_ref stats)
+    device_stats_t *stats)
 {
 	fibril_rwlock_read_lock(&netif_globals.lock);
@@ -203,5 +203,5 @@
  */
 int netif_get_addr_req_local(int netif_phone, device_id_t device_id,
-    measured_string_ref *address, char **data)
+    measured_string_t **address, char **data)
 {
 	int rc;
@@ -253,5 +253,5 @@
  * @param[in] stats	The usage statistics.
  */
-void null_device_stats(device_stats_ref stats)
+void null_device_stats(device_stats_t *stats)
 {
 	bzero(stats, sizeof(device_stats_t));
Index: uspace/lib/net/netif/netif_remote.c
===================================================================
--- uspace/lib/net/netif/netif_remote.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/netif/netif_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -60,5 +60,5 @@
  */
 int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
-    measured_string_ref *address, char **data)
+    measured_string_t **address, char **data)
 {
 	return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id,
@@ -138,5 +138,5 @@
  */
 int netif_stats_req_remote(int netif_phone, device_id_t device_id,
-    device_stats_ref stats)
+    device_stats_t *stats)
 {
 	if (!stats)
Index: uspace/lib/net/tl/icmp_client.c
===================================================================
--- uspace/lib/net/tl/icmp_client.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ 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
@@ -64,7 +64,7 @@
     icmp_code_t *code, icmp_param_t *pointer, icmp_param_t *mtu)
 {
-	icmp_header_ref header;
+	icmp_header_t *header;
 
-	header = (icmp_header_ref) packet_get_data(packet);
+	header = (icmp_header_t *) packet_get_data(packet);
 	if (!header ||
 	    (packet_get_data_length(packet) < sizeof(icmp_header_t))) {
@@ -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 b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ 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 b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/net/tl/socket_core.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -68,5 +68,5 @@
 INT_MAP_IMPLEMENT(socket_cores, socket_core_t);
 
-GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_ref);
+GENERIC_CHAR_MAP_IMPLEMENT(socket_port_map, socket_core_t *);
 
 INT_MAP_IMPLEMENT(socket_ports, socket_port_t);
@@ -85,7 +85,7 @@
  */
 static void
-socket_destroy_core(int packet_phone, socket_core_ref socket,
-    socket_cores_ref local_sockets, socket_ports_ref global_sockets,
-    void (* socket_release)(socket_core_ref socket))
+socket_destroy_core(int packet_phone, socket_core_t *socket,
+    socket_cores_t *local_sockets, socket_ports_t *global_sockets,
+    void (* socket_release)(socket_core_t *socket))
 {
 	int packet_id;
@@ -121,7 +121,7 @@
  */
 void
-socket_cores_release(int packet_phone, socket_cores_ref local_sockets,
-    socket_ports_ref global_sockets,
-    void (* socket_release)(socket_core_ref socket))
+socket_cores_release(int packet_phone, socket_cores_t *local_sockets,
+    socket_ports_t *global_sockets,
+    void (* socket_release)(socket_core_t *socket))
 {
 	int index;
@@ -156,12 +156,12 @@
  * @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
-socket_port_add_core(socket_port_ref socket_port, socket_core_ref socket,
+socket_port_add_core(socket_port_t *socket_port, socket_core_t *socket,
     const char *key, size_t key_length)
 {
-	socket_core_ref *socket_ref;
+	socket_core_t **socket_ref;
 	int rc;
 
@@ -194,14 +194,14 @@
  * @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.
  */
 static int
-socket_bind_insert(socket_ports_ref global_sockets, socket_core_ref socket,
+socket_bind_insert(socket_ports_t *global_sockets, socket_core_t *socket,
     int port)
 {
-	socket_port_ref socket_port;
+	socket_port_t *socket_port;
 	int rc;
 
@@ -248,20 +248,20 @@
  * @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.
  */
 int
-socket_bind(socket_cores_ref local_sockets, socket_ports_ref global_sockets,
+socket_bind(socket_cores_t *local_sockets, socket_ports_t *global_sockets,
     int socket_id, void *addr, size_t addrlen, int free_ports_start,
     int free_ports_end, int last_used_port)
 {
-	socket_core_ref socket;
-	socket_port_ref socket_port;
+	socket_core_t *socket;
+	socket_port_t *socket_port;
 	struct sockaddr *address;
 	struct sockaddr_in *address_in;
@@ -322,11 +322,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		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.
  */
 int
-socket_bind_free_port(socket_ports_ref global_sockets, socket_core_ref socket,
+socket_bind_free_port(socket_ports_t *global_sockets, socket_core_t *socket,
     int free_ports_start, int free_ports_end, int last_used_port)
 {
@@ -367,8 +367,8 @@
  *			requested. A negative identifier is requested if set to
  *			false.
- * @returns		The new socket identifier.
- * @returns		ELIMIT if there is no socket identifier available.
- */
-static int socket_generate_new_id(socket_cores_ref local_sockets, int positive)
+ * @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)
 {
 	int socket_id;
@@ -410,13 +410,13 @@
  *			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
-socket_create(socket_cores_ref local_sockets, int app_phone,
+socket_create(socket_cores_t *local_sockets, int app_phone,
     void *specific_data, int *socket_id)
 {
-	socket_core_ref socket;
+	socket_core_t *socket;
 	int positive;
 	int rc;
@@ -437,5 +437,5 @@
 	}
 	
-	socket = (socket_core_ref) malloc(sizeof(*socket));
+	socket = (socket_core_t *) malloc(sizeof(*socket));
 	if (!socket)
 		return ENOMEM;
@@ -482,13 +482,13 @@
  * @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
-socket_destroy(int packet_phone, int socket_id, socket_cores_ref local_sockets,
-    socket_ports_ref global_sockets,
-    void (*socket_release)(socket_core_ref socket))
-{
-	socket_core_ref socket;
+socket_destroy(int packet_phone, int socket_id, socket_cores_t *local_sockets,
+    socket_ports_t *global_sockets,
+    void (*socket_release)(socket_core_t *socket))
+{
+	socket_core_t *socket;
 	int accepted_id;
 
@@ -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,13 +598,13 @@
  * @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.
- */
-socket_core_ref
-socket_port_find(socket_ports_ref global_sockets, int port, const char *key,
+ * @return		The found socket.
+ * @return		NULL if no socket was found.
+ */
+socket_core_t *
+socket_port_find(socket_ports_t *global_sockets, int port, const char *key,
     size_t key_length)
 {
-	socket_port_ref socket_port;
-	socket_core_ref *socket_ref;
+	socket_port_t *socket_port;
+	socket_core_t **socket_ref;
 
 	socket_port = socket_ports_find(global_sockets, port);
@@ -628,8 +628,8 @@
  */
 void
-socket_port_release(socket_ports_ref global_sockets, socket_core_ref socket)
-{
-	socket_port_ref socket_port;
-	socket_core_ref *socket_ref;
+socket_port_release(socket_ports_t *global_sockets, socket_core_t *socket)
+{
+	socket_port_t *socket_port;
+	socket_core_t **socket_ref;
 
 	if (!socket->port)
@@ -673,14 +673,14 @@
  * @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.
  */
 int
-socket_port_add(socket_ports_ref global_sockets, int port,
-    socket_core_ref socket, const char *key, size_t key_length)
-{
-	socket_port_ref socket_port;
+socket_port_add(socket_ports_t *global_sockets, int port,
+    socket_core_t *socket, const char *key, size_t key_length)
+{
+	socket_port_t *socket_port;
 	int rc;
 
Index: uspace/lib/net/tl/tl_common.c
===================================================================
--- uspace/lib/net/tl/tl_common.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ 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
@@ -120,6 +120,6 @@
 int
 tl_get_ip_packet_dimension(int ip_phone,
-    packet_dimensions_ref packet_dimensions, device_id_t device_id,
-    packet_dimension_ref *packet_dimension)
+    packet_dimensions_t *packet_dimensions, device_id_t device_id,
+    packet_dimension_t **packet_dimension)
 {
 	int rc;
@@ -158,12 +158,12 @@
  * @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.
  */
 int
-tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions,
+tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
     device_id_t device_id, size_t content)
 {
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 
 	packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
@@ -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,13 +280,13 @@
  * @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.
  */
 int
-tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix,
-    const packet_dimension_ref dimension, const struct sockaddr *addr,
+tl_socket_read_packet_data(int packet_phone, packet_t *packet, size_t prefix,
+    const packet_dimension_t *dimension, const struct sockaddr *addr,
     socklen_t addrlen)
 {
Index: uspace/lib/packet/generic/packet_server.c
===================================================================
--- uspace/lib/packet/generic/packet_server.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/packet/generic/packet_server.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -103,5 +103,5 @@
 };
 
-int packet_translate_local(int phone, packet_ref packet, packet_id_t packet_id)
+int packet_translate_local(int phone, packet_t *packet, packet_id_t packet_id)
 {
 	if (!packet)
@@ -154,6 +154,6 @@
  * @param[in] max_content The maximal content length in bytes.
  * @param[in] max_suffix The maximal suffix length in bytes.
- * @returns		The packet of dimensions at least as given.
- * @returns		NULL if there is not enough memory left.
+ * @return		The packet of dimensions at least as given.
+ * @return		NULL if there is not enough memory left.
  */
 static packet_t
@@ -278,6 +278,6 @@
  *
  * @param[in] packet_id	The first packet identifier.
- * @returns		EOK on success.
- * @returns		ENOENT if there is no such packet.
+ * @return		EOK on success.
+ * @return		ENOENT if there is no such packet.
  */
 static int packet_release_wrapper(packet_id_t packet_id)
@@ -303,9 +303,9 @@
 /** Shares the packet memory block.
  * @param[in] packet	The packet to be shared.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		EINVAL if the calling module does not accept the memory.
- * @returns		ENOMEM if the desired and actual sizes differ.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		EINVAL if the calling module does not accept the memory.
+ * @return		ENOMEM if the desired and actual sizes differ.
+ * @return		Other error codes as defined for the
  *			async_share_in_finalize() function.
  */
@@ -339,10 +339,10 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		ENOENT if there is no such packet as in the packet
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		ENOENT if there is no such packet as in the packet
  *			message parameter.
- * @returns		ENOTSUP if the message is not known.
- * @returns		Other error codes as defined for the
+ * @return		ENOTSUP if the message is not known.
+ * @return		Other error codes as defined for the
  *			packet_release_wrapper() function.
  */
Index: uspace/lib/packet/include/packet_local.h
===================================================================
--- uspace/lib/packet/include/packet_local.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/lib/packet/include/packet_local.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -43,5 +43,5 @@
 /*@{*/
 
-extern int packet_translate_local(int, packet_ref, packet_id_t);
+extern int packet_translate_local(int, packet_t *, packet_id_t);
 extern packet_t packet_get_4_local(int, size_t, size_t, size_t, size_t);
 extern packet_t packet_get_1_local(int, size_t);
Index: uspace/srv/bd/ata_bd/ata_bd.c
===================================================================
--- uspace/srv/bd/ata_bd/ata_bd.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/bd/ata_bd/ata_bd.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -139,5 +139,5 @@
 		
 		snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
-		rc = devmap_device_register(name, &disk[i].dev_handle);
+		rc = devmap_device_register(name, &disk[i].devmap_handle);
 		if (rc != EOK) {
 			devmap_hangup_phone(DEVMAP_DRIVER);
@@ -229,5 +229,5 @@
 	ipc_call_t call;
 	ipcarg_t method;
-	dev_handle_t dh;
+	devmap_handle_t dh;
 	int flags;
 	int retval;
@@ -242,5 +242,5 @@
 	disk_id = -1;
 	for (i = 0; i < MAX_DISKS; i++)
-		if (disk[i].dev_handle == dh)
+		if (disk[i].devmap_handle == dh)
 			disk_id = i;
 
Index: uspace/srv/bd/ata_bd/ata_bd.h
===================================================================
--- uspace/srv/bd/ata_bd/ata_bd.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/bd/ata_bd/ata_bd.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -287,5 +287,5 @@
 
 	fibril_mutex_t lock;
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 } disk_t;
 
Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -60,5 +60,5 @@
 static FILE *img;
 
-static dev_handle_t dev_handle;
+static devmap_handle_t devmap_handle;
 static fibril_mutex_t dev_lock;
 
@@ -82,5 +82,5 @@
 		return -1;
 
-	rc = devmap_device_register(argv[2], &dev_handle);
+	rc = devmap_device_register(argv[2], &devmap_handle);
 	if (rc != EOK) {
 		devmap_hangup_phone(DEVMAP_DRIVER);
Index: uspace/srv/bd/gxe_bd/gxe_bd.c
===================================================================
--- uspace/srv/bd/gxe_bd/gxe_bd.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/bd/gxe_bd/gxe_bd.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -93,5 +93,5 @@
 static gxe_bd_t *dev;
 
-static dev_handle_t dev_handle[MAX_DISKS];
+static devmap_handle_t devmap_handle[MAX_DISKS];
 
 static fibril_mutex_t dev_lock[MAX_DISKS];
@@ -143,5 +143,5 @@
 	for (i = 0; i < MAX_DISKS; i++) {
 		snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
-		rc = devmap_device_register(name, &dev_handle[i]);
+		rc = devmap_device_register(name, &devmap_handle[i]);
 		if (rc != EOK) {
 			devmap_hangup_phone(DEVMAP_DRIVER);
@@ -161,5 +161,5 @@
 	ipc_call_t call;
 	ipcarg_t method;
-	dev_handle_t dh;
+	devmap_handle_t dh;
 	int flags;
 	int retval;
@@ -174,5 +174,5 @@
 	disk_id = -1;
 	for (i = 0; i < MAX_DISKS; i++)
-		if (dev_handle[i] == dh)
+		if (devmap_handle[i] == dh)
 			disk_id = i;
 
Index: uspace/srv/bd/part/guid_part/guid_part.c
===================================================================
--- uspace/srv/bd/part/guid_part/guid_part.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/bd/part/guid_part/guid_part.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -83,5 +83,5 @@
 	aoff64_t length;
 	/** Device representing the partition (outbound device) */
-	dev_handle_t dev;
+	devmap_handle_t dev;
 	/** Points to next partition structure. */
 	struct part *next;
@@ -91,5 +91,5 @@
 
 /** Partitioned device (inbound device) */
-static dev_handle_t indev_handle;
+static devmap_handle_t indev_handle;
 
 /** List of partitions. This structure is an empty head. */
@@ -130,5 +130,5 @@
 	int i;
 	char *name;
-	dev_handle_t dev;
+	devmap_handle_t dev;
 	uint64_t size_mb;
 	part_t *part;
@@ -316,5 +316,5 @@
 	ipc_call_t call;
 	ipcarg_t method;
-	dev_handle_t dh;
+	devmap_handle_t dh;
 	int flags;
 	int retval;
Index: uspace/srv/bd/part/mbr_part/mbr_part.c
===================================================================
--- uspace/srv/bd/part/mbr_part/mbr_part.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/bd/part/mbr_part/mbr_part.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -101,5 +101,5 @@
 	aoff64_t length;
 	/** Device representing the partition (outbound device) */
-	dev_handle_t dev;
+	devmap_handle_t dev;
 	/** Points to next partition structure. */
 	struct part *next;
@@ -142,5 +142,5 @@
 
 /** Partitioned device (inbound device) */
-static dev_handle_t indev_handle;
+static devmap_handle_t indev_handle;
 
 /** List of partitions. This structure is an empty head. */
@@ -181,5 +181,5 @@
 	int i;
 	char *name;
-	dev_handle_t dev;
+	devmap_handle_t dev;
 	uint64_t size_mb;
 	part_t *part;
@@ -394,5 +394,5 @@
 	ipc_call_t call;
 	ipcarg_t method;
-	dev_handle_t dh;
+	devmap_handle_t dh;
 	int flags;
 	int retval;
Index: uspace/srv/bd/rd/rd.c
===================================================================
--- uspace/srv/bd/rd/rd.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/bd/rd/rd.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -238,6 +238,6 @@
 	}
 	
-	dev_handle_t dev_handle;
-	if (devmap_device_register("bd/initrd", &dev_handle) != EOK) {
+	devmap_handle_t devmap_handle;
+	if (devmap_device_register("bd/initrd", &devmap_handle) != EOK) {
 		devmap_hangup_phone(DEVMAP_DRIVER);
 		printf("%s: Unable to register device\n", NAME);
Index: uspace/srv/devman/devman.c
===================================================================
--- uspace/srv/devman/devman.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/devman/devman.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -52,5 +52,5 @@
 {
 	node_t *dev = hash_table_get_instance(item, node_t, devman_link);
-	return (dev->handle == (device_handle_t) key[0]);
+	return (dev->handle == (devman_handle_t) key[0]);
 }
 
@@ -59,5 +59,5 @@
 {
 	node_t *dev = hash_table_get_instance(item, node_t, devmap_link);
-	return (dev->devmap_handle == (dev_handle_t) key[0]);
+	return (dev->devmap_handle == (devmap_handle_t) key[0]);
 }
 
@@ -782,5 +782,5 @@
  * @return		The device node.
  */
-node_t *find_dev_node_no_lock(dev_tree_t *tree, device_handle_t handle)
+node_t *find_dev_node_no_lock(dev_tree_t *tree, devman_handle_t handle)
 {
 	unsigned long key = handle;
@@ -795,5 +795,5 @@
  * @return		The device node.
  */
-node_t *find_dev_node(dev_tree_t *tree, device_handle_t handle)
+node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle)
 {
 	node_t *node = NULL;
@@ -1106,5 +1106,5 @@
 /* Devmap devices */
 
-node_t *find_devmap_tree_device(dev_tree_t *tree, dev_handle_t devmap_handle)
+node_t *find_devmap_tree_device(dev_tree_t *tree, devmap_handle_t devmap_handle)
 {
 	node_t *dev = NULL;
@@ -1122,5 +1122,5 @@
 
 node_t *find_devmap_class_device(class_list_t *classes,
-    dev_handle_t devmap_handle)
+    devmap_handle_t devmap_handle)
 {
 	node_t *dev = NULL;
Index: uspace/srv/devman/devman.h
===================================================================
--- uspace/srv/devman/devman.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/devman/devman.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -121,5 +121,5 @@
 struct node {
 	/** The global unique identifier of the device. */
-	device_handle_t handle;
+	devman_handle_t handle;
 	/** The name of the device specified by its parent. */
 	char *name;
@@ -157,5 +157,5 @@
 	link_t classes;
 	/** Devmap handle if the device is registered by devmapper. */
-	dev_handle_t devmap_handle;
+	devmap_handle_t devmap_handle;
 	
 	/**
@@ -179,5 +179,5 @@
 	 * manner.
 	 */
-	device_handle_t current_handle;
+	devman_handle_t current_handle;
 	
 	/** Synchronize access to the device tree. */
@@ -248,5 +248,5 @@
 	char *dev_name;
 	/** The handle of the device by device mapper in the class namespace. */
-	dev_handle_t devmap_handle;
+	devmap_handle_t devmap_handle;
 	
 	/**
@@ -309,6 +309,6 @@
 extern void delete_dev_node(node_t *node);
 extern node_t *find_dev_node_no_lock(dev_tree_t *tree,
-    device_handle_t handle);
-extern node_t *find_dev_node(dev_tree_t *tree, device_handle_t handle);
+    devman_handle_t handle);
+extern node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
 extern node_t *find_dev_node_by_path(dev_tree_t *, char *);
 extern node_t *find_node_child(node_t *, const char *);
@@ -337,6 +337,6 @@
 /* Devmap devices */
 
-extern node_t *find_devmap_tree_device(dev_tree_t *, dev_handle_t);
-extern node_t *find_devmap_class_device(class_list_t *, dev_handle_t);
+extern node_t *find_devmap_tree_device(dev_tree_t *, devmap_handle_t);
+extern node_t *find_devmap_class_device(class_list_t *, devmap_handle_t);
 
 extern void class_add_devmap_device(class_list_t *, dev_class_info_t *);
Index: uspace/srv/devman/main.c
===================================================================
--- uspace/srv/devman/main.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/devman/main.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -202,5 +202,5 @@
 static void devman_add_child(ipc_callid_t callid, ipc_call_t *call)
 {
-	device_handle_t parent_handle = IPC_GET_ARG1(*call);
+	devman_handle_t parent_handle = IPC_GET_ARG1(*call);
 	ipcarg_t match_count = IPC_GET_ARG2(*call);
 	dev_tree_t *tree = &device_tree;
@@ -271,5 +271,5 @@
 static void devman_add_device_to_class(ipc_callid_t callid, ipc_call_t *call)
 {
-	device_handle_t handle = IPC_GET_ARG1(*call);
+	devman_handle_t handle = IPC_GET_ARG1(*call);
 	
 	/* Get class name. */
@@ -414,5 +414,5 @@
     bool drv_to_parent)
 {
-	device_handle_t handle = IPC_GET_ARG2(*icall);
+	devman_handle_t handle = IPC_GET_ARG2(*icall);
 	
 	node_t *dev = find_dev_node(&device_tree, handle);
@@ -464,5 +464,5 @@
 static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
 {
-	dev_handle_t devmap_handle = IPC_GET_METHOD(*icall);
+	devmap_handle_t devmap_handle = IPC_GET_METHOD(*icall);
 	node_t *dev;
 
Index: uspace/srv/devmap/devmap.c
===================================================================
--- uspace/srv/devmap/devmap.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/devmap/devmap.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -75,5 +75,5 @@
 	link_t namespaces;
 	/** Unique namespace identifier */
-	dev_handle_t handle;
+	devmap_handle_t handle;
 	/** Namespace name */
 	char *name;
@@ -92,5 +92,5 @@
 	link_t driver_devices;
 	/** Unique device identifier */
-	dev_handle_t handle;
+	devmap_handle_t handle;
 	/** Device namespace */
 	devmap_namespace_t *namespace;
@@ -118,8 +118,8 @@
 static FIBRIL_MUTEX_INITIALIZE(null_devices_mutex);
 
-static dev_handle_t last_handle = 0;
+static devmap_handle_t last_handle = 0;
 static devmap_device_t *null_devices[NULL_DEVICES];
 
-static dev_handle_t devmap_create_handle(void)
+static devmap_handle_t devmap_create_handle(void)
 {
 	/* TODO: allow reusing old handles after their unregistration
@@ -233,5 +233,5 @@
  *
  */
-static devmap_namespace_t *devmap_namespace_find_handle(dev_handle_t handle)
+static devmap_namespace_t *devmap_namespace_find_handle(devmap_handle_t handle)
 {
 	link_t *item;
@@ -275,5 +275,5 @@
  *
  */
-static devmap_device_t *devmap_device_find_handle(dev_handle_t handle)
+static devmap_device_t *devmap_device_find_handle(devmap_handle_t handle)
 {
 	link_t *item;
@@ -608,5 +608,5 @@
 	 * Get handle from request
 	 */
-	dev_handle_t handle = IPC_GET_ARG2(*call);
+	devmap_handle_t handle = IPC_GET_ARG2(*call);
 	devmap_device_t *dev = devmap_device_find_handle(handle);
 	
Index: uspace/srv/fs/devfs/devfs_ops.c
===================================================================
--- uspace/srv/fs/devfs/devfs_ops.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/devfs/devfs_ops.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -54,10 +54,10 @@
 typedef struct {
 	devmap_handle_type_t type;
-	dev_handle_t handle;
+	devmap_handle_t handle;
 } devfs_node_t;
 
 /** Opened devices structure */
 typedef struct {
-	dev_handle_t handle;
+	devmap_handle_t handle;
 	int phone;
 	size_t refcount;
@@ -84,5 +84,5 @@
 {
 	device_t *dev = hash_table_get_instance(item, device_t, link);
-	return (dev->handle == (dev_handle_t) key[DEVICES_KEY_HANDLE]);
+	return (dev->handle == (devmap_handle_t) key[DEVICES_KEY_HANDLE]);
 }
 
@@ -99,5 +99,5 @@
 
 static int devfs_node_get_internal(fs_node_t **rfn, devmap_handle_type_t type,
-    dev_handle_t handle)
+    devmap_handle_t handle)
 {
 	devfs_node_t *node = (devfs_node_t *) malloc(sizeof(devfs_node_t));
@@ -122,5 +122,5 @@
 }
 
-static int devfs_root_get(fs_node_t **rfn, dev_handle_t dev_handle)
+static int devfs_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle)
 {
 	return devfs_node_get_internal(rfn, DEV_HANDLE_NONE, 0);
@@ -154,5 +154,5 @@
 		
 		/* Search root namespace */
-		dev_handle_t namespace;
+		devmap_handle_t namespace;
 		if (devmap_namespace_get_handle("", &namespace, 0) == EOK) {
 			count = devmap_get_devices(namespace, &devs);
@@ -200,5 +200,5 @@
 }
 
-static int devfs_node_get(fs_node_t **rfn, dev_handle_t dev_handle, fs_index_t index)
+static int devfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index)
 {
 	return devfs_node_get_internal(rfn, devmap_handle_probe(index), index);
@@ -269,5 +269,5 @@
 }
 
-static int devfs_create_node(fs_node_t **rfn, dev_handle_t dev_handle, int lflag)
+static int devfs_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int lflag)
 {
 	assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY));
@@ -304,5 +304,5 @@
 		
 		/* Root namespace */
-		dev_handle_t namespace;
+		devmap_handle_t namespace;
 		if (devmap_namespace_get_handle("", &namespace, 0) == EOK) {
 			count = devmap_count_devices(namespace);
@@ -372,5 +372,5 @@
 }
 
-static dev_handle_t devfs_device_get(fs_node_t *fn)
+static devmap_handle_t devfs_device_get(fs_node_t *fn)
 {
 	devfs_node_t *node = (devfs_node_t *) fn->data;
@@ -501,5 +501,5 @@
 		
 		/* Search root namespace */
-		dev_handle_t namespace;
+		devmap_handle_t namespace;
 		if (devmap_namespace_get_handle("", &namespace, 0) == EOK) {
 			count = devmap_get_devices(namespace, &desc);
Index: uspace/srv/fs/fat/fat.h
===================================================================
--- uspace/srv/fs/fat/fat.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/fat/fat.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -176,5 +176,5 @@
 
 	fibril_mutex_t	lock;
-	dev_handle_t	dev_handle;
+	devmap_handle_t	devmap_handle;
 	fs_index_t	index;
 	/**
@@ -242,7 +242,7 @@
 extern void fat_sync(ipc_callid_t, ipc_call_t *);
 
-extern int fat_idx_get_new(fat_idx_t **, dev_handle_t);
-extern fat_idx_t *fat_idx_get_by_pos(dev_handle_t, fat_cluster_t, unsigned);
-extern fat_idx_t *fat_idx_get_by_index(dev_handle_t, fs_index_t);
+extern int fat_idx_get_new(fat_idx_t **, devmap_handle_t);
+extern fat_idx_t *fat_idx_get_by_pos(devmap_handle_t, fat_cluster_t, unsigned);
+extern fat_idx_t *fat_idx_get_by_index(devmap_handle_t, fs_index_t);
 extern void fat_idx_destroy(fat_idx_t *);
 extern void fat_idx_hashin(fat_idx_t *);
@@ -251,6 +251,6 @@
 extern int fat_idx_init(void);
 extern void fat_idx_fini(void);
-extern int fat_idx_init_by_dev_handle(dev_handle_t);
-extern void fat_idx_fini_by_dev_handle(dev_handle_t);
+extern int fat_idx_init_by_devmap_handle(devmap_handle_t);
+extern void fat_idx_fini_by_devmap_handle(devmap_handle_t);
 
 #endif
Index: uspace/srv/fs/fat/fat_fat.c
===================================================================
--- uspace/srv/fs/fat/fat_fat.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/fat/fat_fat.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -70,5 +70,5 @@
  *
  * @param bs		Buffer holding the boot sector for the file.
- * @param dev_handle	Device handle of the device with the file.
+ * @param devmap_handle	Device handle of the device with the file.
  * @param firstc	First cluster to start the walk with.
  * @param lastc		If non-NULL, output argument hodling the last cluster
@@ -81,5 +81,5 @@
  */
 int 
-fat_cluster_walk(fat_bs_t *bs, dev_handle_t dev_handle, fat_cluster_t firstc,
+fat_cluster_walk(fat_bs_t *bs, devmap_handle_t devmap_handle, fat_cluster_t firstc,
     fat_cluster_t *lastc, uint16_t *numc, uint16_t max_clusters)
 {
@@ -108,5 +108,5 @@
 		fidx = clst % (BPS(bs) / sizeof(fat_cluster_t));
 		/* read FAT1 */
-		rc = block_get(&b, dev_handle, RSCNT(bs) + fsec,
+		rc = block_get(&b, devmap_handle, RSCNT(bs) + fsec,
 		    BLOCK_FLAGS_NONE);
 		if (rc != EOK)
@@ -159,5 +159,5 @@
 		 * when fortunately we have the last cluster number cached.
 		 */
-		return block_get(block, nodep->idx->dev_handle,
+		return block_get(block, nodep->idx->devmap_handle,
 		    CLBN2PBN(bs, nodep->lastc_cached_value, bn), flags);
 	}
@@ -173,5 +173,5 @@
 
 fall_through:
-	rc = _fat_block_get(block, bs, nodep->idx->dev_handle, firstc,
+	rc = _fat_block_get(block, bs, nodep->idx->devmap_handle, firstc,
 	    &currc, relbn, flags);
 	if (rc != EOK)
@@ -192,5 +192,5 @@
  * @param block		Pointer to a block pointer for storing result.
  * @param bs		Buffer holding the boot sector of the file system.
- * @param dev_handle	Device handle of the file system.
+ * @param devmap_handle	Device handle of the file system.
  * @param fcl		First cluster used by the file. Can be zero if the file
  *			is empty.
@@ -204,5 +204,5 @@
  */
 int
-_fat_block_get(block_t **block, fat_bs_t *bs, dev_handle_t dev_handle,
+_fat_block_get(block_t **block, fat_bs_t *bs, devmap_handle_t devmap_handle,
     fat_cluster_t fcl, fat_cluster_t *clp, aoff64_t bn, int flags)
 {
@@ -221,5 +221,5 @@
 		/* root directory special case */
 		assert(bn < RDS(bs));
-		rc = block_get(block, dev_handle,
+		rc = block_get(block, devmap_handle,
 		    RSCNT(bs) + FATCNT(bs) * SF(bs) + bn, flags);
 		return rc;
@@ -227,10 +227,10 @@
 
 	max_clusters = bn / SPC(bs);
-	rc = fat_cluster_walk(bs, dev_handle, fcl, &c, &clusters, max_clusters);
+	rc = fat_cluster_walk(bs, devmap_handle, fcl, &c, &clusters, max_clusters);
 	if (rc != EOK)
 		return rc;
 	assert(clusters == max_clusters);
 
-	rc = block_get(block, dev_handle, CLBN2PBN(bs, c, bn), flags);
+	rc = block_get(block, devmap_handle, CLBN2PBN(bs, c, bn), flags);
 
 	if (clp)
@@ -280,5 +280,5 @@
 	/* zero out the initial part of the new cluster chain */
 	for (o = boundary; o < pos; o += BPS(bs)) {
-		rc = _fat_block_get(&b, bs, nodep->idx->dev_handle, mcl,
+		rc = _fat_block_get(&b, bs, nodep->idx->devmap_handle, mcl,
 		    NULL, (o - boundary) / BPS(bs), BLOCK_FLAGS_NOREAD);
 		if (rc != EOK)
@@ -297,5 +297,5 @@
  *
  * @param bs		Buffer holding the boot sector for the file system.
- * @param dev_handle	Device handle for the file system.
+ * @param devmap_handle	Device handle for the file system.
  * @param clst		Cluster which to get.
  * @param value		Output argument holding the value of the cluster.
@@ -304,5 +304,5 @@
  */
 int
-fat_get_cluster(fat_bs_t *bs, dev_handle_t dev_handle, unsigned fatno,
+fat_get_cluster(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t *value)
 {
@@ -311,5 +311,5 @@
 	int rc;
 
-	rc = block_get(&b, dev_handle, RSCNT(bs) + SF(bs) * fatno +
+	rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno +
 	    (clst * sizeof(fat_cluster_t)) / BPS(bs), BLOCK_FLAGS_NONE);
 	if (rc != EOK)
@@ -326,5 +326,5 @@
  *
  * @param bs		Buffer holding the boot sector for the file system.
- * @param dev_handle	Device handle for the file system.
+ * @param devmap_handle	Device handle for the file system.
  * @param fatno		Number of the FAT instance where to make the change.
  * @param clst		Cluster which is to be set.
@@ -334,5 +334,5 @@
  */
 int
-fat_set_cluster(fat_bs_t *bs, dev_handle_t dev_handle, unsigned fatno,
+fat_set_cluster(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned fatno,
     fat_cluster_t clst, fat_cluster_t value)
 {
@@ -342,5 +342,5 @@
 
 	assert(fatno < FATCNT(bs));
-	rc = block_get(&b, dev_handle, RSCNT(bs) + SF(bs) * fatno +
+	rc = block_get(&b, devmap_handle, RSCNT(bs) + SF(bs) * fatno +
 	    (clst * sizeof(fat_cluster_t)) / BPS(bs), BLOCK_FLAGS_NONE);
 	if (rc != EOK)
@@ -357,5 +357,5 @@
  *
  * @param bs		Buffer holding the boot sector of the file system.
- * @param dev_handle	Device handle of the file system.
+ * @param devmap_handle	Device handle of the file system.
  * @param lifo		Chain of allocated clusters.
  * @param nclsts	Number of clusters in the lifo chain.
@@ -363,5 +363,5 @@
  * @return		EOK on success or a negative error code.
  */
-int fat_alloc_shadow_clusters(fat_bs_t *bs, dev_handle_t dev_handle,
+int fat_alloc_shadow_clusters(fat_bs_t *bs, devmap_handle_t devmap_handle,
     fat_cluster_t *lifo, unsigned nclsts)
 {
@@ -372,5 +372,5 @@
 	for (fatno = FAT1 + 1; fatno < bs->fatcnt; fatno++) {
 		for (c = 0; c < nclsts; c++) {
-			rc = fat_set_cluster(bs, dev_handle, fatno, lifo[c],
+			rc = fat_set_cluster(bs, devmap_handle, fatno, lifo[c],
 			    c == 0 ? FAT_CLST_LAST1 : lifo[c - 1]);
 			if (rc != EOK)
@@ -390,5 +390,5 @@
  *
  * @param bs		Buffer holding the boot sector of the file system.
- * @param dev_handle	Device handle of the file system.
+ * @param devmap_handle	Device handle of the file system.
  * @param nclsts	Number of clusters to allocate.
  * @param mcl		Output parameter where the first cluster in the chain
@@ -400,5 +400,5 @@
  */
 int
-fat_alloc_clusters(fat_bs_t *bs, dev_handle_t dev_handle, unsigned nclsts,
+fat_alloc_clusters(fat_bs_t *bs, devmap_handle_t devmap_handle, unsigned nclsts,
     fat_cluster_t *mcl, fat_cluster_t *lcl)
 {
@@ -418,5 +418,5 @@
 	fibril_mutex_lock(&fat_alloc_lock);
 	for (b = 0, cl = 0; b < SF(bs); b++) {
-		rc = block_get(&blk, dev_handle, RSCNT(bs) + b,
+		rc = block_get(&blk, devmap_handle, RSCNT(bs) + b,
 		    BLOCK_FLAGS_NONE);
 		if (rc != EOK)
@@ -457,5 +457,5 @@
 					/* update the shadow copies of FAT */
 					rc = fat_alloc_shadow_clusters(bs,
-					    dev_handle, lifo, nclsts);
+					    devmap_handle, lifo, nclsts);
 					if (rc != EOK)
 						goto error;
@@ -484,5 +484,5 @@
 	 */
 	while (found--) {
-		rc = fat_set_cluster(bs, dev_handle, FAT1, lifo[found],
+		rc = fat_set_cluster(bs, devmap_handle, FAT1, lifo[found],
 		    FAT_CLST_RES0);
 		if (rc != EOK) {
@@ -499,5 +499,5 @@
  *
  * @param bs		Buffer hodling the boot sector of the file system.
- * @param dev_handle	Device handle of the file system.
+ * @param devmap_handle	Device handle of the file system.
  * @param firstc	First cluster in the chain which is to be freed.
  *
@@ -505,5 +505,5 @@
  */
 int
-fat_free_clusters(fat_bs_t *bs, dev_handle_t dev_handle, fat_cluster_t firstc)
+fat_free_clusters(fat_bs_t *bs, devmap_handle_t devmap_handle, fat_cluster_t firstc)
 {
 	unsigned fatno;
@@ -514,9 +514,9 @@
 	while (firstc < FAT_CLST_LAST1) {
 		assert(firstc >= FAT_CLST_FIRST && firstc < FAT_CLST_BAD);
-		rc = fat_get_cluster(bs, dev_handle, FAT1, firstc, &nextc);
+		rc = fat_get_cluster(bs, devmap_handle, FAT1, firstc, &nextc);
 		if (rc != EOK)
 			return rc;
 		for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
-			rc = fat_set_cluster(bs, dev_handle, fatno, firstc,
+			rc = fat_set_cluster(bs, devmap_handle, fatno, firstc,
 			    FAT_CLST_RES0);
 			if (rc != EOK)
@@ -543,5 +543,5 @@
     fat_cluster_t lcl)
 {
-	dev_handle_t dev_handle = nodep->idx->dev_handle;
+	devmap_handle_t devmap_handle = nodep->idx->devmap_handle;
 	fat_cluster_t lastc;
 	uint8_t fatno;
@@ -557,5 +557,5 @@
 			nodep->lastc_cached_valid = false;
 		} else {
-			rc = fat_cluster_walk(bs, dev_handle, nodep->firstc,
+			rc = fat_cluster_walk(bs, devmap_handle, nodep->firstc,
 			    &lastc, NULL, (uint16_t) -1);
 			if (rc != EOK)
@@ -564,5 +564,5 @@
 
 		for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
-			rc = fat_set_cluster(bs, nodep->idx->dev_handle, fatno,
+			rc = fat_set_cluster(bs, nodep->idx->devmap_handle, fatno,
 			    lastc, mcl);
 			if (rc != EOK)
@@ -590,5 +590,5 @@
 {
 	int rc;
-	dev_handle_t dev_handle = nodep->idx->dev_handle;
+	devmap_handle_t devmap_handle = nodep->idx->devmap_handle;
 
 	/*
@@ -601,5 +601,5 @@
 	if (lcl == FAT_CLST_RES0) {
 		/* The node will have zero size and no clusters allocated. */
-		rc = fat_free_clusters(bs, dev_handle, nodep->firstc);
+		rc = fat_free_clusters(bs, devmap_handle, nodep->firstc);
 		if (rc != EOK)
 			return rc;
@@ -610,5 +610,5 @@
 		unsigned fatno;
 
-		rc = fat_get_cluster(bs, dev_handle, FAT1, lcl, &nextc);
+		rc = fat_get_cluster(bs, devmap_handle, FAT1, lcl, &nextc);
 		if (rc != EOK)
 			return rc;
@@ -616,5 +616,5 @@
 		/* Terminate the cluster chain in all copies of FAT. */
 		for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
-			rc = fat_set_cluster(bs, dev_handle, fatno, lcl,
+			rc = fat_set_cluster(bs, devmap_handle, fatno, lcl,
 			    FAT_CLST_LAST1);
 			if (rc != EOK)
@@ -623,5 +623,5 @@
 
 		/* Free all following clusters. */
-		rc = fat_free_clusters(bs, dev_handle, nextc);
+		rc = fat_free_clusters(bs, devmap_handle, nextc);
 		if (rc != EOK)
 			return rc;
@@ -638,5 +638,5 @@
 
 int
-fat_zero_cluster(struct fat_bs *bs, dev_handle_t dev_handle, fat_cluster_t c)
+fat_zero_cluster(struct fat_bs *bs, devmap_handle_t devmap_handle, fat_cluster_t c)
 {
 	int i;
@@ -645,5 +645,5 @@
 
 	for (i = 0; i < SPC(bs); i++) {
-		rc = _fat_block_get(&b, bs, dev_handle, c, NULL, i,
+		rc = _fat_block_get(&b, bs, devmap_handle, c, NULL, i,
 		    BLOCK_FLAGS_NOREAD);
 		if (rc != EOK)
@@ -665,5 +665,5 @@
  * does not contain a fat file system.
  */
-int fat_sanity_check(fat_bs_t *bs, dev_handle_t dev_handle)
+int fat_sanity_check(fat_bs_t *bs, devmap_handle_t devmap_handle)
 {
 	fat_cluster_t e0, e1;
@@ -706,9 +706,9 @@
 
 	for (fat_no = 0; fat_no < bs->fatcnt; fat_no++) {
-		rc = fat_get_cluster(bs, dev_handle, fat_no, 0, &e0);
+		rc = fat_get_cluster(bs, devmap_handle, fat_no, 0, &e0);
 		if (rc != EOK)
 			return EIO;
 
-		rc = fat_get_cluster(bs, dev_handle, fat_no, 1, &e1);
+		rc = fat_get_cluster(bs, devmap_handle, fat_no, 1, &e1);
 		if (rc != EOK)
 			return EIO;
Index: uspace/srv/fs/fat/fat_fat.h
===================================================================
--- uspace/srv/fs/fat/fat_fat.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/fat/fat_fat.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -61,10 +61,10 @@
 #define fat_clusters_get(numc, bs, dh, fc) \
     fat_cluster_walk((bs), (dh), (fc), NULL, (numc), (uint16_t) -1)
-extern int fat_cluster_walk(struct fat_bs *, dev_handle_t, fat_cluster_t,
+extern int fat_cluster_walk(struct fat_bs *, devmap_handle_t, fat_cluster_t,
     fat_cluster_t *, uint16_t *, uint16_t);
 
 extern int fat_block_get(block_t **, struct fat_bs *, struct fat_node *,
     aoff64_t, int);
-extern int _fat_block_get(block_t **, struct fat_bs *, dev_handle_t,
+extern int _fat_block_get(block_t **, struct fat_bs *, devmap_handle_t,
     fat_cluster_t, fat_cluster_t *, aoff64_t, int);
 
@@ -73,17 +73,17 @@
 extern int fat_chop_clusters(struct fat_bs *, struct fat_node *,
     fat_cluster_t);
-extern int fat_alloc_clusters(struct fat_bs *, dev_handle_t, unsigned,
+extern int fat_alloc_clusters(struct fat_bs *, devmap_handle_t, unsigned,
     fat_cluster_t *, fat_cluster_t *);
-extern int fat_free_clusters(struct fat_bs *, dev_handle_t, fat_cluster_t);
-extern int fat_alloc_shadow_clusters(struct fat_bs *, dev_handle_t,
+extern int fat_free_clusters(struct fat_bs *, devmap_handle_t, fat_cluster_t);
+extern int fat_alloc_shadow_clusters(struct fat_bs *, devmap_handle_t,
     fat_cluster_t *, unsigned);
-extern int fat_get_cluster(struct fat_bs *, dev_handle_t, unsigned,
+extern int fat_get_cluster(struct fat_bs *, devmap_handle_t, unsigned,
     fat_cluster_t, fat_cluster_t *);
-extern int fat_set_cluster(struct fat_bs *, dev_handle_t, unsigned,
+extern int fat_set_cluster(struct fat_bs *, devmap_handle_t, unsigned,
     fat_cluster_t, fat_cluster_t);
 extern int fat_fill_gap(struct fat_bs *, struct fat_node *, fat_cluster_t,
     aoff64_t);
-extern int fat_zero_cluster(struct fat_bs *, dev_handle_t, fat_cluster_t);
-extern int fat_sanity_check(struct fat_bs *, dev_handle_t);
+extern int fat_zero_cluster(struct fat_bs *, devmap_handle_t, fat_cluster_t);
+extern int fat_sanity_check(struct fat_bs *, devmap_handle_t);
 
 #endif
Index: uspace/srv/fs/fat/fat_idx.c
===================================================================
--- uspace/srv/fs/fat/fat_idx.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/fat/fat_idx.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -58,5 +58,5 @@
 typedef struct {
 	link_t		link;
-	dev_handle_t	dev_handle;
+	devmap_handle_t	devmap_handle;
 
 	/** Next unassigned index. */
@@ -75,8 +75,8 @@
 static LIST_INITIALIZE(unused_head);
 
-static void unused_initialize(unused_t *u, dev_handle_t dev_handle)
+static void unused_initialize(unused_t *u, devmap_handle_t devmap_handle)
 {
 	link_initialize(&u->link);
-	u->dev_handle = dev_handle;
+	u->devmap_handle = devmap_handle;
 	u->next = 0;
 	u->remaining = ((uint64_t)((fs_index_t)-1)) + 1;
@@ -84,5 +84,5 @@
 }
 
-static unused_t *unused_find(dev_handle_t dev_handle, bool lock)
+static unused_t *unused_find(devmap_handle_t devmap_handle, bool lock)
 {
 	unused_t *u;
@@ -93,5 +93,5 @@
 	for (l = unused_head.next; l != &unused_head; l = l->next) {
 		u = list_get_instance(l, unused_t, link);
-		if (u->dev_handle == dev_handle) 
+		if (u->devmap_handle == devmap_handle) 
 			return u;
 	}
@@ -106,5 +106,5 @@
 /**
  * Global hash table of all used fat_idx_t structures.
- * The index structures are hashed by the dev_handle, parent node's first
+ * The index structures are hashed by the devmap_handle, parent node's first
  * cluster and index within the parent directory.
  */ 
@@ -120,5 +120,5 @@
 static hash_index_t pos_hash(unsigned long key[])
 {
-	dev_handle_t dev_handle = (dev_handle_t)key[UPH_DH_KEY];
+	devmap_handle_t devmap_handle = (devmap_handle_t)key[UPH_DH_KEY];
 	fat_cluster_t pfc = (fat_cluster_t)key[UPH_PFC_KEY];
 	unsigned pdi = (unsigned)key[UPH_PDI_KEY];
@@ -140,5 +140,5 @@
 	h |= (pdi & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) <<
 	    (UPH_BUCKETS_LOG / 2); 
-	h |= (dev_handle & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) <<
+	h |= (devmap_handle & ((1 << (UPH_BUCKETS_LOG / 4)) - 1)) <<
 	    (3 * (UPH_BUCKETS_LOG / 4));
 
@@ -148,5 +148,5 @@
 static int pos_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-	dev_handle_t dev_handle = (dev_handle_t)key[UPH_DH_KEY];
+	devmap_handle_t devmap_handle = (devmap_handle_t)key[UPH_DH_KEY];
 	fat_cluster_t pfc;
 	unsigned pdi;
@@ -155,9 +155,9 @@
 	switch (keys) {
 	case 1:
-		return (dev_handle == fidx->dev_handle);
+		return (devmap_handle == fidx->devmap_handle);
 	case 3:
 		pfc = (fat_cluster_t) key[UPH_PFC_KEY];
 		pdi = (unsigned) key[UPH_PDI_KEY];
-		return (dev_handle == fidx->dev_handle) && (pfc == fidx->pfc) &&
+		return (devmap_handle == fidx->devmap_handle) && (pfc == fidx->pfc) &&
 		    (pdi == fidx->pdi);
 	default:
@@ -181,5 +181,5 @@
 /**
  * Global hash table of all used fat_idx_t structures.
- * The index structures are hashed by the dev_handle and index.
+ * The index structures are hashed by the devmap_handle and index.
  */
 static hash_table_t ui_hash;
@@ -193,10 +193,10 @@
 static hash_index_t idx_hash(unsigned long key[])
 {
-	dev_handle_t dev_handle = (dev_handle_t)key[UIH_DH_KEY];
+	devmap_handle_t devmap_handle = (devmap_handle_t)key[UIH_DH_KEY];
 	fs_index_t index = (fs_index_t)key[UIH_INDEX_KEY];
 
 	hash_index_t h;
 
-	h = dev_handle & ((1 << (UIH_BUCKETS_LOG / 2)) - 1);
+	h = devmap_handle & ((1 << (UIH_BUCKETS_LOG / 2)) - 1);
 	h |= (index & ((1 << (UIH_BUCKETS_LOG / 2)) - 1)) <<
 	    (UIH_BUCKETS_LOG / 2);
@@ -207,5 +207,5 @@
 static int idx_compare(unsigned long key[], hash_count_t keys, link_t *item)
 {
-	dev_handle_t dev_handle = (dev_handle_t)key[UIH_DH_KEY];
+	devmap_handle_t devmap_handle = (devmap_handle_t)key[UIH_DH_KEY];
 	fs_index_t index;
 	fat_idx_t *fidx = list_get_instance(item, fat_idx_t, uih_link);
@@ -213,8 +213,8 @@
 	switch (keys) {
 	case 1:
-		return (dev_handle == fidx->dev_handle);
+		return (devmap_handle == fidx->devmap_handle);
 	case 2:
 		index = (fs_index_t) key[UIH_INDEX_KEY];
-		return (dev_handle == fidx->dev_handle) &&
+		return (devmap_handle == fidx->devmap_handle) &&
 		    (index == fidx->index);
 	default:
@@ -239,10 +239,10 @@
 
 /** Allocate a VFS index which is not currently in use. */
-static bool fat_index_alloc(dev_handle_t dev_handle, fs_index_t *index)
+static bool fat_index_alloc(devmap_handle_t devmap_handle, fs_index_t *index)
 {
 	unused_t *u;
 	
 	assert(index);
-	u = unused_find(dev_handle, true);
+	u = unused_find(devmap_handle, true);
 	if (!u)
 		return false;	
@@ -301,9 +301,9 @@
 
 /** Free a VFS index, which is no longer in use. */
-static void fat_index_free(dev_handle_t dev_handle, fs_index_t index)
+static void fat_index_free(devmap_handle_t devmap_handle, fs_index_t index)
 {
 	unused_t *u;
 
-	u = unused_find(dev_handle, true);
+	u = unused_find(devmap_handle, true);
 	assert(u);
 
@@ -363,5 +363,5 @@
 }
 
-static int fat_idx_create(fat_idx_t **fidxp, dev_handle_t dev_handle)
+static int fat_idx_create(fat_idx_t **fidxp, devmap_handle_t devmap_handle)
 {
 	fat_idx_t *fidx;
@@ -370,5 +370,5 @@
 	if (!fidx) 
 		return ENOMEM;
-	if (!fat_index_alloc(dev_handle, &fidx->index)) {
+	if (!fat_index_alloc(devmap_handle, &fidx->index)) {
 		free(fidx);
 		return ENOSPC;
@@ -378,5 +378,5 @@
 	link_initialize(&fidx->uih_link);
 	fibril_mutex_initialize(&fidx->lock);
-	fidx->dev_handle = dev_handle;
+	fidx->devmap_handle = devmap_handle;
 	fidx->pfc = FAT_CLST_RES0;	/* no parent yet */
 	fidx->pdi = 0;
@@ -387,5 +387,5 @@
 }
 
-int fat_idx_get_new(fat_idx_t **fidxp, dev_handle_t dev_handle)
+int fat_idx_get_new(fat_idx_t **fidxp, devmap_handle_t devmap_handle)
 {
 	fat_idx_t *fidx;
@@ -393,5 +393,5 @@
 
 	fibril_mutex_lock(&used_lock);
-	rc = fat_idx_create(&fidx, dev_handle);
+	rc = fat_idx_create(&fidx, devmap_handle);
 	if (rc != EOK) {
 		fibril_mutex_unlock(&used_lock);
@@ -400,5 +400,5 @@
 		
 	unsigned long ikey[] = {
-		[UIH_DH_KEY] = dev_handle,
+		[UIH_DH_KEY] = devmap_handle,
 		[UIH_INDEX_KEY] = fidx->index,
 	};
@@ -413,10 +413,10 @@
 
 fat_idx_t *
-fat_idx_get_by_pos(dev_handle_t dev_handle, fat_cluster_t pfc, unsigned pdi)
+fat_idx_get_by_pos(devmap_handle_t devmap_handle, fat_cluster_t pfc, unsigned pdi)
 {
 	fat_idx_t *fidx;
 	link_t *l;
 	unsigned long pkey[] = {
-		[UPH_DH_KEY] = dev_handle,
+		[UPH_DH_KEY] = devmap_handle,
 		[UPH_PFC_KEY] = pfc,
 		[UPH_PDI_KEY] = pdi,
@@ -430,5 +430,5 @@
 		int rc;
 
-		rc = fat_idx_create(&fidx, dev_handle);
+		rc = fat_idx_create(&fidx, devmap_handle);
 		if (rc != EOK) {
 			fibril_mutex_unlock(&used_lock);
@@ -437,5 +437,5 @@
 		
 		unsigned long ikey[] = {
-			[UIH_DH_KEY] = dev_handle,
+			[UIH_DH_KEY] = devmap_handle,
 			[UIH_INDEX_KEY] = fidx->index,
 		};
@@ -456,5 +456,5 @@
 {
 	unsigned long pkey[] = {
-		[UPH_DH_KEY] = idx->dev_handle,
+		[UPH_DH_KEY] = idx->devmap_handle,
 		[UPH_PFC_KEY] = idx->pfc,
 		[UPH_PDI_KEY] = idx->pdi,
@@ -469,5 +469,5 @@
 {
 	unsigned long pkey[] = {
-		[UPH_DH_KEY] = idx->dev_handle,
+		[UPH_DH_KEY] = idx->devmap_handle,
 		[UPH_PFC_KEY] = idx->pfc,
 		[UPH_PDI_KEY] = idx->pdi,
@@ -480,10 +480,10 @@
 
 fat_idx_t *
-fat_idx_get_by_index(dev_handle_t dev_handle, fs_index_t index)
+fat_idx_get_by_index(devmap_handle_t devmap_handle, fs_index_t index)
 {
 	fat_idx_t *fidx = NULL;
 	link_t *l;
 	unsigned long ikey[] = {
-		[UIH_DH_KEY] = dev_handle,
+		[UIH_DH_KEY] = devmap_handle,
 		[UIH_INDEX_KEY] = index,
 	};
@@ -507,8 +507,8 @@
 {
 	unsigned long ikey[] = {
-		[UIH_DH_KEY] = idx->dev_handle,
+		[UIH_DH_KEY] = idx->devmap_handle,
 		[UIH_INDEX_KEY] = idx->index,
 	};
-	dev_handle_t dev_handle = idx->dev_handle;
+	devmap_handle_t devmap_handle = idx->devmap_handle;
 	fs_index_t index = idx->index;
 
@@ -524,5 +524,5 @@
 	fibril_mutex_unlock(&used_lock);
 	/* Release the VFS index. */
-	fat_index_free(dev_handle, index);
+	fat_index_free(devmap_handle, index);
 	/* The index structure itself is freed in idx_remove_callback(). */
 }
@@ -546,5 +546,5 @@
 }
 
-int fat_idx_init_by_dev_handle(dev_handle_t dev_handle)
+int fat_idx_init_by_devmap_handle(devmap_handle_t devmap_handle)
 {
 	unused_t *u;
@@ -554,7 +554,7 @@
 	if (!u)
 		return ENOMEM;
-	unused_initialize(u, dev_handle);
+	unused_initialize(u, devmap_handle);
 	fibril_mutex_lock(&unused_lock);
-	if (!unused_find(dev_handle, false)) {
+	if (!unused_find(devmap_handle, false)) {
 		list_append(&u->link, &unused_head);
 	} else {
@@ -566,11 +566,11 @@
 }
 
-void fat_idx_fini_by_dev_handle(dev_handle_t dev_handle)
+void fat_idx_fini_by_devmap_handle(devmap_handle_t devmap_handle)
 {
 	unsigned long ikey[] = {
-		[UIH_DH_KEY] = dev_handle
+		[UIH_DH_KEY] = devmap_handle
 	};
 	unsigned long pkey[] = {
-		[UPH_DH_KEY] = dev_handle
+		[UPH_DH_KEY] = devmap_handle
 	};
 
@@ -588,5 +588,5 @@
 	 * Free the unused and freed structures for this instance.
 	 */
-	unused_t *u = unused_find(dev_handle, true);
+	unused_t *u = unused_find(devmap_handle, true);
 	assert(u);
 	list_remove(&u->link);
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/fat/fat_ops.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -72,10 +72,10 @@
  * Forward declarations of FAT libfs operations.
  */
-static int fat_root_get(fs_node_t **, dev_handle_t);
+static int fat_root_get(fs_node_t **, devmap_handle_t);
 static int fat_match(fs_node_t **, fs_node_t *, const char *);
-static int fat_node_get(fs_node_t **, dev_handle_t, fs_index_t);
+static int fat_node_get(fs_node_t **, devmap_handle_t, fs_index_t);
 static int fat_node_open(fs_node_t *);
 static int fat_node_put(fs_node_t *);
-static int fat_create_node(fs_node_t **, dev_handle_t, int);
+static int fat_create_node(fs_node_t **, devmap_handle_t, int);
 static int fat_destroy_node(fs_node_t *);
 static int fat_link(fs_node_t *, fs_node_t *, const char *);
@@ -88,5 +88,5 @@
 static bool fat_is_directory(fs_node_t *);
 static bool fat_is_file(fs_node_t *node);
-static dev_handle_t fat_device_get(fs_node_t *node);
+static devmap_handle_t fat_device_get(fs_node_t *node);
 
 /*
@@ -120,8 +120,8 @@
 	assert(node->dirty);
 
-	bs = block_bb_get(node->idx->dev_handle);
+	bs = block_bb_get(node->idx->devmap_handle);
 	
 	/* Read the block that contains the dentry of interest. */
-	rc = _fat_block_get(&b, bs, node->idx->dev_handle, node->idx->pfc,
+	rc = _fat_block_get(&b, bs, node->idx->devmap_handle, node->idx->pfc,
 	    NULL, (node->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs),
 	    BLOCK_FLAGS_NONE);
@@ -145,5 +145,5 @@
 }
 
-static int fat_node_fini_by_dev_handle(dev_handle_t dev_handle)
+static int fat_node_fini_by_devmap_handle(devmap_handle_t devmap_handle)
 {
 	link_t *lnk;
@@ -170,5 +170,5 @@
 			goto restart;
 		}
-		if (nodep->idx->dev_handle != dev_handle) {
+		if (nodep->idx->devmap_handle != devmap_handle) {
 			fibril_mutex_unlock(&nodep->idx->lock);
 			fibril_mutex_unlock(&nodep->lock);
@@ -299,8 +299,8 @@
 		return rc;
 
-	bs = block_bb_get(idxp->dev_handle);
+	bs = block_bb_get(idxp->devmap_handle);
 
 	/* Read the block that contains the dentry of interest. */
-	rc = _fat_block_get(&b, bs, idxp->dev_handle, idxp->pfc, NULL,
+	rc = _fat_block_get(&b, bs, idxp->devmap_handle, idxp->pfc, NULL,
 	    (idxp->pdi * sizeof(fat_dentry_t)) / BPS(bs), BLOCK_FLAGS_NONE);
 	if (rc != EOK) {
@@ -323,5 +323,5 @@
 		 */
 		uint16_t clusters;
-		rc = fat_clusters_get(&clusters, bs, idxp->dev_handle,
+		rc = fat_clusters_get(&clusters, bs, idxp->devmap_handle,
 		    uint16_t_le2host(d->firstc));
 		if (rc != EOK) {
@@ -356,7 +356,7 @@
  */
 
-int fat_root_get(fs_node_t **rfn, dev_handle_t dev_handle)
-{
-	return fat_node_get(rfn, dev_handle, 0);
+int fat_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle)
+{
+	return fat_node_get(rfn, devmap_handle, 0);
 }
 
@@ -369,13 +369,13 @@
 	unsigned blocks;
 	fat_dentry_t *d;
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 	block_t *b;
 	int rc;
 
 	fibril_mutex_lock(&parentp->idx->lock);
-	dev_handle = parentp->idx->dev_handle;
+	devmap_handle = parentp->idx->devmap_handle;
 	fibril_mutex_unlock(&parentp->idx->lock);
 
-	bs = block_bb_get(dev_handle);
+	bs = block_bb_get(devmap_handle);
 	blocks = parentp->size / BPS(bs);
 	for (i = 0; i < blocks; i++) {
@@ -402,5 +402,5 @@
 				/* hit */
 				fat_node_t *nodep;
-				fat_idx_t *idx = fat_idx_get_by_pos(dev_handle,
+				fat_idx_t *idx = fat_idx_get_by_pos(devmap_handle,
 				    parentp->firstc, i * DPS(bs) + j);
 				if (!idx) {
@@ -435,5 +435,5 @@
 
 /** Instantiate a FAT in-core node. */
-int fat_node_get(fs_node_t **rfn, dev_handle_t dev_handle, fs_index_t index)
+int fat_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index)
 {
 	fat_node_t *nodep;
@@ -441,5 +441,5 @@
 	int rc;
 
-	idxp = fat_idx_get_by_index(dev_handle, index);
+	idxp = fat_idx_get_by_index(devmap_handle, index);
 	if (!idxp) {
 		*rfn = NULL;
@@ -492,5 +492,5 @@
 }
 
-int fat_create_node(fs_node_t **rfn, dev_handle_t dev_handle, int flags)
+int fat_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int flags)
 {
 	fat_idx_t *idxp;
@@ -500,14 +500,14 @@
 	int rc;
 
-	bs = block_bb_get(dev_handle);
+	bs = block_bb_get(devmap_handle);
 	if (flags & L_DIRECTORY) {
 		/* allocate a cluster */
-		rc = fat_alloc_clusters(bs, dev_handle, 1, &mcl, &lcl);
+		rc = fat_alloc_clusters(bs, devmap_handle, 1, &mcl, &lcl);
 		if (rc != EOK)
 			return rc;
 		/* populate the new cluster with unused dentries */
-		rc = fat_zero_cluster(bs, dev_handle, mcl);
+		rc = fat_zero_cluster(bs, devmap_handle, mcl);
 		if (rc != EOK) {
-			(void) fat_free_clusters(bs, dev_handle, mcl);
+			(void) fat_free_clusters(bs, devmap_handle, mcl);
 			return rc;
 		}
@@ -516,10 +516,10 @@
 	rc = fat_node_get_new(&nodep);
 	if (rc != EOK) {
-		(void) fat_free_clusters(bs, dev_handle, mcl);
+		(void) fat_free_clusters(bs, devmap_handle, mcl);
 		return rc;
 	}
-	rc = fat_idx_get_new(&idxp, dev_handle);
-	if (rc != EOK) {
-		(void) fat_free_clusters(bs, dev_handle, mcl);	
+	rc = fat_idx_get_new(&idxp, devmap_handle);
+	if (rc != EOK) {
+		(void) fat_free_clusters(bs, devmap_handle, mcl);	
 		(void) fat_node_put(FS_NODE(nodep));
 		return rc;
@@ -570,9 +570,9 @@
 	assert(!has_children);
 
-	bs = block_bb_get(nodep->idx->dev_handle);
+	bs = block_bb_get(nodep->idx->devmap_handle);
 	if (nodep->firstc != FAT_CLST_RES0) {
 		assert(nodep->size);
 		/* Free all clusters allocated to the node. */
-		rc = fat_free_clusters(bs, nodep->idx->dev_handle,
+		rc = fat_free_clusters(bs, nodep->idx->devmap_handle,
 		    nodep->firstc);
 	}
@@ -620,5 +620,5 @@
 	
 	fibril_mutex_lock(&parentp->idx->lock);
-	bs = block_bb_get(parentp->idx->dev_handle);
+	bs = block_bb_get(parentp->idx->devmap_handle);
 
 	blocks = parentp->size / BPS(bs);
@@ -659,12 +659,12 @@
 		return ENOSPC;
 	}
-	rc = fat_alloc_clusters(bs, parentp->idx->dev_handle, 1, &mcl, &lcl);
+	rc = fat_alloc_clusters(bs, parentp->idx->devmap_handle, 1, &mcl, &lcl);
 	if (rc != EOK) {
 		fibril_mutex_unlock(&parentp->idx->lock);
 		return rc;
 	}
-	rc = fat_zero_cluster(bs, parentp->idx->dev_handle, mcl);
-	if (rc != EOK) {
-		(void) fat_free_clusters(bs, parentp->idx->dev_handle, mcl);
+	rc = fat_zero_cluster(bs, parentp->idx->devmap_handle, mcl);
+	if (rc != EOK) {
+		(void) fat_free_clusters(bs, parentp->idx->devmap_handle, mcl);
 		fibril_mutex_unlock(&parentp->idx->lock);
 		return rc;
@@ -672,5 +672,5 @@
 	rc = fat_append_clusters(bs, parentp, mcl, lcl);
 	if (rc != EOK) {
-		(void) fat_free_clusters(bs, parentp->idx->dev_handle, mcl);
+		(void) fat_free_clusters(bs, parentp->idx->devmap_handle, mcl);
 		fibril_mutex_unlock(&parentp->idx->lock);
 		return rc;
@@ -789,7 +789,7 @@
 	assert(childp->lnkcnt == 1);
 	fibril_mutex_lock(&childp->idx->lock);
-	bs = block_bb_get(childp->idx->dev_handle);
-
-	rc = _fat_block_get(&b, bs, childp->idx->dev_handle, childp->idx->pfc,
+	bs = block_bb_get(childp->idx->devmap_handle);
+
+	rc = _fat_block_get(&b, bs, childp->idx->devmap_handle, childp->idx->pfc,
 	    NULL, (childp->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs),
 	    BLOCK_FLAGS_NONE);
@@ -840,5 +840,5 @@
 	
 	fibril_mutex_lock(&nodep->idx->lock);
-	bs = block_bb_get(nodep->idx->dev_handle);
+	bs = block_bb_get(nodep->idx->devmap_handle);
 
 	blocks = nodep->size / BPS(bs);
@@ -914,5 +914,5 @@
 }
 
-dev_handle_t fat_device_get(fs_node_t *node)
+devmap_handle_t fat_device_get(fs_node_t *node)
 {
 	return 0;
@@ -946,5 +946,5 @@
 void fat_mounted(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	enum cache_mode cmode;
 	fat_bs_t *bs;
@@ -968,5 +968,5 @@
 
 	/* initialize libblock */
-	rc = block_init(dev_handle, BS_SIZE);
+	rc = block_init(devmap_handle, BS_SIZE);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -975,7 +975,7 @@
 
 	/* prepare the boot block */
-	rc = block_bb_read(dev_handle, BS_BLOCK);
-	if (rc != EOK) {
-		block_fini(dev_handle);
+	rc = block_bb_read(devmap_handle, BS_BLOCK);
+	if (rc != EOK) {
+		block_fini(devmap_handle);
 		ipc_answer_0(rid, rc);
 		return;
@@ -983,8 +983,8 @@
 
 	/* get the buffer with the boot sector */
-	bs = block_bb_get(dev_handle);
+	bs = block_bb_get(devmap_handle);
 	
 	if (BPS(bs) != BS_SIZE) {
-		block_fini(dev_handle);
+		block_fini(devmap_handle);
 		ipc_answer_0(rid, ENOTSUP);
 		return;
@@ -992,7 +992,7 @@
 
 	/* Initialize the block cache */
-	rc = block_cache_init(dev_handle, BPS(bs), 0 /* XXX */, cmode);
-	if (rc != EOK) {
-		block_fini(dev_handle);
+	rc = block_cache_init(devmap_handle, BPS(bs), 0 /* XXX */, cmode);
+	if (rc != EOK) {
+		block_fini(devmap_handle);
 		ipc_answer_0(rid, rc);
 		return;
@@ -1000,16 +1000,16 @@
 
 	/* Do some simple sanity checks on the file system. */
-	rc = fat_sanity_check(bs, dev_handle);
-	if (rc != EOK) {
-		(void) block_cache_fini(dev_handle);
-		block_fini(dev_handle);
+	rc = fat_sanity_check(bs, devmap_handle);
+	if (rc != EOK) {
+		(void) block_cache_fini(devmap_handle);
+		block_fini(devmap_handle);
 		ipc_answer_0(rid, rc);
 		return;
 	}
 
-	rc = fat_idx_init_by_dev_handle(dev_handle);
-	if (rc != EOK) {
-		(void) block_cache_fini(dev_handle);
-		block_fini(dev_handle);
+	rc = fat_idx_init_by_devmap_handle(devmap_handle);
+	if (rc != EOK) {
+		(void) block_cache_fini(devmap_handle);
+		block_fini(devmap_handle);
 		ipc_answer_0(rid, rc);
 		return;
@@ -1019,7 +1019,7 @@
 	fs_node_t *rfn = (fs_node_t *)malloc(sizeof(fs_node_t));
 	if (!rfn) {
-		(void) block_cache_fini(dev_handle);
-		block_fini(dev_handle);
-		fat_idx_fini_by_dev_handle(dev_handle);
+		(void) block_cache_fini(devmap_handle);
+		block_fini(devmap_handle);
+		fat_idx_fini_by_devmap_handle(devmap_handle);
 		ipc_answer_0(rid, ENOMEM);
 		return;
@@ -1029,7 +1029,7 @@
 	if (!rootp) {
 		free(rfn);
-		(void) block_cache_fini(dev_handle);
-		block_fini(dev_handle);
-		fat_idx_fini_by_dev_handle(dev_handle);
+		(void) block_cache_fini(devmap_handle);
+		block_fini(devmap_handle);
+		fat_idx_fini_by_devmap_handle(devmap_handle);
 		ipc_answer_0(rid, ENOMEM);
 		return;
@@ -1037,11 +1037,11 @@
 	fat_node_initialize(rootp);
 
-	fat_idx_t *ridxp = fat_idx_get_by_pos(dev_handle, FAT_CLST_ROOTPAR, 0);
+	fat_idx_t *ridxp = fat_idx_get_by_pos(devmap_handle, FAT_CLST_ROOTPAR, 0);
 	if (!ridxp) {
 		free(rfn);
 		free(rootp);
-		(void) block_cache_fini(dev_handle);
-		block_fini(dev_handle);
-		fat_idx_fini_by_dev_handle(dev_handle);
+		(void) block_cache_fini(devmap_handle);
+		block_fini(devmap_handle);
+		fat_idx_fini_by_devmap_handle(devmap_handle);
 		ipc_answer_0(rid, ENOMEM);
 		return;
@@ -1072,10 +1072,10 @@
 void fat_unmounted(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_node_t *fn;
 	fat_node_t *nodep;
 	int rc;
 
-	rc = fat_root_get(&fn, dev_handle);
+	rc = fat_root_get(&fn, devmap_handle);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1105,8 +1105,8 @@
 	 * stop using libblock for this instance.
 	 */
-	(void) fat_node_fini_by_dev_handle(dev_handle);
-	fat_idx_fini_by_dev_handle(dev_handle);
-	(void) block_cache_fini(dev_handle);
-	block_fini(dev_handle);
+	(void) fat_node_fini_by_devmap_handle(devmap_handle);
+	fat_idx_fini_by_devmap_handle(devmap_handle);
+	(void) block_cache_fini(devmap_handle);
+	block_fini(devmap_handle);
 
 	ipc_answer_0(rid, EOK);
@@ -1125,5 +1125,5 @@
 void fat_read(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 	aoff64_t pos =
@@ -1136,5 +1136,5 @@
 	int rc;
 
-	rc = fat_node_get(&fn, dev_handle, index);
+	rc = fat_node_get(&fn, devmap_handle, index);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1156,5 +1156,5 @@
 	}
 
-	bs = block_bb_get(dev_handle);
+	bs = block_bb_get(devmap_handle);
 
 	if (nodep->type == FAT_FILE) {
@@ -1262,5 +1262,5 @@
 void fat_write(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 	aoff64_t pos =
@@ -1275,5 +1275,5 @@
 	int rc;
 	
-	rc = fat_node_get(&fn, dev_handle, index);
+	rc = fat_node_get(&fn, devmap_handle, index);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1295,5 +1295,5 @@
 	}
 
-	bs = block_bb_get(dev_handle);
+	bs = block_bb_get(devmap_handle);
 
 	/*
@@ -1357,5 +1357,5 @@
 		nclsts = (ROUND_UP(pos + bytes, BPC(bs)) - boundary) / BPC(bs);
 		/* create an independent chain of nclsts clusters in all FATs */
-		rc = fat_alloc_clusters(bs, dev_handle, nclsts, &mcl, &lcl);
+		rc = fat_alloc_clusters(bs, devmap_handle, nclsts, &mcl, &lcl);
 		if (rc != EOK) {
 			/* could not allocate a chain of nclsts clusters */
@@ -1368,5 +1368,5 @@
 		rc = fat_fill_gap(bs, nodep, mcl, pos);
 		if (rc != EOK) {
-			(void) fat_free_clusters(bs, dev_handle, mcl);
+			(void) fat_free_clusters(bs, devmap_handle, mcl);
 			(void) fat_node_put(fn);
 			ipc_answer_0(callid, rc);
@@ -1374,8 +1374,8 @@
 			return;
 		}
-		rc = _fat_block_get(&b, bs, dev_handle, lcl, NULL,
+		rc = _fat_block_get(&b, bs, devmap_handle, lcl, NULL,
 		    (pos / BPS(bs)) % SPC(bs), flags);
 		if (rc != EOK) {
-			(void) fat_free_clusters(bs, dev_handle, mcl);
+			(void) fat_free_clusters(bs, devmap_handle, mcl);
 			(void) fat_node_put(fn);
 			ipc_answer_0(callid, rc);
@@ -1388,5 +1388,5 @@
 		rc = block_put(b);
 		if (rc != EOK) {
-			(void) fat_free_clusters(bs, dev_handle, mcl);
+			(void) fat_free_clusters(bs, devmap_handle, mcl);
 			(void) fat_node_put(fn);
 			ipc_answer_0(rid, rc);
@@ -1399,5 +1399,5 @@
 		rc = fat_append_clusters(bs, nodep, mcl, lcl);
 		if (rc != EOK) {
-			(void) fat_free_clusters(bs, dev_handle, mcl);
+			(void) fat_free_clusters(bs, devmap_handle, mcl);
 			(void) fat_node_put(fn);
 			ipc_answer_0(rid, rc);
@@ -1414,5 +1414,5 @@
 void fat_truncate(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 	aoff64_t size =
@@ -1423,5 +1423,5 @@
 	int rc;
 
-	rc = fat_node_get(&fn, dev_handle, index);
+	rc = fat_node_get(&fn, devmap_handle, index);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1434,5 +1434,5 @@
 	nodep = FAT_NODE(fn);
 
-	bs = block_bb_get(dev_handle);
+	bs = block_bb_get(devmap_handle);
 
 	if (nodep->size == size) {
@@ -1461,5 +1461,5 @@
 		} else {
 			fat_cluster_t lastc;
-			rc = fat_cluster_walk(bs, dev_handle, nodep->firstc,
+			rc = fat_cluster_walk(bs, devmap_handle, nodep->firstc,
 			    &lastc, NULL, (size - 1) / BPC(bs));
 			if (rc != EOK)
@@ -1486,10 +1486,10 @@
 void fat_destroy(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t)IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
 	fs_node_t *fn;
 	int rc;
 
-	rc = fat_node_get(&fn, dev_handle, index);
+	rc = fat_node_get(&fn, devmap_handle, index);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
@@ -1517,9 +1517,9 @@
 void fat_sync(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 	
 	fs_node_t *fn;
-	int rc = fat_node_get(&fn, dev_handle, index);
+	int rc = fat_node_get(&fn, devmap_handle, index);
 	if (rc != EOK) {
 		ipc_answer_0(rid, rc);
Index: uspace/srv/fs/tmpfs/tmpfs.h
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/tmpfs/tmpfs.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -62,5 +62,5 @@
 	fs_node_t *bp;		/**< Back pointer to the FS node. */
 	fs_index_t index;	/**< TMPFS node index. */
-	dev_handle_t dev_handle;/**< Device handle. */
+	devmap_handle_t devmap_handle;/**< Device handle. */
 	link_t nh_link;		/**< Nodes hash table link. */
 	tmpfs_dentry_type_t type;
@@ -91,5 +91,5 @@
 extern void tmpfs_sync(ipc_callid_t, ipc_call_t *);
 
-extern bool tmpfs_restore(dev_handle_t);
+extern bool tmpfs_restore(devmap_handle_t);
 
 #endif
Index: uspace/srv/fs/tmpfs/tmpfs_dump.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/tmpfs/tmpfs_dump.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -55,5 +55,5 @@
 
 static bool
-tmpfs_restore_recursion(dev_handle_t dev, size_t *bufpos, size_t *buflen,
+tmpfs_restore_recursion(devmap_handle_t dev, size_t *bufpos, size_t *buflen,
     aoff64_t *pos, fs_node_t *pfn)
 {
@@ -161,5 +161,5 @@
 }
 
-bool tmpfs_restore(dev_handle_t dev)
+bool tmpfs_restore(devmap_handle_t dev)
 {
 	libfs_ops_t *ops = &tmpfs_libfs_ops;
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -70,8 +70,8 @@
 /* Forward declarations of static functions. */
 static int tmpfs_match(fs_node_t **, fs_node_t *, const char *);
-static int tmpfs_node_get(fs_node_t **, dev_handle_t, fs_index_t);
+static int tmpfs_node_get(fs_node_t **, devmap_handle_t, fs_index_t);
 static int tmpfs_node_open(fs_node_t *);
 static int tmpfs_node_put(fs_node_t *);
-static int tmpfs_create_node(fs_node_t **, dev_handle_t, int);
+static int tmpfs_create_node(fs_node_t **, devmap_handle_t, int);
 static int tmpfs_destroy_node(fs_node_t *);
 static int tmpfs_link_node(fs_node_t *, fs_node_t *, const char *);
@@ -79,7 +79,7 @@
 
 /* Implementation of helper functions. */
-static int tmpfs_root_get(fs_node_t **rfn, dev_handle_t dev_handle)
-{
-	return tmpfs_node_get(rfn, dev_handle, TMPFS_SOME_ROOT); 
+static int tmpfs_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle)
+{
+	return tmpfs_node_get(rfn, devmap_handle, TMPFS_SOME_ROOT); 
 }
 
@@ -120,5 +120,5 @@
 }
 
-static dev_handle_t tmpfs_device_get(fs_node_t *fn)
+static devmap_handle_t tmpfs_device_get(fs_node_t *fn)
 {
 	return 0;
@@ -165,7 +165,7 @@
 	switch (keys) {
 	case 1:
-		return (nodep->dev_handle == key[NODES_KEY_DEV]);
+		return (nodep->devmap_handle == key[NODES_KEY_DEV]);
 	case 2:	
-		return ((nodep->dev_handle == key[NODES_KEY_DEV]) &&
+		return ((nodep->devmap_handle == key[NODES_KEY_DEV]) &&
 		    (nodep->index == key[NODES_KEY_INDEX]));
 	default:
@@ -209,5 +209,5 @@
 	nodep->bp = NULL;
 	nodep->index = 0;
-	nodep->dev_handle = 0;
+	nodep->devmap_handle = 0;
 	nodep->type = TMPFS_NONE;
 	nodep->lnkcnt = 0;
@@ -233,10 +233,10 @@
 }
 
-static bool tmpfs_instance_init(dev_handle_t dev_handle)
+static bool tmpfs_instance_init(devmap_handle_t devmap_handle)
 {
 	fs_node_t *rfn;
 	int rc;
 	
-	rc = tmpfs_create_node(&rfn, dev_handle, L_DIRECTORY);
+	rc = tmpfs_create_node(&rfn, devmap_handle, L_DIRECTORY);
 	if (rc != EOK || !rfn)
 		return false;
@@ -245,8 +245,8 @@
 }
 
-static void tmpfs_instance_done(dev_handle_t dev_handle)
+static void tmpfs_instance_done(devmap_handle_t devmap_handle)
 {
 	unsigned long key[] = {
-		[NODES_KEY_DEV] = dev_handle
+		[NODES_KEY_DEV] = devmap_handle
 	};
 	/*
@@ -279,8 +279,8 @@
 }
 
-int tmpfs_node_get(fs_node_t **rfn, dev_handle_t dev_handle, fs_index_t index)
+int tmpfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index)
 {
 	unsigned long key[] = {
-		[NODES_KEY_DEV] = dev_handle,
+		[NODES_KEY_DEV] = devmap_handle,
 		[NODES_KEY_INDEX] = index
 	};
@@ -308,5 +308,5 @@
 }
 
-int tmpfs_create_node(fs_node_t **rfn, dev_handle_t dev_handle, int lflag)
+int tmpfs_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int lflag)
 {
 	fs_node_t *rootfn;
@@ -327,5 +327,5 @@
 	nodep->bp->data = nodep;	/* link the FS and TMPFS nodes */
 
-	rc = tmpfs_root_get(&rootfn, dev_handle);
+	rc = tmpfs_root_get(&rootfn, devmap_handle);
 	assert(rc == EOK);
 	if (!rootfn)
@@ -333,5 +333,5 @@
 	else
 		nodep->index = tmpfs_next_index++;
-	nodep->dev_handle = dev_handle;
+	nodep->devmap_handle = devmap_handle;
 	if (lflag & L_DIRECTORY) 
 		nodep->type = TMPFS_DIRECTORY;
@@ -341,5 +341,5 @@
 	/* Insert the new node into the nodes hash table. */
 	unsigned long key[] = {
-		[NODES_KEY_DEV] = nodep->dev_handle,
+		[NODES_KEY_DEV] = nodep->devmap_handle,
 		[NODES_KEY_INDEX] = nodep->index
 	};
@@ -357,5 +357,5 @@
 
 	unsigned long key[] = {
-		[NODES_KEY_DEV] = nodep->dev_handle,
+		[NODES_KEY_DEV] = nodep->devmap_handle,
 		[NODES_KEY_INDEX] = nodep->index
 	};
@@ -442,5 +442,5 @@
 void tmpfs_mounted(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_node_t *rootfn;
 	int rc;
@@ -455,5 +455,5 @@
 
 	/* Check if this device is not already mounted. */
-	rc = tmpfs_root_get(&rootfn, dev_handle);
+	rc = tmpfs_root_get(&rootfn, devmap_handle);
 	if ((rc == EOK) && (rootfn)) {
 		(void) tmpfs_node_put(rootfn);
@@ -464,5 +464,5 @@
 
 	/* Initialize TMPFS instance. */
-	if (!tmpfs_instance_init(dev_handle)) {
+	if (!tmpfs_instance_init(devmap_handle)) {
 		free(opts);
 		ipc_answer_0(rid, ENOMEM);
@@ -470,9 +470,9 @@
 	}
 
-	rc = tmpfs_root_get(&rootfn, dev_handle);
+	rc = tmpfs_root_get(&rootfn, devmap_handle);
 	assert(rc == EOK);
 	tmpfs_node_t *rootp = TMPFS_NODE(rootfn);
 	if (str_cmp(opts, "restore") == 0) {
-		if (tmpfs_restore(dev_handle))
+		if (tmpfs_restore(devmap_handle))
 			ipc_answer_3(rid, EOK, rootp->index, rootp->size,
 			    rootp->lnkcnt);
@@ -493,7 +493,7 @@
 void tmpfs_unmounted(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
-
-	tmpfs_instance_done(dev_handle);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+
+	tmpfs_instance_done(devmap_handle);
 	ipc_answer_0(rid, EOK);
 }
@@ -511,5 +511,5 @@
 void tmpfs_read(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 	aoff64_t pos =
@@ -521,5 +521,5 @@
 	link_t *hlp;
 	unsigned long key[] = {
-		[NODES_KEY_DEV] = dev_handle,
+		[NODES_KEY_DEV] = devmap_handle,
 		[NODES_KEY_INDEX] = index
 	};
@@ -586,5 +586,5 @@
 void tmpfs_write(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 	aoff64_t pos =
@@ -596,5 +596,5 @@
 	link_t *hlp;
 	unsigned long key[] = {
-		[NODES_KEY_DEV] = dev_handle,
+		[NODES_KEY_DEV] = devmap_handle,
 		[NODES_KEY_INDEX] = index
 	};
@@ -651,5 +651,5 @@
 void tmpfs_truncate(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 	aoff64_t size =
@@ -660,5 +660,5 @@
 	 */
 	unsigned long key[] = {
-		[NODES_KEY_DEV] = dev_handle,
+		[NODES_KEY_DEV] = devmap_handle,
 		[NODES_KEY_INDEX] = index
 	};
@@ -704,5 +704,5 @@
 void tmpfs_destroy(ipc_callid_t rid, ipc_call_t *request)
 {
-	dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t)IPC_GET_ARG1(*request);
 	fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
 	int rc;
@@ -710,5 +710,5 @@
 	link_t *hlp;
 	unsigned long key[] = {
-		[NODES_KEY_DEV] = dev_handle,
+		[NODES_KEY_DEV] = devmap_handle,
 		[NODES_KEY_INDEX] = index
 	};
Index: uspace/srv/hid/adb_mouse/adb_mouse.c
===================================================================
--- uspace/srv/hid/adb_mouse/adb_mouse.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hid/adb_mouse/adb_mouse.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -78,6 +78,6 @@
 	snprintf(dev_path, DEVMAP_NAME_MAXLEN, "%s/mouse", NAMESPACE);
 
-	dev_handle_t dev_handle;
-	if (devmap_device_register(dev_path, &dev_handle) != EOK) {
+	devmap_handle_t devmap_handle;
+	if (devmap_device_register(dev_path, &devmap_handle) != EOK) {
 		printf(NAME ": Unable to register device %s\n", dev_path);
 		return -1;
Index: uspace/srv/hid/char_mouse/char_mouse.c
===================================================================
--- uspace/srv/hid/char_mouse/char_mouse.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hid/char_mouse/char_mouse.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -134,6 +134,6 @@
 	snprintf(dev_path, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
 
-	dev_handle_t dev_handle;
-	if (devmap_device_register(dev_path, &dev_handle) != EOK) {
+	devmap_handle_t devmap_handle;
+	if (devmap_device_register(dev_path, &devmap_handle) != EOK) {
 		printf(NAME ": Unable to register device %s\n", dev_path);
 		return -1;
Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hid/console/console.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -82,5 +82,5 @@
 	size_t index;             /**< Console index */
 	size_t refcount;          /**< Connection reference count */
-	dev_handle_t dev_handle;  /**< Device handle */
+	devmap_handle_t devmap_handle;  /**< Device handle */
 	keybuffer_t keybuffer;    /**< Buffer for incoming keys. */
 	screenbuffer_t scr;       /**< Screenbuffer for saving screen
@@ -571,5 +571,5 @@
 			continue;
 		
-		if (consoles[i].dev_handle == (dev_handle_t) IPC_GET_ARG1(*icall)) {
+		if (consoles[i].devmap_handle == (devmap_handle_t) IPC_GET_ARG1(*icall)) {
 			cons = &consoles[i];
 			break;
@@ -815,5 +815,5 @@
 			snprintf(vc, DEVMAP_NAME_MAXLEN, "%s/vc%u", NAMESPACE, i);
 			
-			if (devmap_device_register(vc, &consoles[i].dev_handle) != EOK) {
+			if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {
 				devmap_hangup_phone(DEVMAP_DRIVER);
 				printf(NAME ": Unable to register device %s\n", vc);
Index: uspace/srv/hid/kbd/generic/kbd.c
===================================================================
--- uspace/srv/hid/kbd/generic/kbd.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hid/kbd/generic/kbd.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -250,6 +250,6 @@
 	snprintf(kbd, DEVMAP_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
 	
-	dev_handle_t dev_handle;
-	if (devmap_device_register(kbd, &dev_handle) != EOK) {
+	devmap_handle_t devmap_handle;
+	if (devmap_device_register(kbd, &devmap_handle) != EOK) {
 		printf("%s: Unable to register device %s\n", NAME, kbd);
 		return -1;
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -99,5 +99,5 @@
 		return -1;
 
-	rc = devmap_device_register(NAMESPACE "/mouse", &ts->dev_handle);
+	rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
 	if (rc != EOK) {
 		devmap_hangup_phone(DEVMAP_DRIVER);
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -125,5 +125,5 @@
 
 	/** Device handle */
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 
 	/** Device/driver state */
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -143,5 +143,5 @@
 int main(int argc, char *argv[])
 {
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 	int rc;
 	int i;
@@ -151,5 +151,5 @@
 	for (i = 0; i < ADB_MAX_ADDR; ++i) {
 		adb_dev[i].client_phone = -1;
-		adb_dev[i].dev_handle = 0;
+		adb_dev[i].devmap_handle = 0;
 	}
 
@@ -160,5 +160,5 @@
 	}
 
-	rc = devmap_device_register("adb/kbd", &dev_handle);
+	rc = devmap_device_register("adb/kbd", &devmap_handle);
 	if (rc != EOK) {
 		devmap_hangup_phone(DEVMAP_DRIVER);
@@ -167,8 +167,8 @@
 	}
 
-	adb_dev[2].dev_handle = dev_handle;
-	adb_dev[8].dev_handle = dev_handle;
-
-	rc = devmap_device_register("adb/mouse", &dev_handle);
+	adb_dev[2].devmap_handle = devmap_handle;
+	adb_dev[8].devmap_handle = devmap_handle;
+
+	rc = devmap_device_register("adb/mouse", &devmap_handle);
 	if (rc != EOK) {
 		devmap_hangup_phone(DEVMAP_DRIVER);
@@ -177,5 +177,5 @@
 	}
 
-	adb_dev[9].dev_handle = dev_handle;
+	adb_dev[9].devmap_handle = devmap_handle;
 
 	if (cuda_init() < 0) {
@@ -196,5 +196,5 @@
 	ipc_call_t call;
 	ipcarg_t method;
-	dev_handle_t dh;
+	devmap_handle_t dh;
 	int retval;
 	int dev_addr, i;
@@ -206,5 +206,5 @@
 	dev_addr = -1;
 	for (i = 0; i < ADB_MAX_ADDR; i++) {
-		if (adb_dev[i].dev_handle == dh)
+		if (adb_dev[i].devmap_handle == dh)
 			dev_addr = i;
 	}
@@ -237,5 +237,5 @@
 			 */
 			for (i = 0; i < ADB_MAX_ADDR; ++i) {
-				if (adb_dev[i].dev_handle == dh) {
+				if (adb_dev[i].devmap_handle == dh) {
 					adb_dev[i].client_phone = IPC_GET_ARG5(call);
 				}
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.h
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -104,5 +104,5 @@
 
 typedef struct {
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 	int client_phone;
 } adb_dev_t;
Index: uspace/srv/hw/char/i8042/i8042.c
===================================================================
--- uspace/srv/hw/char/i8042/i8042.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hw/char/i8042/i8042.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -145,5 +145,5 @@
 
 		snprintf(name, 16, "%s/ps2%c", NAMESPACE, dchar[i]);
-		rc = devmap_device_register(name, &i8042_port[i].dev_handle);
+		rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
 		if (rc != EOK) {
 			devmap_hangup_phone(DEVMAP_DRIVER);
@@ -218,5 +218,5 @@
 	ipc_call_t call;
 	ipcarg_t method;
-	dev_handle_t dh;
+	devmap_handle_t dh;
 	int retval;
 	int dev_id, i;
@@ -230,5 +230,5 @@
 	dev_id = -1;
 	for (i = 0; i < MAX_DEVS; i++) {
-		if (i8042_port[i].dev_handle == dh)
+		if (i8042_port[i].devmap_handle == dh)
 			dev_id = i;
 	}
Index: uspace/srv/hw/char/i8042/i8042.h
===================================================================
--- uspace/srv/hw/char/i8042/i8042.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hw/char/i8042/i8042.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -52,5 +52,5 @@
 /** Softstate structure, one for each serial port (primary and aux). */
 typedef struct {
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 	int client_phone;
 } i8042_port_t;
Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -92,5 +92,5 @@
 		return -1;
 
-	rc = devmap_device_register(NAMESPACE "/" NAME, &uart->dev_handle);
+	rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
 	if (rc != EOK) {
 		devmap_hangup_phone(DEVMAP_DRIVER);
Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -88,5 +88,5 @@
 
 	/** Device handle */
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 } s3c24xx_uart_t;
 
Index: uspace/srv/hw/netif/dp8390/dp8390.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hw/netif/dp8390/dp8390.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -62,6 +62,6 @@
  *  @param[in] dep The network interface structure.
  *  @param[in] packet The outgoing packet.
- *  @returns EOK on success.
- *  @returns EINVAL 
+ *  @return EOK on success.
+ *  @return EINVAL 
  */
 int queue_packet(dpeth_t * dep, packet_t packet);
Index: uspace/srv/hw/netif/dp8390/dp8390_module.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -157,5 +157,6 @@
 }
 
-int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){
+int netif_get_device_stats(device_id_t device_id, device_stats_t *stats)
+{
 	netif_device_t * device;
 	eth_stat_t * de_stat;
@@ -185,5 +186,5 @@
 }
 
-int netif_get_addr_message(device_id_t device_id, measured_string_ref address){
+int netif_get_addr_message(device_id_t device_id, measured_string_t *address){
 	netif_device_t * device;
 	int rc;
Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/il/arp/arp.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -83,8 +83,8 @@
  * @param[in] device	The device specific data.
  */
-static void arp_clear_device(arp_device_ref device)
+static void arp_clear_device(arp_device_t *device)
 {
 	int count;
-	arp_proto_ref proto;
+	arp_proto_t *proto;
 
 	for (count = arp_protos_count(&device->protos) - 1; count >= 0;
@@ -105,5 +105,5 @@
 {
 	int count;
-	arp_device_ref device;
+	arp_device_t *device;
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
@@ -126,8 +126,8 @@
 
 static int arp_clear_address_req(int arp_phone, device_id_t device_id,
-    services_t protocol, measured_string_ref address)
-{
-	arp_device_ref device;
-	arp_proto_ref proto;
+    services_t protocol, measured_string_t *address)
+{
+	arp_device_t *device;
+	arp_proto_t *proto;
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
@@ -150,5 +150,5 @@
 static int arp_clear_device_req(int arp_phone, device_id_t device_id)
 {
-	arp_device_ref device;
+	arp_device_t *device;
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
@@ -171,13 +171,13 @@
  * @param[in] service	The protocol module service.
  * @param[in] address	The actual protocol device address.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left.
- */
-static int arp_proto_create(arp_proto_ref *proto, services_t service,
-    measured_string_ref address)
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left.
+ */
+static int arp_proto_create(arp_proto_t **proto, services_t service,
+    measured_string_t *address)
 {
 	int rc;
 
-	*proto = (arp_proto_ref) malloc(sizeof(arp_proto_t));
+	*proto = (arp_proto_t *) malloc(sizeof(arp_proto_t));
 	if (!*proto)
 		return ENOMEM;
@@ -205,16 +205,16 @@
  * @param[in] protocol	The protocol service.
  * @param[in] address	The actual device protocol address.
- * @returns		EOK on success.
- * @returns		EEXIST if another device with the same device identifier
+ * @return		EOK on success.
+ * @return		EEXIST if another device with the same device identifier
  *			and different driver service exists.
- * @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
  *			measured_strings_return() function.
  */
 static int arp_device_message(device_id_t device_id, services_t service,
-    services_t protocol, measured_string_ref address)
-{
-	arp_device_ref device;
-	arp_proto_ref proto;
+    services_t protocol, measured_string_t *address)
+{
+	arp_device_t *device;
+	arp_proto_t *proto;
 	hw_type_t hardware;
 	int index;
@@ -260,5 +260,5 @@
 		
 		/* Create a new device */
-		device = (arp_device_ref) malloc(sizeof(arp_device_t));
+		device = (arp_device_t *) malloc(sizeof(arp_device_t));
 		if (!device) {
 			fibril_rwlock_write_unlock(&arp_globals.lock);
@@ -356,6 +356,6 @@
  *  @param[in] client_connection The client connection processing function.
  *			The module skeleton propagates its own one.
- *  @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.
  */
 int arp_initialize(async_client_conn_t client_connection)
@@ -376,10 +376,10 @@
  * @param[in] device_id	The device identifier.
  * @param[in] mtu	The new mtu value.
- * @returns		ENOENT if device is not found.
- * @returns		EOK on success.
+ * @return		ENOENT if device is not found.
+ * @return		EOK on success.
  */
 static int arp_mtu_changed_message(device_id_t device_id, size_t mtu)
 {
-	arp_device_ref device;
+	arp_device_t *device;
 
 	fibril_rwlock_write_lock(&arp_globals.lock);
@@ -404,22 +404,22 @@
  * @param[in] device_id	The source device identifier.
  * @param[in,out] packet The received packet.
- * @returns		EOK on success and the packet is no longer needed.
- * @returns		One on success and the packet has been reused.
- * @returns		EINVAL if the packet is too small to carry an ARP
+ * @return		EOK on success and the packet is no longer needed.
+ * @return		One on success and the packet has been reused.
+ * @return		EINVAL if the packet is too small to carry an ARP
  *			packet.
- * @returns		EINVAL if the received address lengths differs from
+ * @return		EINVAL if the received address lengths differs from
  *			the registered values.
- * @returns		ENOENT if the device is not found in the cache.
- * @returns		ENOENT if the protocol for the device is not found in
+ * @return		ENOENT if the device is not found in the cache.
+ * @return		ENOENT if the protocol for the device is not found in
  *			the cache.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int arp_receive_message(device_id_t device_id, packet_t packet)
 {
 	size_t length;
-	arp_header_ref header;
-	arp_device_ref device;
-	arp_proto_ref proto;
-	measured_string_ref hw_source;
+	arp_header_t *header;
+	arp_device_t *device;
+	arp_proto_t *proto;
+	measured_string_t *hw_source;
 	uint8_t *src_hw;
 	uint8_t *src_proto;
@@ -436,5 +436,5 @@
 		return ENOENT;
 
-	header = (arp_header_ref) packet_get_data(packet);
+	header = (arp_header_t *) packet_get_data(packet);
 	if ((ntohs(header->hardware) != device->hardware) ||
 	    (length < sizeof(arp_header_t) + header->hardware_length * 2U +
@@ -516,21 +516,21 @@
  * @param[in] protocol	The protocol service.
  * @param[in] target	The target protocol address.
- * @returns		The hardware address of the target.
- * @returns		NULL if the target parameter is NULL.
- * @returns		NULL if the device is not found.
- * @returns		NULL if the device packet is too small to send a
+ * @return		The hardware address of the target.
+ * @return		NULL if the target parameter is NULL.
+ * @return		NULL if the device is not found.
+ * @return		NULL if the device packet is too small to send a
  *			request.
- * @returns		NULL if the hardware address is not found in the cache.
- */
-static measured_string_ref
+ * @return		NULL if the hardware address is not found in the cache.
+ */
+static measured_string_t *
 arp_translate_message(device_id_t device_id, services_t protocol,
-    measured_string_ref target)
-{
-	arp_device_ref device;
-	arp_proto_ref proto;
-	measured_string_ref addr;
+    measured_string_t *target)
+{
+	arp_device_t *device;
+	arp_proto_t *proto;
+	measured_string_t *addr;
 	size_t length;
 	packet_t packet;
-	arp_header_ref header;
+	arp_header_t *header;
 
 	if (!target)
@@ -561,5 +561,5 @@
 		return NULL;
 
-	header = (arp_header_ref) packet_suffix(packet, length);
+	header = (arp_header_t *) packet_suffix(packet, length);
 	if (!header) {
 		pq_release_remote(arp_globals.net_phone, packet_get_id(packet));
@@ -602,6 +602,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see arp_interface.h
@@ -612,6 +612,6 @@
     ipc_call_t *answer, int *answer_count)
 {
-	measured_string_ref address;
-	measured_string_ref translation;
+	measured_string_t *address;
+	measured_string_t *translation;
 	char *data;
 	packet_t packet;
@@ -747,6 +747,6 @@
 /** Starts the module.
  *
- * @returns		EOK on success.
- * @returns		Other error codes as defined for each specific module
+ * @return		EOK on success.
+ * @return		Other error codes as defined for each specific module
  *			start function.
  */
Index: uspace/srv/net/il/arp/arp.h
===================================================================
--- uspace/srv/net/il/arp/arp.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/il/arp/arp.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -55,9 +55,4 @@
 typedef struct arp_device arp_device_t;
 
-/** Type definition of the ARP device specific data pointer.
- * @see arp_device
- */
-typedef arp_device_t *arp_device_ref;
-
 /** Type definition of the ARP global data.
  * @see arp_globals
@@ -69,9 +64,4 @@
  */
 typedef struct arp_proto arp_proto_t;
-
-/** Type definition of the ARP protocol specific data pointer.
- * @see arp_proto
- */
-typedef arp_proto_t *arp_proto_ref;
 
 /** ARP address map.
@@ -99,9 +89,9 @@
 struct arp_device {
 	/** Actual device hardware address. */
-	measured_string_ref addr;
+	measured_string_t * addr;
 	/** Actual device hardware address data. */
 	char *addr_data;
 	/** Broadcast device hardware address. */
-	measured_string_ref broadcast_addr;
+	measured_string_t * broadcast_addr;
 	/** Broadcast device hardware address data. */
 	char *broadcast_data;
@@ -145,5 +135,5 @@
 struct arp_proto {
 	/** Actual device protocol address. */
-	measured_string_ref addr;
+	measured_string_t *addr;
 	/** Actual device protocol address data. */
 	char *addr_data;
Index: uspace/srv/net/il/arp/arp_header.h
===================================================================
--- uspace/srv/net/il/arp/arp_header.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/il/arp/arp_header.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -46,9 +46,4 @@
 typedef struct arp_header arp_header_t;
 
-/** Type definition of an ARP protocol header pointer.
- * @see arp_header
- */
-typedef arp_header_t *arp_header_ref;
-
 /** ARP protocol header. */
 struct arp_header {
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/il/ip/ip.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -139,10 +139,10 @@
  * Searches the registered protocols.
  *
- * @returns		The found ICMP phone.
- * @returns		ENOENT if the ICMP is not registered.
+ * @return		The found ICMP phone.
+ * @return		ENOENT if the ICMP is not registered.
  */
 static int ip_get_icmp_phone(void)
 {
-	ip_proto_ref proto;
+	ip_proto_t *proto;
 	int phone;
 
@@ -160,15 +160,15 @@
  * @param[in] packet	The packet or the packet queue to be reported as faulty.
  * @param[in] header	The first packet IP header. May be NULL.
- * @returns		EOK on success.
- * @returns		EINVAL if there are no data in the packet.
- * @returns		EINVAL if the packet is a fragment.
- * @returns		ENOMEM if the packet is too short to contain the IP
+ * @return		EOK on success.
+ * @return		EINVAL if there are no data in the packet.
+ * @return		EINVAL if the packet is a fragment.
+ * @return		ENOMEM if the packet is too short to contain the IP
  *			header.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		EPERM if the protocol is not allowed to send ICMP
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		EPERM if the protocol is not allowed to send ICMP
  *			notifications. The ICMP protocol itself.
- * @returns		Other error codes as defined for the packet_set_addr().
- */
-static int ip_prepare_icmp(packet_t packet, ip_header_ref header)
+ * @return		Other error codes as defined for the packet_set_addr().
+ */
+static int ip_prepare_icmp(packet_t packet, ip_header_t *header)
 {
 	packet_t next;
@@ -187,5 +187,5 @@
 
 		// get header
-		header = (ip_header_ref) packet_get_data(packet);
+		header = (ip_header_t *) packet_get_data(packet);
 		if (!header)
 			return EINVAL;
@@ -227,12 +227,12 @@
  * @param[in] packet	The packet or the packet queue to be reported as faulty.
  * @param[in] header	The first packet IP header. May be NULL.
- * @returns		The found ICMP phone.
- * @returns		EINVAL if the error parameter is set.
- * @returns		EINVAL if the ICMP phone is not found.
- * @returns		EINVAL if the ip_prepare_icmp() fails.
+ * @return		The found ICMP phone.
+ * @return		EINVAL if the error parameter is set.
+ * @return		EINVAL if the ICMP phone is not found.
+ * @return		EINVAL if the ip_prepare_icmp() fails.
  */
 static int
 ip_prepare_icmp_and_get_phone(services_t error, packet_t packet,
-    ip_header_ref header)
+    ip_header_t *header)
 {
 	int phone;
@@ -248,6 +248,6 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @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.
  */
 int ip_initialize(async_client_conn_t client_connection)
@@ -293,20 +293,20 @@
  *
  * @param[in,out] ip_netif Network interface specific data.
- * @returns		EOK on success.
- * @returns		ENOTSUP if DHCP is configured.
- * @returns		ENOTSUP if IPv6 is configured.
- * @returns		EINVAL if any of the addresses is invalid.
- * @returns		EINVAL if the used ARP module is not known.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOTSUP if DHCP is configured.
+ * @return		ENOTSUP if IPv6 is configured.
+ * @return		EINVAL if any of the addresses is invalid.
+ * @return		EINVAL if the used ARP module is not known.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			net_get_device_conf_req() function.
- * @returns		Other error codes as defined for the bind_service()
+ * @return		Other error codes as defined for the bind_service()
  *			function.
- * @returns		Other error codes as defined for the specific
+ * @return		Other error codes as defined for the specific
  *			arp_device_req() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			nil_packet_size_req() function.
  */
-static int ip_netif_initialize(ip_netif_ref ip_netif)
+static int ip_netif_initialize(ip_netif_t *ip_netif)
 {
 	measured_string_t names[] = {
@@ -344,9 +344,9 @@
 		}
 	};
-	measured_string_ref configuration;
+	measured_string_t *configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;
 	measured_string_t address;
-	ip_route_ref route;
+	ip_route_t *route;
 	in_addr_t gateway;
 	int index;
@@ -378,5 +378,5 @@
 			return ENOTSUP;
 		} else if (ip_netif->ipv == IPV4) {
-			route = (ip_route_ref) malloc(sizeof(ip_route_t));
+			route = (ip_route_t *) malloc(sizeof(ip_route_t));
 			if (!route) {
 				net_free_settings(configuration, data);
@@ -486,10 +486,10 @@
  * @param[in] device_id	The device identifier.
  * @param[in] mtu	The new mtu value.
- * @returns		EOK on success.
- * @returns		ENOENT if device is not found.
+ * @return		EOK on success.
+ * @return		ENOENT if device is not found.
  */
 static int ip_mtu_changed_message(device_id_t device_id, size_t mtu)
 {
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 
 	fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -511,10 +511,10 @@
  * @param[in] device_id	The device identifier.
  * @param[in] state	The new state value.
- * @returns		EOK on success.
- * @returns		ENOENT if device is not found.
+ * @return		EOK on success.
+ * @return		ENOENT if device is not found.
  */
 static int ip_device_state_message(device_id_t device_id, device_state_t state)
 {
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 
 	fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -539,13 +539,13 @@
  * @param[in] packet	The packet to be prefixed.
  * @param[in] last	The last header to be copied.
- * @returns		The prefixed middle header.
- * @returns		NULL on error.
- */
-static ip_header_ref
-ip_create_middle_header(packet_t packet, ip_header_ref last)
-{
-	ip_header_ref middle;
-
-	middle = (ip_header_ref) packet_suffix(packet, IP_HEADER_LENGTH(last));
+ * @return		The prefixed middle header.
+ * @return		NULL on error.
+ */
+static ip_header_t *
+ip_create_middle_header(packet_t packet, ip_header_t *last)
+{
+	ip_header_t *middle;
+
+	middle = (ip_header_t *) packet_suffix(packet, IP_HEADER_LENGTH(last));
 	if (!middle)
 		return NULL;
@@ -562,7 +562,7 @@
  * @param[in] first	The original header to be copied.
  */
-static void ip_create_last_header(ip_header_ref last, ip_header_ref first)
-{
-	ip_option_ref option;
+static void ip_create_last_header(ip_header_t *last, ip_header_t *first)
+{
+	ip_option_t *option;
 	size_t next;
 	size_t length;
@@ -575,5 +575,5 @@
 	// process all ip options
 	while (next < first->header_length) {
-		option = (ip_option_ref) (((uint8_t *) first) + next);
+		option = (ip_option_t *) (((uint8_t *) first) + next);
 		// skip end or noop
 		if ((option->type == IPOPT_END) ||
@@ -613,20 +613,20 @@
  * @param[in,out] packet The packet to be sent.
  * @param[in] destination The destination hardware address.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is too small to contain the IP
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is too small to contain the IP
  *			header.
- * @returns		EINVAL if the packet is too long than the IP allows.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the packet_set_addr()
+ * @return		EINVAL if the packet is too long than the IP allows.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the packet_set_addr()
  *			function.
  */
 static int
 ip_prepare_packet(in_addr_t *source, in_addr_t dest, packet_t packet,
-    measured_string_ref destination)
+    measured_string_t *destination)
 {
 	size_t length;
-	ip_header_ref header;
-	ip_header_ref last_header;
-	ip_header_ref middle_header;
+	ip_header_t *header;
+	ip_header_t *last_header;
+	ip_header_t *middle_header;
 	packet_t next;
 	int rc;
@@ -636,5 +636,5 @@
 		return EINVAL;
 
-	header = (ip_header_ref) packet_get_data(packet);
+	header = (ip_header_t *) packet_get_data(packet);
 	if (destination) {
 		rc = packet_set_addr(packet, NULL, (uint8_t *) destination->value,
@@ -660,5 +660,5 @@
 
 	if (pq_next(packet)) {
-		last_header = (ip_header_ref) malloc(IP_HEADER_LENGTH(header));
+		last_header = (ip_header_t *) malloc(IP_HEADER_LENGTH(header));
 		if (!last_header)
 			return ENOMEM;
@@ -666,5 +666,5 @@
 		next = pq_next(packet);
 		while (pq_next(next)) {
-			middle_header = (ip_header_ref) packet_prefix(next,
+			middle_header = (ip_header_t *) packet_prefix(next,
 			    IP_HEADER_LENGTH(last_header));
 			if (!middle_header) {
@@ -698,5 +698,5 @@
 		}
 
-		middle_header = (ip_header_ref) packet_prefix(next,
+		middle_header = (ip_header_t *) packet_prefix(next,
 		    IP_HEADER_LENGTH(last_header));
 		if (!middle_header) {
@@ -746,14 +746,14 @@
  * @param[in] dest	The destiantion address.
  * @param[in] addrlen	The address length.
- * @returns		EOK on success.
- * @returns		ENOMEM if the target packet is too small.
- * @returns		Other error codes as defined for the packet_set_addr()
+ * @return		EOK on success.
+ * @return		ENOMEM if the target packet is too small.
+ * @return		Other error codes as defined for the packet_set_addr()
  *			function.
- * @returns		Other error codes as defined for the pq_insert_after()
+ * @return		Other error codes as defined for the pq_insert_after()
  *			function.
  */
 static int
 ip_fragment_packet_data(packet_t packet, packet_t new_packet,
-    ip_header_ref header, ip_header_ref new_header, size_t length,
+    ip_header_t *header, ip_header_t *new_header, size_t length,
     const struct sockaddr *src, const struct sockaddr *dest, socklen_t addrlen)
 {
@@ -799,18 +799,18 @@
  * @param[in] suffix	The minimum suffix size.
  * @param[in] addr_len	The minimum address length.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet_get_addr() function fails.
- * @returns		EINVAL if the packet does not contain the IP header.
- * @returns		EPERM if the packet needs to be fragmented and the
+ * @return		EOK on success.
+ * @return		EINVAL if the packet_get_addr() function fails.
+ * @return		EINVAL if the packet does not contain the IP header.
+ * @return		EPERM if the packet needs to be fragmented and the
  *			fragmentation is not allowed.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		ENOMEM if there is no packet available.
- * @returns		ENOMEM if the packet is too small to contain the IP
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		ENOMEM if there is no packet available.
+ * @return		ENOMEM if the packet is too small to contain the IP
  *			header.
- * @returns		Other error codes as defined for the packet_trim()
+ * @return		Other error codes as defined for the packet_trim()
  *			function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			ip_create_middle_header() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			ip_fragment_packet_data() function.
  */
@@ -820,7 +820,7 @@
 {
 	packet_t new_packet;
-	ip_header_ref header;
-	ip_header_ref middle_header;
-	ip_header_ref last_header;
+	ip_header_t *header;
+	ip_header_t *middle_header;
+	ip_header_t *last_header;
 	struct sockaddr *src;
 	struct sockaddr *dest;
@@ -838,5 +838,5 @@
 
 	// get header
-	header = (ip_header_ref) packet_get_data(packet);
+	header = (ip_header_t *) packet_get_data(packet);
 	if (!header)
 		return EINVAL;
@@ -853,5 +853,5 @@
 
 	// allocate as much as originally
-	last_header = (ip_header_ref) packet_suffix(new_packet,
+	last_header = (ip_header_t *) packet_suffix(new_packet,
 	    IP_HEADER_LENGTH(header));
 	if (!last_header)
@@ -919,6 +919,6 @@
  * @param[in] addr_len	The minimum address length.
  * @param[in] error	The error module service.
- * @returns		The packet or the packet queue of the allowed length.
- * @returns		NULL if there are no packets left.
+ * @return		The packet or the packet queue of the allowed length.
+ * @return		NULL if there are no packets left.
  */
 static packet_t
@@ -986,16 +986,16 @@
  * @param[in] dest	The destination address.
  * @param[in] error	The error module service.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the arp_translate_req()
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the arp_translate_req()
  *			function.
- * @returns		Other error codes as defined for the ip_prepare_packet()
+ * @return		Other error codes as defined for the ip_prepare_packet()
  *			function.
  */
 static int
-ip_send_route(packet_t packet, ip_netif_ref netif, ip_route_ref route,
+ip_send_route(packet_t packet, ip_netif_t *netif, ip_route_t *route,
     in_addr_t *src, in_addr_t dest, services_t error)
 {
 	measured_string_t destination;
-	measured_string_ref translation;
+	measured_string_t *translation;
 	char *data;
 	int phone;
@@ -1062,12 +1062,12 @@
  *			NULL.
  * @param[in] destination The destination address.
- * @returns		The found route.
- * @returns		NULL if no route was found.
- */
-static ip_route_ref
-ip_netif_find_route(ip_netif_ref netif, in_addr_t destination)
+ * @return		The found route.
+ * @return		NULL if no route was found.
+ */
+static ip_route_t *
+ip_netif_find_route(ip_netif_t *netif, in_addr_t destination)
 {
 	int index;
-	ip_route_ref route;
+	ip_route_t *route;
 
 	if (!netif)
@@ -1090,11 +1090,11 @@
  *
  * @param[in] destination The destination address.
- * @returns		The found route.
- * @returns		NULL if no route was found.
- */
-static ip_route_ref ip_find_route(in_addr_t destination) {
+ * @return		The found route.
+ * @return		NULL if no route was found.
+ */
+static ip_route_t *ip_find_route(in_addr_t destination) {
 	int index;
-	ip_route_ref route;
-	ip_netif_ref netif;
+	ip_route_t *route;
+	ip_netif_t *netif;
 
 	// start with the last netif - the newest one
@@ -1116,10 +1116,10 @@
  *
  * @param[in] netif	The network interface.
- * @returns		The IP address.
- * @returns		NULL if no IP address was found.
- */
-static in_addr_t *ip_netif_address(ip_netif_ref netif)
-{
-	ip_route_ref route;
+ * @return		The IP address.
+ * @return		NULL if no IP address was found.
+ */
+static in_addr_t *ip_netif_address(ip_netif_t *netif)
+{
+	ip_route_t *route;
 
 	route = ip_routes_get_index(&netif->routes, 0);
@@ -1136,10 +1136,10 @@
  * @param[in] phone	The transport layer module phone.
  * @param[in] received_msg The receiving function.
- * @returns		EOK on success.
- * @returns		EINVAL if the protocol parameter and/or the service
+ * @return		EOK on success.
+ * @return		EINVAL if the protocol parameter and/or the service
  *			parameter is zero.
- * @returns		EINVAL if the phone parameter is not a positive number
+ * @return		EINVAL if the phone parameter is not a positive number
  *			and the tl_receive_msg is NULL.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int
@@ -1147,5 +1147,5 @@
     tl_received_msg_t received_msg)
 {
-	ip_proto_ref proto;
+	ip_proto_t *proto;
 	int index;
 
@@ -1153,5 +1153,5 @@
 		return EINVAL;
 
-	proto = (ip_proto_ref) malloc(sizeof(ip_protos_t));
+	proto = (ip_proto_t *) malloc(sizeof(ip_protos_t));
 	if (!proto)
 		return ENOMEM;
@@ -1180,10 +1180,10 @@
 ip_device_req_local(int il_phone, device_id_t device_id, services_t netif)
 {
-	ip_netif_ref ip_netif;
-	ip_route_ref route;
+	ip_netif_t *ip_netif;
+	ip_route_t *route;
 	int index;
 	int rc;
 
-	ip_netif = (ip_netif_ref) malloc(sizeof(ip_netif_t));
+	ip_netif = (ip_netif_t *) malloc(sizeof(ip_netif_t));
 	if (!ip_netif)
 		return ENOMEM;
@@ -1251,6 +1251,6 @@
 {
 	int addrlen;
-	ip_netif_ref netif;
-	ip_route_ref route;
+	ip_netif_t *netif;
+	ip_route_t *route;
 	struct sockaddr *addr;
 	struct sockaddr_in *address_in;
@@ -1361,5 +1361,5 @@
  * @param[out] content	The maximum content size.
  * @param[out] suffix	The minimum reserved suffix size.
- * @returns		EOK on success.
+ * @return		EOK on success.
  */
 static int
@@ -1367,5 +1367,5 @@
     size_t *content, size_t *suffix)
 {
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 	int index;
 
@@ -1418,7 +1418,7 @@
  *
  * @param[in] header	The packet IP header to be read.
- * @returns		The packet destination address.
- */
-static in_addr_t ip_get_destination(ip_header_ref header)
+ * @return		The packet destination address.
+ */
+static in_addr_t ip_get_destination(ip_header_t *header)
 {
 	in_addr_t destination;
@@ -1439,20 +1439,20 @@
  * @param[in] header	The first packet IP header. May be NULL.
  * @param[in] error	The packet error service.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the packet is a fragment.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		ENOENT if the target protocol is not found.
- * @returns		Other error codes as defined for the packet_set_addr()
+ * @return		EOK on success.
+ * @return		ENOTSUP if the packet is a fragment.
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		ENOENT if the target protocol is not found.
+ * @return		Other error codes as defined for the packet_set_addr()
  *			function.
- * @returns		Other error codes as defined for the packet_trim()
+ * @return		Other error codes as defined for the packet_trim()
  *			function.
- * @returns		Other error codes as defined for the protocol specific
+ * @return		Other error codes as defined for the protocol specific
  *			tl_received_msg() function.
  */
 static int
-ip_deliver_local(device_id_t device_id, packet_t packet, ip_header_ref header,
+ip_deliver_local(device_id_t device_id, packet_t packet, ip_header_t *header,
     services_t error)
 {
-	ip_proto_ref proto;
+	ip_proto_t *proto;
 	int phone;
 	services_t service;
@@ -1544,10 +1544,10 @@
  * @param[in] device_id	The source device identifier.
  * @param[in] packet	The received packet to be processed.
- * @returns		EOK on success.
- * @returns		EINVAL if the TTL is less than two.
- * @returns		EINVAL if the checksum is invalid.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		ENOENT if no route was found.
- * @returns		ENOENT if the packet is for another host and the routing
+ * @return		EOK on success.
+ * @return		EINVAL if the TTL is less than two.
+ * @return		EINVAL if the checksum is invalid.
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		ENOENT if no route was found.
+ * @return		ENOENT if the packet is for another host and the routing
  *			is disabled.
  */
@@ -1555,7 +1555,7 @@
 ip_process_packet(device_id_t device_id, packet_t packet)
 {
-	ip_header_ref header;
+	ip_header_t *header;
 	in_addr_t dest;
-	ip_route_ref route;
+	ip_route_t *route;
 	int phone;
 	struct sockaddr *addr;
@@ -1564,5 +1564,5 @@
 	int rc;
 
-	header = (ip_header_ref) packet_get_data(packet);
+	header = (ip_header_t *) packet_get_data(packet);
 	if (!header)
 		return ip_release_and_return(packet, ENOMEM);
@@ -1647,6 +1647,6 @@
     in_addr_t netmask, in_addr_t gateway)
 {
-	ip_route_ref route;
-	ip_netif_ref netif;
+	ip_route_t *route;
+	ip_netif_t *netif;
 	int index;
 
@@ -1659,5 +1659,5 @@
 	}
 
-	route = (ip_route_ref) malloc(sizeof(ip_route_t));
+	route = (ip_route_t *) malloc(sizeof(ip_route_t));
 	if (!route) {
 		fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
@@ -1681,5 +1681,5 @@
 ip_set_gateway_req_local(int ip_phone, device_id_t device_id, in_addr_t gateway)
 {
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 
 	fibril_rwlock_write_lock(&ip_globals.netifs_lock);
@@ -1721,8 +1721,8 @@
 	icmp_type_t type;
 	icmp_code_t code;
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 	measured_string_t address;
-	ip_route_ref route;
-	ip_header_ref header;
+	ip_route_t *route;
+	ip_header_t *header;
 
 	switch (error) {
@@ -1734,5 +1734,5 @@
 
 		data = packet_get_data(packet);
-		header = (ip_header_ref)(data + offset);
+		header = (ip_header_t *)(data + offset);
 
 		// destination host unreachable?
@@ -1782,6 +1782,6 @@
 	in_addr_t *dest;
 	in_addr_t *src;
-	ip_route_ref route;
-	ipv4_pseudo_header_ref header_in;
+	ip_route_t *route;
+	ipv4_pseudo_header_t *header_in;
 
 	if (!destination || (addrlen <= 0))
@@ -1829,5 +1829,5 @@
 
 	*headerlen = sizeof(*header_in);
-	header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+	header_in = (ipv4_pseudo_header_t *) malloc(*headerlen);
 	if (!header_in)
 		return ENOMEM;
@@ -1849,13 +1849,13 @@
  * @param[in] device_id	The source device identifier.
  * @param[in,out] packet The received packet.
- * @returns		EOK on success and the packet is no longer needed.
- * @returns		EINVAL if the packet is too small to carry the IP
+ * @return		EOK on success and the packet is no longer needed.
+ * @return		EINVAL if the packet is too small to carry the IP
  *			packet.
- * @returns		EINVAL if the received address lengths differs from the
+ * @return		EINVAL if the received address lengths differs from the
  *			registered values.
- * @returns		ENOENT if the device is not found in the cache.
- * @returns		ENOENT if the protocol for the device is not found in
+ * @return		ENOENT if the device is not found in the cache.
+ * @return		ENOENT if the protocol for the device is not found in
  *			the cache.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int ip_receive_message(device_id_t device_id, packet_t packet)
@@ -1879,6 +1879,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see ip_interface.h
@@ -2037,6 +2037,6 @@
 /** Starts the module.
  *
- * @returns EOK on success.
- * @returns Other error codes as defined for each specific module start function.
+ * @return EOK on success.
+ * @return Other error codes as defined for each specific module start function.
  */
 int main(int argc, char *argv[])
Index: uspace/srv/net/il/ip/ip.h
===================================================================
--- uspace/srv/net/il/ip/ip.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/il/ip/ip.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -59,9 +59,4 @@
 typedef struct ip_netif ip_netif_t;
 
-/** Type definition of the IP network interface specific data pointer.
- * @see ip_netif
- */
-typedef ip_netif_t *ip_netif_ref;
-
 /** Type definition of the IP protocol specific data.
  * @see ip_proto
@@ -69,18 +64,8 @@
 typedef struct ip_proto ip_proto_t;
 
-/** Type definition of the IP protocol specific data pointer.
- * @see ip_proto
- */
-typedef ip_proto_t *ip_proto_ref;
-
 /** Type definition of the IP route specific data.
  *  @see ip_route
  */
 typedef struct ip_route	ip_route_t;
-
-/** Type definition of the IP route specific data pointer.
- *  @see ip_route
- */
-typedef ip_route_t *ip_route_ref;
 
 /** IP network interfaces.
@@ -104,5 +89,5 @@
 struct ip_netif {
 	/** ARP module. Assigned if using ARP. */
-	module_ref arp;
+	module_t *arp;
 	/** Broadcast address. */
 	in_addr_t broadcast;
@@ -146,5 +131,5 @@
 	in_addr_t gateway;
 	/** Parent netif. */
-	ip_netif_ref netif;
+	ip_netif_t *netif;
 	/** Target network mask. */
 	in_addr_t netmask;
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/net/net.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -78,4 +78,6 @@
 DEVICE_MAP_IMPLEMENT(netifs, netif_t);
 
+static int startup(void);
+
 /** Add the configured setting to the configuration map.
  *
@@ -84,14 +86,14 @@
  * @param[in] value         The setting value.
  *
- * @returns EOK on success.
- * @returns ENOMEM if there is not enough memory left.
- *
- */
-int add_configuration(measured_strings_ref configuration, const char *name,
+ * @return EOK on success.
+ * @return ENOMEM if there is not enough memory left.
+ *
+ */
+int add_configuration(measured_strings_t *configuration, const char *name,
     const char *value)
 {
 	int rc;
 	
-	measured_string_ref setting =
+	measured_string_t *setting =
 	    measured_string_create_bulk(value, 0);
 	if (!setting)
@@ -110,5 +112,5 @@
 /** Generate new system-unique device identifier.
  *
- * @returns		The system-unique devic identifier.
+ * @return		The system-unique devic identifier.
  */
 static device_id_t generate_new_device_id(void)
@@ -117,5 +119,5 @@
 }
 
-static int parse_line(measured_strings_ref configuration, char *line)
+static int parse_line(measured_strings_t *configuration, char *line)
 {
 	int rc;
@@ -163,5 +165,5 @@
 	
 	/* Create a bulk measured string till the end */
-	measured_string_ref setting =
+	measured_string_t *setting =
 	    measured_string_create_bulk(value, 0);
 	if (!setting)
@@ -179,5 +181,5 @@
 
 static int read_configuration_file(const char *directory, const char *filename,
-    measured_strings_ref configuration)
+    measured_strings_t *configuration)
 {
 	printf("%s: Reading configuration file %s/%s\n", NAME, directory, filename);
@@ -235,6 +237,6 @@
  * @param[in,out] netif The network interface structure.
  *
- * @returns EOK on success.
- * @returns Other error codes as defined for the add_configuration() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the add_configuration() function.
  *
  */
@@ -246,6 +248,6 @@
 /** Read the networking subsystem global configuration.
  *
- * @returns EOK on success.
- * @returns Other error codes as defined for the add_configuration() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the add_configuration() function.
  *
  */
@@ -262,6 +264,6 @@
  *                              its own one.
  *
- * @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.
  *
  */
@@ -313,7 +315,7 @@
  *                              its own one.
  *
- * @returns EOK on successful module termination.
- * @returns Other error codes as defined for the net_initialize() function.
- * @returns Other error codes as defined for the REGISTER_ME() macro function.
+ * @return EOK on successful module termination.
+ * @return Other error codes as defined for the net_initialize() function.
+ * @return Other error codes as defined for the REGISTER_ME() macro function.
  *
  */
@@ -337,4 +339,9 @@
 		goto out;
 	
+	rc = startup();
+	if (rc != EOK)
+		goto out;
+	
+	task_retval(0);
 	async_manager();
 
@@ -353,9 +360,9 @@
  * @param[out] data          The found configuration settings data.
  *
- * @returns EOK.
- *
- */
-static int net_get_conf(measured_strings_ref netif_conf,
-    measured_string_ref configuration, size_t count, char **data)
+ * @return EOK.
+ *
+ */
+static int net_get_conf(measured_strings_t *netif_conf,
+    measured_string_t *configuration, size_t count, char **data)
 {
 	if (data)
@@ -364,5 +371,5 @@
 	size_t index;
 	for (index = 0; index < count; index++) {
-		measured_string_ref setting =
+		measured_string_t *setting =
 		    measured_strings_find(netif_conf, configuration[index].value, 0);
 		if (!setting)
@@ -382,5 +389,5 @@
 }
 
-int net_get_conf_req(int net_phone, measured_string_ref *configuration,
+int net_get_conf_req(int net_phone, measured_string_t **configuration,
     size_t count, char **data)
 {
@@ -392,5 +399,5 @@
 
 int net_get_device_conf_req(int net_phone, device_id_t device_id,
-    measured_string_ref *configuration, size_t count, char **data)
+    measured_string_t **configuration, size_t count, char **data)
 {
 	if ((!configuration) || (count == 0))
@@ -404,5 +411,5 @@
 }
 
-void net_free_settings(measured_string_ref settings, char *data)
+void net_free_settings(measured_string_t *settings, char *data)
 {
 }
@@ -415,11 +422,11 @@
  * @param[in] netif The network interface specific data.
  *
- * @returns EOK on success.
- * @returns EINVAL if there are some settings missing.
- * @returns ENOENT if the internet protocol module is not known.
- * @returns Other error codes as defined for the netif_probe_req() function.
- * @returns Other error codes as defined for the nil_device_req() function.
- * @returns Other error codes as defined for the needed internet layer
- *          registering function.
+ * @return EOK on success.
+ * @return EINVAL if there are some settings missing.
+ * @return ENOENT if the internet protocol module is not known.
+ * @return Other error codes as defined for the netif_probe_req() function.
+ * @return Other error codes as defined for the nil_device_req() function.
+ * @return Other error codes as defined for the needed internet layer
+ *         registering function.
  *
  */
@@ -429,5 +436,5 @@
 	
 	/* Mandatory netif */
-	measured_string_ref setting =
+	measured_string_t *setting =
 	    measured_strings_find(&netif->configuration, CONF_NETIF, 0);
 	
@@ -507,13 +514,13 @@
 /** Read the configuration and start all network interfaces.
  *
- * @returns EOK on success.
- * @returns EXDEV if there is no available system-unique device identifier.
- * @returns EINVAL if any of the network interface names are not configured.
- * @returns ENOMEM if there is not enough memory left.
- * @returns Other error codes as defined for the read_configuration()
- *          function.
- * @returns Other error codes as defined for the read_netif_configuration()
- *          function.
- * @returns Other error codes as defined for the start_device() function.
+ * @return EOK on success.
+ * @return EXDEV if there is no available system-unique device identifier.
+ * @return EINVAL if any of the network interface names are not configured.
+ * @return ENOMEM if there is not enough memory left.
+ * @return Other error codes as defined for the read_configuration()
+ *         function.
+ * @return Other error codes as defined for the read_netif_configuration()
+ *         function.
+ * @return Other error codes as defined for the start_device() function.
  *
  */
@@ -550,5 +557,5 @@
 		
 		/* Mandatory name */
-		measured_string_ref setting =
+		measured_string_t *setting =
 		    measured_strings_find(&netif->configuration, CONF_NAME, 0);
 		if (!setting) {
@@ -610,6 +617,6 @@
  *                          in the answer parameter.
  *
- * @returns EOK on success.
- * @returns ENOTSUP if the message is not known.
+ * @return EOK on success.
+ * @return ENOTSUP if the message is not known.
  *
  * @see net_interface.h
@@ -620,5 +627,5 @@
     int *answer_count)
 {
-	measured_string_ref strings;
+	measured_string_t *strings;
 	char *data;
 	int rc;
Index: uspace/srv/net/net/net.h
===================================================================
--- uspace/srv/net/net/net.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/net/net.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -103,10 +103,10 @@
 	
 	/** Serving network interface driver module index. */
-	module_ref driver;
+	module_t *driver;
 	
-	device_id_t id;  /**< System-unique network interface identifier. */
-	module_ref il;   /**< Serving internet layer module index. */
-	char *name;      /**< System-unique network interface name. */
-	module_ref nil;  /**< Serving link layer module index. */
+	device_id_t id;	/**< System-unique network interface identifier. */
+	module_t *il;	/**< Serving internet layer module index. */
+	char *name;	/**< System-unique network interface name. */
+	module_t *nil;	/**< Serving link layer module index. */
 } netif_t;
 
@@ -133,5 +133,5 @@
 } net_globals_t;
 
-extern int add_configuration(measured_strings_ref, const char *, const char *);
+extern int add_configuration(measured_strings_t *, const char *, const char *);
 extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, int *);
 extern int net_initialize_build(async_client_conn_t);
Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/netif/lo/lo.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -70,5 +70,5 @@
 }
 
-int netif_get_addr_message(device_id_t device_id, measured_string_ref address)
+int netif_get_addr_message(device_id_t device_id, measured_string_t *address)
 {
 	if (!address)
@@ -81,5 +81,5 @@
 }
 
-int netif_get_device_stats(device_id_t device_id, device_stats_ref stats)
+int netif_get_device_stats(device_id_t device_id, device_stats_t *stats)
 {
 	netif_device_t *device;
@@ -93,5 +93,5 @@
 		return rc;
 
-	memcpy(stats, (device_stats_ref) device->specific,
+	memcpy(stats, (device_stats_t *) device->specific,
 	    sizeof(device_stats_t));
 
@@ -103,6 +103,6 @@
  * @param[in] device	The device structure.
  * @param[in] state	The new device state.
- * @returns		The new state if changed.
- * @returns		EOK otherwise.
+ * @return		The new state if changed.
+ * @return		EOK otherwise.
  */
 static int change_state_message(netif_device_t *device, device_state_t state)
@@ -124,7 +124,7 @@
  * @param[in] device_id	The new devce identifier.
  * @param[out] device	The device structure.
- * @returns		EOK on success.
- * @returns		EXDEV if one loopback network interface already exists.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EXDEV if one loopback network interface already exists.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int create(device_id_t device_id, netif_device_t **device)
@@ -145,5 +145,5 @@
 	}
 
-	null_device_stats((device_stats_ref) (*device)->specific);
+	null_device_stats((device_stats_t *) (*device)->specific);
 	(*device)->device_id = device_id;
 	(*device)->nil_phone = -1;
@@ -204,9 +204,9 @@
 	next = packet;
 	do {
-		((device_stats_ref) device->specific)->send_packets++;
-		((device_stats_ref) device->specific)->receive_packets++;
+		((device_stats_t *) device->specific)->send_packets++;
+		((device_stats_t *) device->specific)->receive_packets++;
 		length = packet_get_data_length(next);
-		((device_stats_ref) device->specific)->send_bytes += length;
-		((device_stats_ref) device->specific)->receive_bytes += length;
+		((device_stats_t *) device->specific)->send_bytes += length;
+		((device_stats_t *) device->specific)->receive_bytes += length;
 		next = pq_next(next);
 	} while(next);
Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/nil/eth/eth.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -156,9 +156,4 @@
 typedef enum eth_addr_type eth_addr_type_t;
 
-/** Type definition of the ethernet address type pointer.
- * @see eth_addr_type
- */
-typedef eth_addr_type_t *eth_addr_type_ref;
-
 /** Ethernet address type. */
 enum eth_addr_type {
@@ -178,5 +173,5 @@
 {
 	int index;
-	eth_proto_ref proto;
+	eth_proto_t *proto;
 
 	fibril_rwlock_read_lock(&eth_globals.protos_lock);
@@ -273,12 +268,12 @@
  * @param[in] service	The device driver service.
  * @param[in] mtu	The device maximum transmission unit.
- * @returns		EOK on success.
- * @returns		EEXIST if the device with the different service exists.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EEXIST if the device with the different service exists.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			net_get_device_conf_req() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			netif_bind_service() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			netif_get_addr_req() function.
  */
@@ -286,5 +281,5 @@
     size_t mtu)
 {
-	eth_device_ref device;
+	eth_device_t *device;
 	int index;
 	measured_string_t names[2] = {
@@ -298,8 +293,8 @@
 		}
 	};
-	measured_string_ref configuration;
+	measured_string_t *configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;
-	eth_proto_ref proto;
+	eth_proto_t *proto;
 	int rc;
 
@@ -342,5 +337,5 @@
 	
 	/* Create a new device */
-	device = (eth_device_ref) malloc(sizeof(eth_device_t));
+	device = (eth_device_t *) malloc(sizeof(eth_device_t));
 	if (!device)
 		return ENOMEM;
@@ -427,19 +422,19 @@
  * @param[in] flags	The device flags.
  * @param[in] packet	The packet.
- * @returns		The target registered module.
- * @returns		NULL if the packet is not long enough.
- * @returns		NULL if the packet is too long.
- * @returns		NULL if the raw ethernet protocol is used.
- * @returns		NULL if the dummy device FCS checksum is invalid.
- * @returns		NULL if the packet address length is not big enough.
- */
-static eth_proto_ref eth_process_packet(int flags, packet_t packet)
-{
-	eth_header_snap_ref header;
+ * @return		The target registered module.
+ * @return		NULL if the packet is not long enough.
+ * @return		NULL if the packet is too long.
+ * @return		NULL if the raw ethernet protocol is used.
+ * @return		NULL if the dummy device FCS checksum is invalid.
+ * @return		NULL if the packet address length is not big enough.
+ */
+static eth_proto_t *eth_process_packet(int flags, packet_t packet)
+{
+	eth_header_snap_t *header;
 	size_t length;
 	eth_type_t type;
 	size_t prefix;
 	size_t suffix;
-	eth_fcs_ref fcs;
+	eth_fcs_t *fcs;
 	uint8_t *data;
 	int rc;
@@ -454,5 +449,5 @@
 	
 	data = packet_get_data(packet);
-	header = (eth_header_snap_ref) data;
+	header = (eth_header_snap_t *) data;
 	type = ntohs(header->header.ethertype);
 	
@@ -461,5 +456,5 @@
 		prefix = sizeof(eth_header_t);
 		suffix = 0;
-		fcs = (eth_fcs_ref) data + length - sizeof(eth_fcs_t);
+		fcs = (eth_fcs_t *) data + length - sizeof(eth_fcs_t);
 		length -= sizeof(eth_fcs_t);
 	} else if(type <= ETH_MAX_CONTENT) {
@@ -487,5 +482,5 @@
 
 		suffix = (type < ETH_MIN_CONTENT) ? ETH_MIN_CONTENT - type : 0U;
-		fcs = (eth_fcs_ref) data + prefix + type + suffix;
+		fcs = (eth_fcs_t *) data + prefix + type + suffix;
 		suffix += length - prefix - type;
 		length = prefix + type + suffix;
@@ -516,7 +511,7 @@
     packet_t packet, services_t target)
 {
-	eth_proto_ref proto;
+	eth_proto_t *proto;
 	packet_t next;
-	eth_device_ref device;
+	eth_device_t *device;
 	int flags;
 
@@ -557,12 +552,12 @@
  * @param[out] content	The maximum content size.
  * @param[out] suffix	The minimum reserved suffix size.
- * @returns		EOK on success.
- * @returns		EBADMEM if either one of the parameters is NULL.
- * @returns		ENOENT if there is no such device.
+ * @return		EOK on success.
+ * @return		EBADMEM if either one of the parameters is NULL.
+ * @return		ENOENT if there is no such device.
  */
 static int eth_packet_space_message(device_id_t device_id, size_t *addr_len,
     size_t *prefix, size_t *content, size_t *suffix)
 {
-	eth_device_ref device;
+	eth_device_t *device;
 
 	if (!addr_len || !prefix || !content || !suffix)
@@ -591,12 +586,12 @@
  * @param[in] type	Type of the desired address.
  * @param[out] address	The device hardware address.
- * @returns		EOK on success.
- * @returns		EBADMEM if the address parameter is NULL.
- * @returns		ENOENT if there no such device.
+ * @return		EOK on success.
+ * @return		EBADMEM if the address parameter is NULL.
+ * @return		ENOENT if there no such device.
  */
 static int eth_addr_message(device_id_t device_id, eth_addr_type_t type,
-    measured_string_ref *address)
-{
-	eth_device_ref device;
+    measured_string_t **address)
+{
+	eth_device_t *device;
 
 	if (!address)
@@ -625,11 +620,11 @@
  * @param[in] service	The module service.
  * @param[in] phone	The service phone.
- * @returns		EOK on success.
- * @returns		ENOENT if the service is not known.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		ENOENT if the service is not known.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int eth_register_message(services_t service, int phone)
 {
-	eth_proto_ref proto;
+	eth_proto_t *proto;
 	int protocol;
 	int index;
@@ -646,5 +641,5 @@
 		return EOK;
 	} else {
-		proto = (eth_proto_ref) malloc(sizeof(eth_proto_t));
+		proto = (eth_proto_t *) malloc(sizeof(eth_proto_t));
 		if (!proto) {
 			fibril_rwlock_write_unlock(&eth_globals.protos_lock);
@@ -678,9 +673,9 @@
  * @param[in] ethertype	The ethernet protocol type.
  * @param[in] mtu	The device maximum transmission unit.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet addresses length is not long
+ * @return		EOK on success.
+ * @return		EINVAL if the packet addresses length is not long
  *			enough.
- * @returns		EINVAL if the packet is bigger than the device MTU.
- * @returns		ENOMEM if there is not enough memory in the packet.
+ * @return		EINVAL if the packet is bigger than the device MTU.
+ * @return		ENOMEM if there is not enough memory in the packet.
  */
 static int
@@ -688,8 +683,8 @@
     size_t mtu)
 {
-	eth_header_snap_ref header;
-	eth_header_lsap_ref header_lsap;
-	eth_header_ref header_dix;
-	eth_fcs_ref fcs;
+	eth_header_snap_t *header;
+	eth_header_lsap_t *header_lsap;
+	eth_header_t *header_dix;
+	eth_fcs_t *fcs;
 	uint8_t *src;
 	uint8_t *dest;
@@ -697,5 +692,5 @@
 	int i;
 	void *padding;
-	eth_preamble_ref preamble;
+	eth_preamble_t *preamble;
 
 	i = packet_get_addr(packet, &src, &dest);
@@ -788,12 +783,12 @@
  * @param[in] packet	The packet queue.
  * @param[in] sender	The sending module service.
- * @returns		EOK on success.
- * @returns		ENOENT if there no such device.
- * @returns		EINVAL if the service parameter is not known.
+ * @return		EOK on success.
+ * @return		ENOENT if there no such device.
+ * @return		EINVAL if the service parameter is not known.
  */
 static int eth_send_message(device_id_t device_id, packet_t packet,
     services_t sender)
 {
-	eth_device_ref device;
+	eth_device_t *device;
 	packet_t next;
 	packet_t tmp;
@@ -845,5 +840,5 @@
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
-	measured_string_ref address;
+	measured_string_t *address;
 	packet_t packet;
 	size_t addrlen;
Index: uspace/srv/net/nil/eth/eth.h
===================================================================
--- uspace/srv/net/nil/eth/eth.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/nil/eth/eth.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -54,18 +54,8 @@
 typedef struct eth_device eth_device_t;
 
-/** Type definition of the Ethernet device specific data pointer.
- * @see eth_device
- */
-typedef eth_device_t *eth_device_ref;
-
 /** Type definition of the Ethernet protocol specific data.
  * @see eth_proto
  */
 typedef struct eth_proto eth_proto_t;
-
-/** Type definition of the Ethernet protocol specific data pointer.
- * @see eth_proto
- */
-typedef eth_proto_t *eth_proto_ref;
 
 /** Ethernet device map.
@@ -100,5 +90,5 @@
 	
 	/** Actual device hardware address. */
-	measured_string_ref addr;
+	measured_string_t *addr;
 	/** Actual device hardware address data. */
 	char *addr_data;
@@ -133,5 +123,5 @@
 	
 	/** Broadcast device hardware address. */
-	measured_string_ref broadcast_addr;
+	measured_string_t *broadcast_addr;
 };
 
Index: uspace/srv/net/nil/eth/eth_header.h
===================================================================
--- uspace/srv/net/nil/eth/eth_header.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/nil/eth/eth_header.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -58,20 +58,8 @@
 typedef struct eth_header_snap eth_header_snap_t;
 
-/** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions
- * pointer.
- *
- * @see eth_header_snap
- */
-typedef eth_header_snap_t *eth_header_snap_ref;
-
 /** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
  * @see eth_header_lsap
  */
 typedef struct eth_header_lsap eth_header_lsap_t;
-
-/** Type definition of the Ethernet header IEEE 802.3 + 802.2 extension pointer.
- * @see eth_header_lsap
- */
-typedef eth_header_lsap_t *eth_header_lsap_ref;
 
 /** Type definition of the Ethernet header LSAP extension.
@@ -80,18 +68,8 @@
 typedef struct eth_ieee_lsap eth_ieee_lsap_t;
 
-/** Type definition of the Ethernet header LSAP extension pointer.
- * @see eth_ieee_lsap
- */
-typedef eth_ieee_lsap_t *eth_ieee_lsap_ref;
-
 /** Type definition of the Ethernet header SNAP extension.
  * @see eth_snap
  */
 typedef struct eth_snap eth_snap_t;
-
-/** Type definition of the Ethernet header SNAP extension pointer.
- * @see eth_snap
- */
-typedef eth_snap_t *eth_snap_ref;
 
 /** Type definition of the Ethernet header preamble.
@@ -100,18 +78,8 @@
 typedef struct eth_preamble eth_preamble_t;
 
-/** Type definition of the Ethernet header preamble pointer.
- * @see eth_preamble
- */
-typedef eth_preamble_t *eth_preamble_ref;
-
 /** Type definition of the Ethernet header.
  * @see eth_header
  */
 typedef struct eth_header eth_header_t;
-
-/** Type definition of the Ethernet header pointer.
- * @see eth_header
- */
-typedef eth_header_t *eth_header_ref;
 
 /** Ethernet header Link Service Access Point extension. */
@@ -219,7 +187,4 @@
 typedef uint32_t eth_fcs_t;
 
-/** Ethernet Frame Check Sequence pointer. */
-typedef eth_fcs_t *eth_fcs_ref;
-
 #endif
 
Index: uspace/srv/net/nil/nildummy/nildummy.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/nil/nildummy/nildummy.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -142,10 +142,10 @@
  * @param[in] service	The device driver service.
  * @param[in] mtu	The device maximum transmission unit.
- * @returns		EOK on success.
- * @returns		EEXIST if the device with the different service exists.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EEXIST if the device with the different service exists.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			netif_bind_service() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			netif_get_addr_req() function.
  */
@@ -153,5 +153,5 @@
     size_t mtu)
 {
-	nildummy_device_ref device;
+	nildummy_device_t *device;
 	int index;
 	int rc;
@@ -192,5 +192,5 @@
 	
 	/* Create a new device */
-	device = (nildummy_device_ref) malloc(sizeof(nildummy_device_t));
+	device = (nildummy_device_t *) malloc(sizeof(nildummy_device_t));
 	if (!device)
 		return ENOMEM;
@@ -248,7 +248,7 @@
  */
 static int nildummy_addr_message(device_id_t device_id,
-    measured_string_ref *address)
-{
-	nildummy_device_ref device;
+    measured_string_t **address)
+{
+	nildummy_device_t *device;
 
 	if (!address)
@@ -282,5 +282,5 @@
     size_t *prefix, size_t *content, size_t *suffix)
 {
-	nildummy_device_ref device;
+	nildummy_device_t *device;
 
 	if (!addr_len || !prefix || !content || !suffix)
@@ -357,5 +357,5 @@
     services_t sender)
 {
-	nildummy_device_ref device;
+	nildummy_device_t *device;
 
 	fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
@@ -377,5 +377,5 @@
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
-	measured_string_ref address;
+	measured_string_t *address;
 	packet_t packet;
 	size_t addrlen;
Index: uspace/srv/net/nil/nildummy/nildummy.h
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/nil/nildummy/nildummy.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -54,18 +54,8 @@
 typedef struct nildummy_device nildummy_device_t;
 
-/** Type definition of the dummy nil device specific data pointer.
- * @see nildummy_device
- */
-typedef nildummy_device_t *nildummy_device_ref;
-
 /** Type definition of the dummy nil protocol specific data.
  * @see nildummy_proto
  */
 typedef struct nildummy_proto nildummy_proto_t;
-
-/** Type definition of the dummy nil protocol specific data pointer.
- * @see nildummy_proto
- */
-typedef nildummy_proto_t *nildummy_proto_ref;
 
 /** Dummy nil device map.
@@ -86,5 +76,5 @@
 	size_t mtu;
 	/** Actual device hardware address. */
-	measured_string_ref addr;
+	measured_string_t *addr;
 	/** Actual device hardware address data. */
 	char *addr_data;
Index: uspace/srv/net/tl/icmp/icmp.c
===================================================================
--- uspace/srv/net/tl/icmp/icmp.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/tl/icmp/icmp.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -100,5 +100,5 @@
  * @param[in,out] header The ICMP datagram header.
  * @param[in] length	The total datagram length.
- * @returns		The computed checksum.
+ * @return		The computed checksum.
  */
 #define ICMP_CHECKSUM(header, length) \
@@ -112,5 +112,5 @@
  * @param[in] id	The message identifier.
  * @param[in] sequence	The message sequence number.
- * @returns		The computed ICMP reply data key.
+ * @return		The computed ICMP reply data key.
  */
 #define ICMP_GET_REPLY_KEY(id, sequence) \
@@ -128,5 +128,5 @@
  * @param[in] packet	The packet queue to be released.
  * @param[in] result	The result to be returned.
- * @returns		The result parameter.
+ * @return		The result parameter.
  */
 static int icmp_release_and_return(packet_t packet, int result)
@@ -152,9 +152,9 @@
  * @param[in] dont_fragment The value indicating whether the datagram must not
  *			be fragmented. Is used as a MTU discovery.
- * @returns		EOK on success.
- * @returns		EPERM if the error message is not allowed.
+ * @return		EOK on success.
+ * @return		EPERM if the error message is not allowed.
  */
 static int icmp_send_packet(icmp_type_t type, icmp_code_t code, packet_t packet,
-    icmp_header_ref header, services_t error, ip_ttl_t ttl, ip_tos_t tos,
+    icmp_header_t *header, services_t error, ip_ttl_t ttl, ip_tos_t tos,
     int dont_fragment)
 {
@@ -186,10 +186,10 @@
  *
  * @param[in,out] packet The original packet.
- * @returns The prefixed ICMP header.
- * @returns NULL on errors.
- */
-static icmp_header_ref icmp_prepare_packet(packet_t packet)
-{
-	icmp_header_ref header;
+ * @return The prefixed ICMP header.
+ * @return NULL on errors.
+ */
+static icmp_header_t *icmp_prepare_packet(packet_t packet)
+{
+	icmp_header_t *header;
 	size_t header_length;
 	size_t total_length;
@@ -234,12 +234,12 @@
  * @param[in] addr	The target host address.
  * @param[in] addrlen	The torget host address length.
- * @returns		ICMP_ECHO on success.
- * @returns		ETIMEOUT if the reply has not arrived before the
+ * @return		ICMP_ECHO on success.
+ * @return		ETIMEOUT if the reply has not arrived before the
  *			timeout.
- * @returns		ICMP type of the received error notification.
- * @returns		EINVAL if the addrlen parameter is less or equal to
+ * @return		ICMP type of the received error notification.
+ * @return		EINVAL if the addrlen parameter is less or equal to
  *			zero.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EPARTY if there was an internal error.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EPARTY if there was an internal error.
  */
 static int icmp_echo(icmp_param_t id, icmp_param_t sequence, size_t size,
@@ -247,9 +247,9 @@
     const struct sockaddr * addr, socklen_t addrlen)
 {
-	icmp_header_ref header;
+	icmp_header_t *header;
 	packet_t packet;
 	size_t length;
 	uint8_t *data;
-	icmp_reply_ref reply;
+	icmp_reply_t *reply;
 	int reply_key;
 	int index;
@@ -342,5 +342,5 @@
     icmp_code_t code, icmp_param_t mtu, packet_t packet)
 {
-	icmp_header_ref header;
+	icmp_header_t *header;
 
 	header = icmp_prepare_packet(packet);
@@ -357,5 +357,5 @@
 static int icmp_source_quench_msg_local(int icmp_phone, packet_t packet)
 {
-	icmp_header_ref header;
+	icmp_header_t *header;
 
 	header = icmp_prepare_packet(packet);
@@ -370,5 +370,5 @@
     packet_t packet)
 {
-	icmp_header_ref header;
+	icmp_header_t *header;
 
 	header = icmp_prepare_packet(packet);
@@ -383,5 +383,5 @@
     icmp_param_t pointer, packet_t packet)
 {
-	icmp_header_ref header;
+	icmp_header_t *header;
 
 	header = icmp_prepare_packet(packet);
@@ -398,6 +398,6 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @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.
  */
 int icmp_initialize(async_client_conn_t client_connection)
@@ -413,5 +413,5 @@
 		}
 	};
-	measured_string_ref configuration;
+	measured_string_t *configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;
@@ -479,9 +479,9 @@
  * @param[in] code	The received reply message code.
  */
-static void  icmp_process_echo_reply(packet_t packet, icmp_header_ref header,
+static void  icmp_process_echo_reply(packet_t packet, icmp_header_t *header,
     icmp_type_t type, icmp_code_t code)
 {
 	int reply_key;
-	icmp_reply_ref reply;
+	icmp_reply_t *reply;
 
 	/* Compute the reply key */
@@ -507,13 +507,13 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		EINVAL if the stored packet address is not the an_addr_t.
- * @returns		EINVAL if the packet does not contain any data.
- * @returns		NO_DATA if the packet content is shorter than the user
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		EINVAL if the stored packet address is not the an_addr_t.
+ * @return		EINVAL if the packet does not contain any data.
+ * @return		NO_DATA if the packet content is shorter than the user
  *			datagram header.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EADDRNOTAVAIL if the destination socket does not exist.
- * @returns		Other error codes as defined for the
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EADDRNOTAVAIL if the destination socket does not exist.
+ * @return		Other error codes as defined for the
  *			ip_client_process_packet() function.
  */
@@ -525,5 +525,5 @@
 	int result;
 	void *data;
-	icmp_header_ref header;
+	icmp_header_t *header;
 	icmp_type_t type;
 	icmp_code_t code;
@@ -567,5 +567,5 @@
 
 	/* Get ICMP header */
-	header = (icmp_header_ref) data;
+	header = (icmp_header_t *) data;
 
 	if (header->checksum) {
@@ -654,6 +654,6 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the
  *			icmp_process_packet() function.
  */
@@ -673,15 +673,15 @@
  *
  * @param[in] call	The message parameters.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
- * @returns		Other error codes as defined for the packet_translate()
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
+ * @return		Other error codes as defined for the packet_translate()
  *			function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			icmp_destination_unreachable_msg_local() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			icmp_source_quench_msg_local() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			icmp_time_exceeded_msg_local() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			icmp_parameter_problem_msg_local() function.
  *
@@ -731,9 +731,9 @@
  *
  * @param[in,out] echo_data The echo data to be bound.
- * @returns		Index of the inserted echo data.
- * @returns		EBADMEM if the echo_data parameter is NULL.
- * @returns		ENOTCONN if no free identifier have been found.
- */
-static int icmp_bind_free_id(icmp_echo_ref echo_data)
+ * @return		Index of the inserted echo data.
+ * @return		EBADMEM if the echo_data parameter is NULL.
+ * @return		ENOTCONN if no free identifier have been found.
+ */
+static int icmp_bind_free_id(icmp_echo_t *echo_data)
 {
 	icmp_param_t index;
@@ -778,5 +778,5 @@
  * @param[in] callid	The message identifier.
  * @param[in] call	The message parameters.
- * @returns EOK.
+ * @return EOK.
  *
  * @see icmp_interface.h
@@ -791,5 +791,5 @@
 	struct sockaddr *addr;
 	ipc_callid_t data_callid;
-	icmp_echo_ref echo_data;
+	icmp_echo_t *echo_data;
 	int rc = EOK;
 
@@ -800,5 +800,5 @@
 	answer_count = 0;
 
-	echo_data = (icmp_echo_ref) malloc(sizeof(*echo_data));
+	echo_data = (icmp_echo_t *) malloc(sizeof(*echo_data));
 	if (!echo_data)
 		return ENOMEM;
@@ -887,6 +887,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see icmp_interface.h
@@ -964,6 +964,6 @@
 /** Starts the module.
  *
- * @returns		EOK on success.
- * @returns		Other error codes as defined for each specific module
+ * @return		EOK on success.
+ * @return		Other error codes as defined for each specific module
  *			start function.
  */
Index: uspace/srv/net/tl/icmp/icmp.h
===================================================================
--- uspace/srv/net/tl/icmp/icmp.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/tl/icmp/icmp.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -49,9 +49,4 @@
  */
 typedef struct icmp_reply icmp_reply_t;
-
-/** Type definition of the ICMP reply data pointer.
- * @see icmp_reply
- */
-typedef icmp_reply_t *icmp_reply_ref;
 
 /** Type definition of the ICMP global data.
Index: uspace/srv/net/tl/tcp/tcp.c
===================================================================
--- uspace/srv/net/tl/tcp/tcp.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/tl/tcp/tcp.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -127,9 +127,4 @@
 typedef struct tcp_timeout tcp_timeout_t;
 
-/** Type definition of the TCP timeout pointer.
- *  @see tcp_timeout
- */
-typedef tcp_timeout_t *tcp_timeout_ref;
-
 /** TCP reply timeout data.
  *  Used as a timeouting fibril argument.
@@ -144,5 +139,5 @@
 
 	/** Local sockets. */
-	socket_cores_ref local_sockets;
+	socket_cores_t *local_sockets;
 
 	/** Socket identifier. */
@@ -166,9 +161,9 @@
 
 static int tcp_release_and_return(packet_t, int);
-static void tcp_prepare_operation_header(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, int synchronize, int);
-static int tcp_prepare_timeout(int (*)(void *), socket_core_ref,
-    tcp_socket_data_ref, size_t, tcp_socket_state_t, suseconds_t, int);
-static void tcp_free_socket_data(socket_core_ref);
+static void tcp_prepare_operation_header(socket_core_t *, tcp_socket_data_t *,
+    tcp_header_t *, int synchronize, int);
+static int tcp_prepare_timeout(int (*)(void *), socket_core_t *,
+    tcp_socket_data_t *, size_t, tcp_socket_state_t, suseconds_t, int);
+static void tcp_free_socket_data(socket_core_t *);
 
 static int tcp_timeout(void *);
@@ -177,36 +172,36 @@
 
 static int tcp_process_packet(device_id_t, packet_t, services_t);
-static int tcp_connect_core(socket_core_ref, socket_cores_ref,
+static int tcp_connect_core(socket_core_t *, socket_cores_t *,
     struct sockaddr *, socklen_t);
-static int tcp_queue_prepare_packet(socket_core_ref, tcp_socket_data_ref,
+static int tcp_queue_prepare_packet(socket_core_t *, tcp_socket_data_t *,
     packet_t, size_t);
-static int tcp_queue_packet(socket_core_ref, tcp_socket_data_ref, packet_t,
+static int tcp_queue_packet(socket_core_t *, tcp_socket_data_t *, packet_t,
     size_t);
-static packet_t tcp_get_packets_to_send(socket_core_ref, tcp_socket_data_ref);
+static packet_t tcp_get_packets_to_send(socket_core_t *, tcp_socket_data_t *);
 static void tcp_send_packets(device_id_t, packet_t);
 
-static void tcp_process_acknowledgement(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref);
-static packet_t tcp_send_prepare_packet(socket_core_ref, tcp_socket_data_ref,
+static void tcp_process_acknowledgement(socket_core_t *, tcp_socket_data_t *,
+    tcp_header_t *);
+static packet_t tcp_send_prepare_packet(socket_core_t *, tcp_socket_data_t *,
     packet_t, size_t, size_t);
-static packet_t tcp_prepare_copy(socket_core_ref, tcp_socket_data_ref, packet_t,
+static packet_t tcp_prepare_copy(socket_core_t *, tcp_socket_data_t *, packet_t,
     size_t, size_t);
-/* static */ void tcp_retransmit_packet(socket_core_ref, tcp_socket_data_ref,
+/* static */ void tcp_retransmit_packet(socket_core_t *, tcp_socket_data_t *,
     size_t);
-static int tcp_create_notification_packet(packet_t *, socket_core_ref,
-    tcp_socket_data_ref, int, int);
-static void tcp_refresh_socket_data(tcp_socket_data_ref);
-
-static void tcp_initialize_socket_data(tcp_socket_data_ref);
-
-static int tcp_process_listen(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, packet_t, struct sockaddr *, struct sockaddr *, size_t);
-static int tcp_process_syn_sent(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, packet_t);
-static int tcp_process_syn_received(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, packet_t);
-static int tcp_process_established(socket_core_ref, tcp_socket_data_ref,
-    tcp_header_ref, packet_t, int, size_t);
-static int tcp_queue_received_packet(socket_core_ref, tcp_socket_data_ref,
+static int tcp_create_notification_packet(packet_t *, socket_core_t *,
+    tcp_socket_data_t *, int, int);
+static void tcp_refresh_socket_data(tcp_socket_data_t *);
+
+static void tcp_initialize_socket_data(tcp_socket_data_t *);
+
+static int tcp_process_listen(socket_core_t *, tcp_socket_data_t *,
+    tcp_header_t *, packet_t, struct sockaddr *, struct sockaddr *, size_t);
+static int tcp_process_syn_sent(socket_core_t *, tcp_socket_data_t *,
+    tcp_header_t *, packet_t);
+static int tcp_process_syn_received(socket_core_t *, tcp_socket_data_t *,
+    tcp_header_t *, packet_t);
+static int tcp_process_established(socket_core_t *, tcp_socket_data_t *,
+    tcp_header_t *, packet_t, int, size_t);
+static int tcp_queue_received_packet(socket_core_t *, tcp_socket_data_t *,
     packet_t, int, size_t);
 
@@ -214,11 +209,11 @@
 static int tcp_process_client_messages(ipc_callid_t, ipc_call_t);
 
-static int tcp_listen_message(socket_cores_ref, int, int);
-static int tcp_connect_message(socket_cores_ref, int, struct sockaddr *,
+static int tcp_listen_message(socket_cores_t *, int, int);
+static int tcp_connect_message(socket_cores_t *, int, struct sockaddr *,
     socklen_t);
-static int tcp_recvfrom_message(socket_cores_ref, int, int, size_t *);
-static int tcp_send_message(socket_cores_ref, int, int, size_t *, int);
-static int tcp_accept_message(socket_cores_ref, int, int, size_t *, size_t *);
-static int tcp_close_message(socket_cores_ref, int);
+static int tcp_recvfrom_message(socket_cores_t *, int, int, size_t *);
+static int tcp_send_message(socket_cores_t *, int, int, size_t *, int);
+static int tcp_accept_message(socket_cores_t *, int, int, size_t *, size_t *);
+static int tcp_close_message(socket_cores_t *, int);
 
 /** TCP global data. */
@@ -229,6 +224,6 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @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.
  */
 int tcp_initialize(async_client_conn_t client_connection)
@@ -290,7 +285,7 @@
 	size_t offset;
 	int result;
-	tcp_header_ref header;
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_header_t *header;
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
 	packet_t next_packet;
 	size_t total_length;
@@ -343,5 +338,5 @@
 
 	/* Get tcp header */
-	header = (tcp_header_ref) packet_get_data(packet);
+	header = (tcp_header_t *) packet_get_data(packet);
 	if (!header)
 		return tcp_release_and_return(packet, NO_DATA);
@@ -380,5 +375,5 @@
 
 	printf("socket id %d\n", socket->socket_id);
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -497,6 +492,6 @@
 }
 
-int tcp_process_established(socket_core_ref socket, tcp_socket_data_ref
-    socket_data, tcp_header_ref header, packet_t packet, int fragments,
+int tcp_process_established(socket_core_t *socket, tcp_socket_data_t *
+    socket_data, tcp_header_t *header, packet_t packet, int fragments,
     size_t total_length)
 {
@@ -805,9 +800,9 @@
 }
 
-int tcp_queue_received_packet(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, packet_t packet, int fragments,
+int tcp_queue_received_packet(socket_core_t *socket,
+    tcp_socket_data_t *socket_data, packet_t packet, int fragments,
     size_t total_length)
 {
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	int rc;
 
@@ -842,6 +837,6 @@
 }
 
-int tcp_process_syn_sent(socket_core_ref socket, tcp_socket_data_ref
-    socket_data, tcp_header_ref header, packet_t packet)
+int tcp_process_syn_sent(socket_core_t *socket, tcp_socket_data_t *
+    socket_data, tcp_header_t *header, packet_t packet)
 {
 	packet_t next_packet;
@@ -900,12 +895,12 @@
 }
 
-int tcp_process_listen(socket_core_ref listening_socket,
-    tcp_socket_data_ref listening_socket_data, tcp_header_ref header,
+int tcp_process_listen(socket_core_t *listening_socket,
+    tcp_socket_data_t *listening_socket_data, tcp_header_t *header,
     packet_t packet, struct sockaddr *src, struct sockaddr *dest,
     size_t addrlen)
 {
 	packet_t next_packet;
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
 	int socket_id;
 	int listening_socket_id = listening_socket->socket_id;
@@ -922,5 +917,5 @@
 		return tcp_release_and_return(packet, EINVAL);
 
-	socket_data = (tcp_socket_data_ref) malloc(sizeof(*socket_data));
+	socket_data = (tcp_socket_data_t *) malloc(sizeof(*socket_data));
 	if (!socket_data)
 		return tcp_release_and_return(packet, ENOMEM);
@@ -979,5 +974,5 @@
 	}
 	listening_socket_data =
-	    (tcp_socket_data_ref) listening_socket->specific_data;
+	    (tcp_socket_data_t *) listening_socket->specific_data;
 	assert(listening_socket_data);
 
@@ -991,5 +986,5 @@
 		return ENOTSOCK;
 	}
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -1060,9 +1055,9 @@
 }
 
-int tcp_process_syn_received(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, tcp_header_ref header, packet_t packet)
-{
-	socket_core_ref listening_socket;
-	tcp_socket_data_ref listening_socket_data;
+int tcp_process_syn_received(socket_core_t *socket,
+    tcp_socket_data_t *socket_data, tcp_header_t *header, packet_t packet)
+{
+	socket_core_t *listening_socket;
+	tcp_socket_data_t *listening_socket_data;
 	int rc;
 
@@ -1086,5 +1081,5 @@
 	if (listening_socket) {
 		listening_socket_data =
-		    (tcp_socket_data_ref) listening_socket->specific_data;
+		    (tcp_socket_data_t *) listening_socket->specific_data;
 		assert(listening_socket_data);
 
@@ -1127,6 +1122,6 @@
 }
 
-void tcp_process_acknowledgement(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, tcp_header_ref header)
+void tcp_process_acknowledgement(socket_core_t *socket,
+    tcp_socket_data_t *socket_data, tcp_header_t *header)
 {
 	size_t number;
@@ -1227,6 +1222,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see tcp_interface.h
@@ -1265,5 +1260,5 @@
 }
 
-void tcp_refresh_socket_data(tcp_socket_data_ref socket_data)
+void tcp_refresh_socket_data(tcp_socket_data_t *socket_data)
 {
 	assert(socket_data);
@@ -1281,5 +1276,5 @@
 }
 
-void tcp_initialize_socket_data(tcp_socket_data_ref socket_data)
+void tcp_initialize_socket_data(tcp_socket_data_t *socket_data)
 {
 	assert(socket_data);
@@ -1304,7 +1299,7 @@
 	ipc_call_t answer;
 	int answer_count;
-	tcp_socket_data_ref socket_data;
-	socket_core_ref socket;
-	packet_dimension_ref packet_dimension;
+	tcp_socket_data_t *socket_data;
+	socket_core_t *socket;
+	packet_dimension_t *packet_dimension;
 
 	/*
@@ -1336,5 +1331,5 @@
 		case NET_SOCKET:
 			socket_data =
-			    (tcp_socket_data_ref) malloc(sizeof(*socket_data));
+			    (tcp_socket_data_t *) malloc(sizeof(*socket_data));
 			if (!socket_data) {
 				res = ENOMEM;
@@ -1383,5 +1378,5 @@
 				    SOCKET_GET_SOCKET_ID(call));
 				if (socket) {
-					socket_data = (tcp_socket_data_ref)
+					socket_data = (tcp_socket_data_t *)
 					    socket->specific_data;
 					assert(socket_data);
@@ -1540,8 +1535,8 @@
 int tcp_timeout(void *data)
 {
-	tcp_timeout_ref timeout = data;
+	tcp_timeout_t *timeout = data;
 	int keep_write_lock = false;
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
 
 	assert(timeout);
@@ -1561,5 +1556,5 @@
 		goto out;
 	
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 	if (socket_data->local_sockets != timeout->local_sockets)
@@ -1617,7 +1612,7 @@
 int tcp_release_after_timeout(void *data)
 {
-	tcp_timeout_ref timeout = data;
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	tcp_timeout_t *timeout = data;
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
 	fibril_rwlock_t *local_lock;
 
@@ -1635,5 +1630,5 @@
 
 	if (socket && (socket->socket_id == timeout->socket_id)) {
-		socket_data = (tcp_socket_data_ref) socket->specific_data;
+		socket_data = (tcp_socket_data_t *) socket->specific_data;
 		assert(socket_data);
 		if (socket_data->local_sockets == timeout->local_sockets) {
@@ -1656,5 +1651,5 @@
 }
 
-void tcp_retransmit_packet(socket_core_ref socket, tcp_socket_data_ref
+void tcp_retransmit_packet(socket_core_t *socket, tcp_socket_data_t *
     socket_data, size_t sequence_number)
 {
@@ -1683,9 +1678,9 @@
 }
 
-int tcp_listen_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_listen_message(socket_cores_t *local_sockets, int socket_id,
     int backlog)
 {
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
 
 	assert(local_sockets);
@@ -1700,5 +1695,5 @@
 	
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -1709,8 +1704,8 @@
 }
 
-int tcp_connect_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_connect_message(socket_cores_t *local_sockets, int socket_id,
     struct sockaddr *addr, socklen_t addrlen)
 {
-	socket_core_ref socket;
+	socket_core_t *socket;
 	int rc;
 
@@ -1737,8 +1732,8 @@
 }
 
-int tcp_connect_core(socket_core_ref socket, socket_cores_ref local_sockets,
+int tcp_connect_core(socket_core_t *socket, socket_cores_t *local_sockets,
     struct sockaddr *addr, socklen_t addrlen)
 {
-	tcp_socket_data_ref socket_data;
+	tcp_socket_data_t *socket_data;
 	packet_t packet;
 	int rc;
@@ -1749,5 +1744,5 @@
 
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 	assert(socket->specific_data == socket_data);
@@ -1828,8 +1823,8 @@
 }
 
-int tcp_queue_prepare_packet(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, packet_t packet, size_t data_length)
-{
-	tcp_header_ref header;
+int tcp_queue_prepare_packet(socket_core_t *socket,
+    tcp_socket_data_t *socket_data, packet_t packet, size_t data_length)
+{
+	tcp_header_t *header;
 	int rc;
 
@@ -1839,5 +1834,5 @@
 
 	/* Get TCP header */
-	header = (tcp_header_ref) packet_get_data(packet);
+	header = (tcp_header_t *) packet_get_data(packet);
 	if (!header)
 		return NO_DATA;
@@ -1859,5 +1854,5 @@
 }
 
-int tcp_queue_packet(socket_core_ref socket, tcp_socket_data_ref socket_data,
+int tcp_queue_packet(socket_core_t *socket, tcp_socket_data_t *socket_data,
     packet_t packet, size_t data_length)
 {
@@ -1881,5 +1876,5 @@
 }
 
-packet_t tcp_get_packets_to_send(socket_core_ref socket, tcp_socket_data_ref
+packet_t tcp_get_packets_to_send(socket_core_t *socket, tcp_socket_data_t *
     socket_data)
 {
@@ -1941,8 +1936,8 @@
 }
 
-packet_t tcp_send_prepare_packet(socket_core_ref socket, tcp_socket_data_ref
+packet_t tcp_send_prepare_packet(socket_core_t *socket, tcp_socket_data_t *
     socket_data, packet_t packet, size_t data_length, size_t sequence_number)
 {
-	tcp_header_ref header;
+	tcp_header_t *header;
 	uint32_t checksum;
 	int rc;
@@ -1961,5 +1956,5 @@
 
 	/* Get the header */
-	header = (tcp_header_ref) packet_get_data(packet);
+	header = (tcp_header_t *) packet_get_data(packet);
 	if (!header) {
 		pq_release_remote(tcp_globals.net_phone, packet_get_id(packet));
@@ -2002,5 +1997,5 @@
 }
 
-packet_t tcp_prepare_copy(socket_core_ref socket, tcp_socket_data_ref
+packet_t tcp_prepare_copy(socket_core_t *socket, tcp_socket_data_t *
     socket_data, packet_t packet, size_t data_length, size_t sequence_number)
 {
@@ -2032,6 +2027,6 @@
 }
 
-void tcp_prepare_operation_header(socket_core_ref socket,
-    tcp_socket_data_ref socket_data, tcp_header_ref header, int synchronize,
+void tcp_prepare_operation_header(socket_core_t *socket,
+    tcp_socket_data_t *socket_data, tcp_header_t *header, int synchronize,
     int finalize)
 {
@@ -2050,9 +2045,9 @@
 
 int tcp_prepare_timeout(int (*timeout_function)(void *tcp_timeout_t),
-    socket_core_ref socket, tcp_socket_data_ref socket_data,
+    socket_core_t *socket, tcp_socket_data_t *socket_data,
     size_t sequence_number, tcp_socket_state_t state, suseconds_t timeout,
     int globals_read_only)
 {
-	tcp_timeout_ref operation_timeout;
+	tcp_timeout_t *operation_timeout;
 	fid_t fibril;
 
@@ -2096,9 +2091,9 @@
 }
 
-int tcp_recvfrom_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_recvfrom_message(socket_cores_t *local_sockets, int socket_id,
     int flags, size_t *addrlen)
 {
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
 	int packet_id;
 	packet_t packet;
@@ -2117,5 +2112,5 @@
 		return NO_DATA;
 
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 
 	/* Check state */
@@ -2154,13 +2149,13 @@
 }
 
-int tcp_send_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_send_message(socket_cores_t *local_sockets, int socket_id,
     int fragments, size_t *data_fragment_size, int flags)
 {
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
-	packet_dimension_ref packet_dimension;
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
+	packet_dimension_t *packet_dimension;
 	packet_t packet;
 	size_t total_length;
-	tcp_header_ref header;
+	tcp_header_t *header;
 	int index;
 	int result;
@@ -2179,5 +2174,5 @@
 		return NO_DATA;
 
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 
 	/* Check state */
@@ -2230,8 +2225,8 @@
 
 int
-tcp_close_message(socket_cores_ref local_sockets, int socket_id)
-{
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
+tcp_close_message(socket_cores_t *local_sockets, int socket_id)
+{
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
 	packet_t packet;
 	int rc;
@@ -2243,5 +2238,5 @@
 
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -2298,9 +2293,9 @@
 }
 
-int tcp_create_notification_packet(packet_t *packet, socket_core_ref socket,
-    tcp_socket_data_ref socket_data, int synchronize, int finalize)
-{
-	packet_dimension_ref packet_dimension;
-	tcp_header_ref header;
+int tcp_create_notification_packet(packet_t *packet, socket_core_t *socket,
+    tcp_socket_data_t *socket_data, int synchronize, int finalize)
+{
+	packet_dimension_t *packet_dimension;
+	tcp_header_t *header;
 	int rc;
 
@@ -2332,11 +2327,11 @@
 }
 
-int tcp_accept_message(socket_cores_ref local_sockets, int socket_id,
+int tcp_accept_message(socket_cores_t *local_sockets, int socket_id,
     int new_socket_id, size_t *data_fragment_size, size_t *addrlen)
 {
-	socket_core_ref accepted;
-	socket_core_ref socket;
-	tcp_socket_data_ref socket_data;
-	packet_dimension_ref packet_dimension;
+	socket_core_t *accepted;
+	socket_core_t *socket;
+	tcp_socket_data_t *socket_data;
+	packet_dimension_t *packet_dimension;
 	int rc;
 
@@ -2351,5 +2346,5 @@
 
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -2369,5 +2364,5 @@
 
 		/* Get the socket specific data */
-		socket_data = (tcp_socket_data_ref) accepted->specific_data;
+		socket_data = (tcp_socket_data_t *) accepted->specific_data;
 		assert(socket_data);
 		/* TODO can it be in another state? */
@@ -2405,7 +2400,7 @@
 }
 
-void tcp_free_socket_data(socket_core_ref socket)
-{
-	tcp_socket_data_ref socket_data;
+void tcp_free_socket_data(socket_core_t *socket)
+{
+	tcp_socket_data_t *socket_data;
 
 	assert(socket);
@@ -2414,5 +2409,5 @@
 
 	/* Get the socket specific data */
-	socket_data = (tcp_socket_data_ref) socket->specific_data;
+	socket_data = (tcp_socket_data_t *) socket->specific_data;
 	assert(socket_data);
 
@@ -2499,6 +2494,6 @@
 /** Starts the module.
  *
- * @returns		EOK on success.
- * @returns		Other error codes as defined for each specific module
+ * @return		EOK on success.
+ * @return		Other error codes as defined for each specific module
  *			start function.
  */
Index: uspace/srv/net/tl/tcp/tcp.h
===================================================================
--- uspace/srv/net/tl/tcp/tcp.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/tl/tcp/tcp.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -55,18 +55,8 @@
 typedef struct tcp_socket_data tcp_socket_data_t;
 
-/** Type definition of the TCP socket specific data pointer.
- * @see tcp_socket_data
- */
-typedef tcp_socket_data_t *tcp_socket_data_ref;
-
 /** Type definition of the TCP operation data.
  * @see tcp_operation
  */
 typedef struct tcp_operation tcp_operation_t;
-
-/** Type definition of the TCP operation data pointer.
- * @see tcp_operation
- */
-typedef tcp_operation_t *tcp_operation_ref;
 
 /** TCP socket state type definition.
@@ -272,5 +262,5 @@
 	uint16_t dest_port;
 	/** Parent local sockets. */
-	socket_cores_ref local_sockets;
+	socket_cores_t *local_sockets;
 	
 	/** Local sockets safety lock.
Index: uspace/srv/net/tl/tcp/tcp_header.h
===================================================================
--- uspace/srv/net/tl/tcp/tcp_header.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/tl/tcp/tcp_header.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -59,9 +59,4 @@
 typedef struct tcp_header tcp_header_t;
 
-/** Type definition of the transmission datagram header pointer.
- * @see tcp_header
- */
-typedef tcp_header_t *tcp_header_ref;
-
 /** Type definition of the transmission datagram header option.
  * @see tcp_option
@@ -69,16 +64,6 @@
 typedef struct tcp_option tcp_option_t;
 
-/** Type definition of the transmission datagram header option pointer.
- * @see tcp_option
- */
-typedef tcp_option_t *tcp_option_ref;
-
 /** Type definition of the Maximum segment size TCP option. */
 typedef struct tcp_max_segment_size_option tcp_max_segment_size_option_t;
-
-/** Type definition of the Maximum segment size TCP option pointer.
- * @see tcp_max_segment_size_option
- */
-typedef tcp_max_segment_size_option_t *tcp_max_segment_size_option_ref;
 
 /** Transmission datagram header. */
Index: uspace/srv/net/tl/udp/udp.c
===================================================================
--- uspace/srv/net/tl/udp/udp.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/tl/udp/udp.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -97,6 +97,6 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @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.
  */
 int udp_initialize(async_client_conn_t client_connection)
@@ -112,5 +112,5 @@
 		}
 	};
-	measured_string_ref configuration;
+	measured_string_t *configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;
@@ -205,14 +205,14 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		EINVAL if the stored packet address is not the
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		EINVAL if the stored packet address is not the
  *			an_addr_t.
- * @returns		EINVAL if the packet does not contain any data.
- * @returns 		NO_DATA if the packet content is shorter than the user
+ * @return		EINVAL if the packet does not contain any data.
+ * @return 		NO_DATA if the packet content is shorter than the user
  *			datagram header.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EADDRNOTAVAIL if the destination socket does not exist.
- * @returns		Other error codes as defined for the
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EADDRNOTAVAIL if the destination socket does not exist.
+ * @return		Other error codes as defined for the
  *			ip_client_process_packet() function.
  */
@@ -223,6 +223,6 @@
 	size_t offset;
 	int result;
-	udp_header_ref header;
-	socket_core_ref socket;
+	udp_header_t *header;
+	socket_core_t *socket;
 	packet_t next_packet;
 	size_t total_length;
@@ -235,5 +235,5 @@
 	struct sockaddr *src;
 	struct sockaddr *dest;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	int rc;
 
@@ -277,5 +277,5 @@
 
 	/* Get UDP header */
-	header = (udp_header_ref) packet_get_data(packet);
+	header = (udp_header_t *) packet_get_data(packet);
 	if (!header)
 		return udp_release_and_return(packet, NO_DATA);
@@ -409,6 +409,6 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the
  *			udp_process_packet() function.
  */
@@ -439,26 +439,26 @@
  * @param[out] data_fragment_size The data fragment size in bytes.
  * @param[in] flags	Various send flags.
- * @returns		EOK on success.
- * @returns		EAFNOTSUPPORT if the address family is not supported.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EINVAL if the address is invalid.
- * @returns		ENOTCONN if the sending socket is not and cannot be
+ * @return		EOK on success.
+ * @return		EAFNOTSUPPORT if the address family is not supported.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EINVAL if the address is invalid.
+ * @return		ENOTCONN if the sending socket is not and cannot be
  *			bound.
- * @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
  *			socket_read_packet_data() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			ip_client_prepare_packet() function.
- * @returns		Other error codes as defined for the ip_send_msg()
+ * @return		Other error codes as defined for the ip_send_msg()
  *			function.
  */
-static int udp_sendto_message(socket_cores_ref local_sockets, int socket_id,
+static int udp_sendto_message(socket_cores_t *local_sockets, int socket_id,
     const struct sockaddr *addr, socklen_t addrlen, int fragments,
     size_t *data_fragment_size, int flags)
 {
-	socket_core_ref socket;
+	socket_core_t *socket;
 	packet_t packet;
 	packet_t next_packet;
-	udp_header_ref header;
+	udp_header_t *header;
 	int index;
 	size_t total_length;
@@ -469,5 +469,5 @@
 	size_t headerlen;
 	device_id_t device_id;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 	int rc;
 	
@@ -599,21 +599,21 @@
  * @param[in] flags	Various receive flags.
  * @param[out] addrlen	The source address length.
- * @returns		The number of bytes received.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		NO_DATA if there are no received packets or data.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EINVAL if the received address is not an IP address.
- * @returns		Other error codes as defined for the packet_translate()
+ * @return		The number of bytes received.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		NO_DATA if there are no received packets or data.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EINVAL if the received address is not an IP address.
+ * @return		Other error codes as defined for the packet_translate()
  *			function.
- * @returns		Other error codes as defined for the data_reply()
+ * @return		Other error codes as defined for the data_reply()
  *			function.
  */
-static int udp_recvfrom_message(socket_cores_ref local_sockets, int socket_id,
+static int udp_recvfrom_message(socket_cores_t *local_sockets, int socket_id,
     int flags, size_t *addrlen)
 {
-	socket_core_ref socket;
+	socket_core_t *socket;
 	int packet_id;
 	packet_t packet;
-	udp_header_ref header;
+	udp_header_t *header;
 	struct sockaddr *addr;
 	size_t length;
@@ -644,5 +644,5 @@
 		return udp_release_and_return(packet, NO_DATA);
 	}
-	header = (udp_header_ref) data;
+	header = (udp_header_t *) data;
 
 	/* Set the source address port */
@@ -698,5 +698,5 @@
  * @param[in] callid 	The message identifier.
  * @param[in] call	The message parameters.
- * @returns		EOK on success.
+ * @return		EOK on success.
  *
  * @see	socket.h
@@ -714,5 +714,5 @@
 	ipc_call_t answer;
 	int answer_count;
-	packet_dimension_ref packet_dimension;
+	packet_dimension_t *packet_dimension;
 
 	/*
@@ -852,6 +852,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see udp_interface.h
@@ -924,6 +924,6 @@
 /** Starts the module.
  *
- * @returns		EOK on success.
- * @returns		Other error codes as defined for each specific module
+ * @return		EOK on success.
+ * @return		Other error codes as defined for each specific module
  *			start function.
  */
Index: uspace/srv/net/tl/udp/udp_header.h
===================================================================
--- uspace/srv/net/tl/udp/udp_header.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/net/tl/udp/udp_header.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -49,9 +49,4 @@
 typedef struct udp_header udp_header_t;
 
-/** Type definition of the user datagram header pointer.
- * @see udp_header
- */
-typedef udp_header_t *udp_header_ref;
-
 /** User datagram header. */
 struct udp_header {
Index: uspace/srv/vfs/vfs.h
===================================================================
--- uspace/srv/vfs/vfs.h	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/vfs/vfs.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -62,5 +62,5 @@
 #define VFS_PAIR \
 	fs_handle_t fs_handle; \
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 
 /**
@@ -68,5 +68,5 @@
  * doesn't contain any state. For a stateful structure, see vfs_node_t.
  *
- * @note	fs_handle, dev_handle and index are meant to be returned in one
+ * @note	fs_handle, devmap_handle and index are meant to be returned in one
  *		IPC reply.
  */
@@ -182,5 +182,5 @@
 extern void vfs_node_put(vfs_node_t *);
 extern void vfs_node_forget(vfs_node_t *);
-extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, dev_handle_t);
+extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, devmap_handle_t);
 
 
Index: uspace/srv/vfs/vfs_lookup.c
===================================================================
--- uspace/srv/vfs/vfs_lookup.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/vfs/vfs_lookup.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -163,5 +163,5 @@
 	aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (ipcarg_t) first,
 	    (ipcarg_t) (first + len - 1) % PLB_SIZE,
-	    (ipcarg_t) root->dev_handle, (ipcarg_t) lflag, (ipcarg_t) index,
+	    (ipcarg_t) root->devmap_handle, (ipcarg_t) lflag, (ipcarg_t) index,
 	    &answer);
 	
@@ -183,5 +183,5 @@
 	
 	result->triplet.fs_handle = (fs_handle_t) rc;
-	result->triplet.dev_handle = (dev_handle_t) IPC_GET_ARG1(answer);
+	result->triplet.devmap_handle = (devmap_handle_t) IPC_GET_ARG1(answer);
 	result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
 	result->size =
@@ -210,5 +210,5 @@
 	ipc_call_t answer;
 	aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
-	    (ipcarg_t) result->triplet.dev_handle,
+	    (ipcarg_t) result->triplet.devmap_handle,
 	    (ipcarg_t) result->triplet.index, &answer);
 	
Index: uspace/srv/vfs/vfs_node.c
===================================================================
--- uspace/srv/vfs/vfs_node.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/vfs/vfs_node.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -113,5 +113,5 @@
 		unsigned long key[] = {
 			[KEY_FS_HANDLE] = node->fs_handle,
-			[KEY_DEV_HANDLE] = node->dev_handle,
+			[KEY_DEV_HANDLE] = node->devmap_handle,
 			[KEY_INDEX] = node->index
 		};
@@ -131,5 +131,5 @@
 		ipcarg_t rc;
 		rc = async_req_2_0(phone, VFS_OUT_DESTROY,
-		    (ipcarg_t)node->dev_handle, (ipcarg_t)node->index);
+		    (ipcarg_t)node->devmap_handle, (ipcarg_t)node->index);
 		assert(rc == EOK);
 		vfs_release_phone(node->fs_handle, phone);
@@ -151,5 +151,5 @@
 	unsigned long key[] = {
 		[KEY_FS_HANDLE] = node->fs_handle,
-		[KEY_DEV_HANDLE] = node->dev_handle,
+		[KEY_DEV_HANDLE] = node->devmap_handle,
 		[KEY_INDEX] = node->index
 	};
@@ -175,5 +175,5 @@
 	unsigned long key[] = {
 		[KEY_FS_HANDLE] = result->triplet.fs_handle,
-		[KEY_DEV_HANDLE] = result->triplet.dev_handle,
+		[KEY_DEV_HANDLE] = result->triplet.devmap_handle,
 		[KEY_INDEX] = result->triplet.index
 	};
@@ -191,5 +191,5 @@
 		memset(node, 0, sizeof(vfs_node_t));
 		node->fs_handle = result->triplet.fs_handle;
-		node->dev_handle = result->triplet.dev_handle;
+		node->devmap_handle = result->triplet.devmap_handle;
 		node->index = result->triplet.index;
 		node->size = result->size;
@@ -243,5 +243,5 @@
 	vfs_node_t *node = hash_table_get_instance(item, vfs_node_t, nh_link);
 	return (node->fs_handle == (fs_handle_t) key[KEY_FS_HANDLE]) &&
-	    (node->dev_handle == key[KEY_DEV_HANDLE]) &&
+	    (node->devmap_handle == key[KEY_DEV_HANDLE]) &&
 	    (node->index == key[KEY_INDEX]);
 }
@@ -255,5 +255,5 @@
 	unsigned refcnt;
 	fs_handle_t fs_handle;
-	dev_handle_t dev_handle;
+	devmap_handle_t devmap_handle;
 };
 
@@ -264,15 +264,15 @@
 
 	if ((node->fs_handle == rd->fs_handle) &&
-	    (node->dev_handle == rd->dev_handle))
+	    (node->devmap_handle == rd->devmap_handle))
 		rd->refcnt += node->refcnt;
 }
 
 unsigned
-vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, dev_handle_t dev_handle)
+vfs_nodes_refcount_sum_get(fs_handle_t fs_handle, devmap_handle_t devmap_handle)
 {
 	struct refcnt_data rd = {
 		.refcnt = 0,
 		.fs_handle = fs_handle,
-		.dev_handle = dev_handle
+		.devmap_handle = devmap_handle
 	};
 
Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision b4c9c61b6d2be7f3de7f313e31fc7ad751b286ba)
+++ uspace/srv/vfs/vfs_ops.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -55,5 +55,5 @@
 
 /* Forward declarations of static functions. */
-static int vfs_truncate_internal(fs_handle_t, dev_handle_t, fs_index_t, aoff64_t);
+static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t, aoff64_t);
 
 /**
@@ -65,8 +65,8 @@
 vfs_pair_t rootfs = {
 	.fs_handle = 0,
-	.dev_handle = 0
+	.devmap_handle = 0
 };
 
-static void vfs_mount_internal(ipc_callid_t rid, dev_handle_t dev_handle,
+static void vfs_mount_internal(ipc_callid_t rid, devmap_handle_t devmap_handle,
     fs_handle_t fs_handle, char *mp, char *opts)
 {
@@ -125,5 +125,5 @@
 			phone = vfs_grab_phone(fs_handle);
 			msg = async_send_1(phone, VFS_OUT_MOUNTED,
-			    (ipcarg_t) dev_handle, &answer);
+			    (ipcarg_t) devmap_handle, &answer);
 			/* send the mount options */
 			rc = async_data_write_start(phone, (void *)opts,
@@ -150,5 +150,5 @@
 			
 			mr_res.triplet.fs_handle = fs_handle;
-			mr_res.triplet.dev_handle = dev_handle;
+			mr_res.triplet.devmap_handle = devmap_handle;
 			mr_res.triplet.index = rindex;
 			mr_res.size = rsize;
@@ -157,5 +157,5 @@
 			
 			rootfs.fs_handle = fs_handle;
-			rootfs.dev_handle = dev_handle;
+			rootfs.devmap_handle = devmap_handle;
 			
 			/* Add reference to the mounted root. */
@@ -187,8 +187,8 @@
 	phone = vfs_grab_phone(mp_res.triplet.fs_handle);
 	msg = async_send_4(phone, VFS_OUT_MOUNT,
-	    (ipcarg_t) mp_res.triplet.dev_handle,
+	    (ipcarg_t) mp_res.triplet.devmap_handle,
 	    (ipcarg_t) mp_res.triplet.index,
 	    (ipcarg_t) fs_handle,
-	    (ipcarg_t) dev_handle, &answer);
+	    (ipcarg_t) devmap_handle, &answer);
 	
 	/* send connection */
@@ -229,5 +229,5 @@
 	
 		mr_res.triplet.fs_handle = fs_handle;
-		mr_res.triplet.dev_handle = dev_handle;
+		mr_res.triplet.devmap_handle = devmap_handle;
 		mr_res.triplet.index = rindex;
 		mr_res.size = rsize;
@@ -255,5 +255,5 @@
 	 * in the request.
 	 */
-	dev_handle_t dev_handle = (dev_handle_t) IPC_GET_ARG1(*request);
+	devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
 	
 	/*
@@ -343,5 +343,5 @@
 	
 	/* Do the mount */
-	vfs_mount_internal(rid, dev_handle, fs_handle, mp, opts);
+	vfs_mount_internal(rid, devmap_handle, fs_handle, mp, opts);
 	free(mp);
 	free(fs_name);
@@ -402,5 +402,5 @@
 	 */
 	if (vfs_nodes_refcount_sum_get(mr_node->fs_handle,
-	    mr_node->dev_handle) != 2) {
+	    mr_node->devmap_handle) != 2) {
 		fibril_rwlock_write_unlock(&namespace_rwlock);
 		vfs_node_put(mr_node);
@@ -422,5 +422,5 @@
 		phone = vfs_grab_phone(mr_node->fs_handle);
 		rc = async_req_1_0(phone, VFS_OUT_UNMOUNTED,
-		    mr_node->dev_handle);
+		    mr_node->devmap_handle);
 		vfs_release_phone(mr_node->fs_handle, phone);
 		if (rc != EOK) {
@@ -431,5 +431,5 @@
 		}
 		rootfs.fs_handle = 0;
-		rootfs.dev_handle = 0;
+		rootfs.devmap_handle = 0;
 	} else {
 
@@ -458,5 +458,5 @@
 
 		phone = vfs_grab_phone(mp_node->fs_handle);
-		rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->dev_handle,
+		rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->devmap_handle,
 		    mp_node->index);
 		vfs_release_phone(mp_node->fs_handle, phone);
@@ -569,5 +569,5 @@
 		if (node->size) {
 			rc = vfs_truncate_internal(node->fs_handle,
-			    node->dev_handle, node->index, 0);
+			    node->devmap_handle, node->index, 0);
 			if (rc) {
 				fibril_rwlock_write_unlock(&node->contents_rwlock);
@@ -626,5 +626,5 @@
 	
 	lr.triplet.fs_handle = IPC_GET_ARG1(*request);
-	lr.triplet.dev_handle = IPC_GET_ARG2(*request);
+	lr.triplet.devmap_handle = IPC_GET_ARG2(*request);
 	lr.triplet.index = IPC_GET_ARG3(*request);
 	int oflag = IPC_GET_ARG4(*request);
@@ -647,5 +647,5 @@
 		if (node->size) {
 			rc = vfs_truncate_internal(node->fs_handle,
-			    node->dev_handle, node->index, 0);
+			    node->devmap_handle, node->index, 0);
 			if (rc) {
 				fibril_rwlock_write_unlock(&node->contents_rwlock);
@@ -709,5 +709,5 @@
 	aid_t msg;
 	ipc_call_t answer;
-	msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->dev_handle,
+	msg = async_send_2(fs_phone, VFS_OUT_SYNC, file->node->devmap_handle,
 	    file->node->index, &answer);
 
@@ -740,5 +740,5 @@
 		aid_t msg;
 		ipc_call_t answer;
-		msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->dev_handle,
+		msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->devmap_handle,
 		    file->node->index, &answer);
 		
@@ -838,9 +838,9 @@
 		
 		rc = async_data_read_forward_3_1(fs_phone, VFS_OUT_READ,
-		    file->node->dev_handle, file->node->index, file->pos,
+		    file->node->devmap_handle, file->node->index, file->pos,
 		    &answer);
 	} else {
 		rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE,
-		    file->node->dev_handle, file->node->index, file->pos,
+		    file->node->devmap_handle, file->node->index, file->pos,
 		    &answer);
 	}
@@ -961,5 +961,5 @@
 }
 
-int vfs_truncate_internal(fs_handle_t fs_handle, dev_handle_t dev_handle,
+int vfs_truncate_internal(fs_handle_t fs_handle, devmap_handle_t devmap_handle,
     fs_index_t index, aoff64_t size)
 {
@@ -968,5 +968,5 @@
 	
 	fs_phone = vfs_grab_phone(fs_handle);
-	rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) dev_handle,
+	rc = async_req_4_0(fs_phone, VFS_OUT_TRUNCATE, (ipcarg_t) devmap_handle,
 	    (ipcarg_t) index, LOWER32(size), UPPER32(size));
 	vfs_release_phone(fs_handle, fs_phone);
@@ -990,5 +990,5 @@
 	fibril_rwlock_write_lock(&file->node->contents_rwlock);
 	rc = vfs_truncate_internal(file->node->fs_handle,
-	    file->node->dev_handle, file->node->index, size);
+	    file->node->devmap_handle, file->node->index, size);
 	if (rc == EOK)
 		file->node->size = size;
@@ -1022,5 +1022,5 @@
 	
 	aid_t msg;
-	msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->dev_handle,
+	msg = async_send_3(fs_phone, VFS_OUT_STAT, file->node->devmap_handle,
 	    file->node->index, true, NULL);
 	ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
@@ -1071,5 +1071,5 @@
 	int fs_phone = vfs_grab_phone(node->fs_handle);
 	aid_t msg;
-	msg = async_send_3(fs_phone, VFS_OUT_STAT, node->dev_handle,
+	msg = async_send_3(fs_phone, VFS_OUT_STAT, node->devmap_handle,
 	    node->index, false, NULL);
 	ipc_forward_fast(callid, fs_phone, 0, 0, 0, IPC_FF_ROUTE_FROM_ME);
@@ -1245,5 +1245,5 @@
 	/* Check whether linking to the same file system instance. */
 	if ((old_node->fs_handle != new_par_lr.triplet.fs_handle) ||
-	    (old_node->dev_handle != new_par_lr.triplet.dev_handle)) {
+	    (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) {
 		fibril_rwlock_write_unlock(&namespace_rwlock);
 		ipc_answer_0(rid, EXDEV);	/* different file systems */
