Index: uspace/lib/c/generic/adt/char_map.c
===================================================================
--- uspace/lib/c/generic/adt/char_map.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/c/generic/adt/char_map.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -65,12 +65,12 @@
  */
 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;
@@ -110,5 +110,5 @@
  * @returns		FALSE otherwise.
  */
-static int char_map_is_valid(const char_map_ref map)
+static int char_map_is_valid(const char_map_t *map)
 {
 	return map && (map->magic == CHAR_MAP_MAGIC_VALUE);
@@ -139,5 +139,5 @@
  */
 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)) {
@@ -200,6 +200,6 @@
  * @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,
+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;
 }
 
@@ -242,7 +242,7 @@
  * @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;
+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);
@@ -270,7 +270,7 @@
  *  @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;
+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);
@@ -285,5 +285,5 @@
  *  @returns		ENOMEM if there is not enough memory left.
  */
-int char_map_initialize(char_map_ref map)
+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;
@@ -330,8 +330,8 @@
  */
 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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/c/generic/adt/dynamic_fifo.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -59,5 +59,5 @@
  * @returns		FALSE otherwise.
  */
-static int dyn_fifo_is_valid(dyn_fifo_ref fifo)
+static int dyn_fifo_is_valid(dyn_fifo_t *fifo)
 {
 	return fifo && (fifo->magic_value == DYN_FIFO_MAGIC_VALUE);
@@ -73,5 +73,5 @@
  * @returns		ENOMEM if there is not enough memory left.
  */
-int dyn_fifo_initialize(dyn_fifo_ref fifo, int size)
+int dyn_fifo_initialize(dyn_fifo_t *fifo, int size)
 {
 	if (!fifo)
@@ -104,5 +104,5 @@
  * @returns		ENOMEM if there is not enough memory left.
  */
-int dyn_fifo_push(dyn_fifo_ref fifo, int value, int max_size)
+int dyn_fifo_push(dyn_fifo_t *fifo, int value, int max_size)
 {
 	int *new_items;
@@ -154,5 +154,5 @@
  * @returns		ENOENT if the queue is empty.
  */
-int dyn_fifo_pop(dyn_fifo_ref fifo)
+int dyn_fifo_pop(dyn_fifo_t *fifo)
 {
 	int value;
@@ -176,5 +176,5 @@
  * @returns		ENOENT if the queue is empty.
  */
-int dyn_fifo_value(dyn_fifo_ref fifo)
+int dyn_fifo_value(dyn_fifo_t *fifo)
 {
 	if (!dyn_fifo_is_valid(fifo))
@@ -193,5 +193,5 @@
  * @returns		EINVAL if the queue is not valid.
  */
-int dyn_fifo_destroy(dyn_fifo_ref fifo)
+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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/c/generic/adt/measured_strings.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -58,8 +58,8 @@
  * @returns		NULL if there is not enough memory left.
  */
-measured_string_ref
+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)
@@ -88,12 +88,12 @@
  * @returns		NULL if there is not enough memory left.
  */
-measured_string_ref measured_string_copy(measured_string_ref source)
-{
-	measured_string_ref new;
+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);
@@ -131,5 +131,5 @@
  */
 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) {
@@ -212,5 +212,5 @@
  * @returns		NULL if there is not enough memory left.
  */
-static size_t *prepare_lengths(const measured_string_ref strings, size_t count)
+static size_t *prepare_lengths(const measured_string_t *strings, size_t count)
 {
 	size_t *lengths;
@@ -248,5 +248,5 @@
  *			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;
@@ -311,5 +311,5 @@
  */
 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) {
@@ -385,5 +385,5 @@
  */
 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/include/adt/char_map.h
===================================================================
--- uspace/lib/c/include/adt/char_map.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/c/include/adt/char_map.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/c/include/adt/dynamic_fifo.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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/measured_strings.h
===================================================================
--- uspace/lib/c/include/adt/measured_strings.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/c/include/adt/measured_strings.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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/net/generic/generic.c
===================================================================
--- uspace/lib/net/generic/generic.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/generic/generic.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -100,5 +100,5 @@
 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;
@@ -233,6 +233,6 @@
 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_remote.c
===================================================================
--- uspace/lib/net/generic/net_remote.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/generic/net_remote.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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)
@@ -90,5 +90,5 @@
  */
 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)
 {
@@ -118,5 +118,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)
 {
 	return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,
Index: uspace/lib/net/il/arp_remote.c
===================================================================
--- uspace/lib/net/il/arp_remote.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/il/arp_remote.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -83,5 +83,5 @@
 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;
@@ -133,5 +133,5 @@
  */
 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;
@@ -165,5 +165,5 @@
 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/include/arp_interface.h
===================================================================
--- uspace/lib/net/include/arp_interface.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/include/arp_interface.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/include/generic.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -49,5 +49,5 @@
     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,
@@ -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/net_interface.h
===================================================================
--- uspace/lib/net/include/net_interface.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/include/net_interface.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/include/netif_local.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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.
@@ -195,5 +195,5 @@
     device_stats_t *stats);
 
-extern int netif_get_addr_req_local(int, device_id_t, measured_string_ref *,
+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);
Index: uspace/lib/net/include/netif_remote.h
===================================================================
--- uspace/lib/net/include/netif_remote.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/include/netif_remote.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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);
Index: uspace/lib/net/netif/netif_local.c
===================================================================
--- uspace/lib/net/netif/netif_local.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/netif/netif_local.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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;
Index: uspace/lib/net/netif/netif_remote.c
===================================================================
--- uspace/lib/net/netif/netif_remote.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/lib/net/netif/netif_remote.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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,
Index: uspace/srv/hw/netif/dp8390/dp8390_module.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -186,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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/il/arp/arp.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -126,5 +126,5 @@
 
 static int arp_clear_address_req(int arp_phone, device_id_t device_id,
-    services_t protocol, measured_string_ref address)
+    services_t protocol, measured_string_t *address)
 {
 	arp_device_t *device;
@@ -175,5 +175,5 @@
  */
 static int arp_proto_create(arp_proto_t **proto, services_t service,
-    measured_string_ref address)
+    measured_string_t *address)
 {
 	int rc;
@@ -213,5 +213,5 @@
  */
 static int arp_device_message(device_id_t device_id, services_t service,
-    services_t protocol, measured_string_ref address)
+    services_t protocol, measured_string_t *address)
 {
 	arp_device_t *device;
@@ -421,5 +421,5 @@
 	arp_device_t *device;
 	arp_proto_t *proto;
-	measured_string_ref hw_source;
+	measured_string_t *hw_source;
 	uint8_t *src_hw;
 	uint8_t *src_proto;
@@ -523,11 +523,11 @@
  * @returns		NULL if the hardware address is not found in the cache.
  */
-static measured_string_ref
+static measured_string_t *
 arp_translate_message(device_id_t device_id, services_t protocol,
-    measured_string_ref target)
+    measured_string_t *target)
 {
 	arp_device_t *device;
 	arp_proto_t *proto;
-	measured_string_ref addr;
+	measured_string_t *addr;
 	size_t length;
 	packet_t packet;
@@ -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;
Index: uspace/srv/net/il/arp/arp.h
===================================================================
--- uspace/srv/net/il/arp/arp.h	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/il/arp/arp.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -89,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;
@@ -135,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/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/il/ip/ip.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -344,5 +344,5 @@
 		}
 	};
-	measured_string_ref configuration;
+	measured_string_t *configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;
@@ -623,5 +623,5 @@
 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;
@@ -997,5 +997,5 @@
 {
 	measured_string_t destination;
-	measured_string_ref translation;
+	measured_string_t *translation;
 	char *data;
 	int phone;
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/net/net.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -93,5 +93,5 @@
 	int rc;
 	
-	measured_string_ref setting =
+	measured_string_t *setting =
 	    measured_string_create_bulk(value, 0);
 	if (!setting)
@@ -163,5 +163,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)
@@ -357,5 +357,5 @@
  */
 static int net_get_conf(measured_strings_ref netif_conf,
-    measured_string_ref configuration, size_t count, char **data)
+    measured_string_t *configuration, size_t count, char **data)
 {
 	if (data)
@@ -364,5 +364,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 +382,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 +392,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 +404,5 @@
 }
 
-void net_free_settings(measured_string_ref settings, char *data)
+void net_free_settings(measured_string_t *settings, char *data)
 {
 }
@@ -429,5 +429,5 @@
 	
 	/* Mandatory netif */
-	measured_string_ref setting =
+	measured_string_t *setting =
 	    measured_strings_find(&netif->configuration, CONF_NETIF, 0);
 	
@@ -550,5 +550,5 @@
 		
 		/* Mandatory name */
-		measured_string_ref setting =
+		measured_string_t *setting =
 		    measured_strings_find(&netif->configuration, CONF_NAME, 0);
 		if (!setting) {
@@ -620,5 +620,5 @@
     int *answer_count)
 {
-	measured_string_ref strings;
+	measured_string_t *strings;
 	char *data;
 	int rc;
Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/netif/lo/lo.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -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)
Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/nil/eth/eth.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -293,5 +293,5 @@
 		}
 	};
-	measured_string_ref configuration;
+	measured_string_t *configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;
@@ -591,5 +591,5 @@
  */
 static int eth_addr_message(device_id_t device_id, eth_addr_type_t type,
-    measured_string_ref *address)
+    measured_string_t **address)
 {
 	eth_device_t *device;
@@ -840,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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/nil/eth/eth.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -90,5 +90,5 @@
 	
 	/** Actual device hardware address. */
-	measured_string_ref addr;
+	measured_string_t *addr;
 	/** Actual device hardware address data. */
 	char *addr_data;
@@ -123,5 +123,5 @@
 	
 	/** Broadcast device hardware address. */
-	measured_string_ref broadcast_addr;
+	measured_string_t *broadcast_addr;
 };
 
Index: uspace/srv/net/nil/nildummy/nildummy.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/nil/nildummy/nildummy.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -248,5 +248,5 @@
  */
 static int nildummy_addr_message(device_id_t device_id,
-    measured_string_ref *address)
+    measured_string_t **address)
 {
 	nildummy_device_t *device;
@@ -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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/nil/nildummy/nildummy.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -76,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 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/tl/icmp/icmp.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -413,5 +413,5 @@
 		}
 	};
-	measured_string_ref configuration;
+	measured_string_t *configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;
Index: uspace/srv/net/tl/udp/udp.c
===================================================================
--- uspace/srv/net/tl/udp/udp.c	(revision 88a1bb93df868fc1adbd2828fa084c020bf5913c)
+++ uspace/srv/net/tl/udp/udp.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
@@ -112,5 +112,5 @@
 		}
 	};
-	measured_string_ref configuration;
+	measured_string_t *configuration;
 	size_t count = sizeof(names) / sizeof(measured_string_t);
 	char *data;