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;