Index: uspace/lib/c/generic/net/socket_client.c
===================================================================
--- uspace/lib/c/generic/net/socket_client.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/c/generic/net/socket_client.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -157,5 +157,5 @@
 
 	/** Active sockets. */
-	sockets_ref sockets;
+	sockets_t *sockets;
 
 	/** Safety lock.
@@ -180,9 +180,9 @@
  *  @returns		The active sockets.
  */
-static sockets_ref socket_get_sockets(void)
+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;
@@ -327,5 +327,5 @@
 static int socket_generate_new_id(void)
 {
-	sockets_ref sockets;
+	sockets_t *sockets;
 	int socket_id = 0;
 	int count;
Index: uspace/lib/c/include/adt/generic_char_map.h
===================================================================
--- uspace/lib/c/include/adt/generic_char_map.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/c/include/adt/generic_char_map.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -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 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/c/include/adt/generic_field.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -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 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/c/include/adt/int_map.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -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/net/adt/module_map.c
===================================================================
--- uspace/lib/net/adt/module_map.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/net/adt/module_map.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -63,5 +63,5 @@
  */
 int
-add_module(module_t **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)
@@ -104,5 +104,5 @@
  * @returns		NULL if there is no such module.
  */
-module_t *get_running_module(modules_ref modules, char *name)
+module_t *get_running_module(modules_t *modules, char *name)
 {
 	module_t *module;
Index: uspace/lib/net/include/adt/module_map.h
===================================================================
--- uspace/lib/net/include/adt/module_map.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/net/include/adt/module_map.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -72,7 +72,7 @@
 };
 
-extern int add_module(module_t **, 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_t *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/socket_core.h
===================================================================
--- uspace/lib/net/include/socket_core.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/net/include/socket_core.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -108,18 +108,18 @@
 INT_MAP_DECLARE(socket_ports, socket_port_t);
 
-extern void socket_cores_release(int, socket_cores_ref, socket_ports_ref,
+extern void socket_cores_release(int, socket_cores_t *, socket_ports_t *,
     void (*)(socket_core_t *));
-extern int socket_bind(socket_cores_ref, socket_ports_ref, int, void *, size_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_t *, 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,
+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_t *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_t *);
-extern int socket_port_add(socket_ports_ref, int, socket_core_t *,
+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/tl/socket_core.c
===================================================================
--- uspace/lib/net/tl/socket_core.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/lib/net/tl/socket_core.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -86,5 +86,5 @@
 static void
 socket_destroy_core(int packet_phone, socket_core_t *socket,
-    socket_cores_ref local_sockets, socket_ports_ref global_sockets,
+    socket_cores_t *local_sockets, socket_ports_t *global_sockets,
     void (* socket_release)(socket_core_t *socket))
 {
@@ -121,6 +121,6 @@
  */
 void
-socket_cores_release(int packet_phone, socket_cores_ref local_sockets,
-    socket_ports_ref global_sockets,
+socket_cores_release(int packet_phone, socket_cores_t *local_sockets,
+    socket_ports_t *global_sockets,
     void (* socket_release)(socket_core_t *socket))
 {
@@ -200,5 +200,5 @@
  */
 static int
-socket_bind_insert(socket_ports_ref global_sockets, socket_core_t *socket,
+socket_bind_insert(socket_ports_t *global_sockets, socket_core_t *socket,
     int port)
 {
@@ -258,5 +258,5 @@
  */
 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)
@@ -328,5 +328,5 @@
  */
 int
-socket_bind_free_port(socket_ports_ref global_sockets, socket_core_t *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)
 {
@@ -370,5 +370,5 @@
  * @returns		ELIMIT if there is no socket identifier available.
  */
-static int socket_generate_new_id(socket_cores_ref local_sockets, int positive)
+static int socket_generate_new_id(socket_cores_t *local_sockets, int positive)
 {
 	int socket_id;
@@ -415,5 +415,5 @@
  */
 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)
 {
@@ -486,6 +486,6 @@
  */
 int
-socket_destroy(int packet_phone, int socket_id, socket_cores_ref local_sockets,
-    socket_ports_ref global_sockets,
+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))
 {
@@ -602,5 +602,5 @@
  */
 socket_core_t *
-socket_port_find(socket_ports_ref global_sockets, int port, const char *key,
+socket_port_find(socket_ports_t *global_sockets, int port, const char *key,
     size_t key_length)
 {
@@ -628,5 +628,5 @@
  */
 void
-socket_port_release(socket_ports_ref global_sockets, socket_core_t *socket)
+socket_port_release(socket_ports_t *global_sockets, socket_core_t *socket)
 {
 	socket_port_t *socket_port;
@@ -679,5 +679,5 @@
  */
 int
-socket_port_add(socket_ports_ref global_sockets, int port,
+socket_port_add(socket_ports_t *global_sockets, int port,
     socket_core_t *socket, const char *key, size_t key_length)
 {
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/srv/net/net/net.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -88,5 +88,5 @@
  *
  */
-int add_configuration(measured_strings_ref configuration, const char *name,
+int add_configuration(measured_strings_t *configuration, const char *name,
     const char *value)
 {
@@ -117,5 +117,5 @@
 }
 
-static int parse_line(measured_strings_ref configuration, char *line)
+static int parse_line(measured_strings_t *configuration, char *line)
 {
 	int rc;
@@ -179,5 +179,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);
@@ -356,5 +356,5 @@
  *
  */
-static int net_get_conf(measured_strings_ref netif_conf,
+static int net_get_conf(measured_strings_t *netif_conf,
     measured_string_t *configuration, size_t count, char **data)
 {
Index: uspace/srv/net/net/net.h
===================================================================
--- uspace/srv/net/net/net.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/srv/net/net/net.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -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/tl/tcp/tcp.c
===================================================================
--- uspace/srv/net/tl/tcp/tcp.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/srv/net/tl/tcp/tcp.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -139,5 +139,5 @@
 
 	/** Local sockets. */
-	socket_cores_ref local_sockets;
+	socket_cores_t *local_sockets;
 
 	/** Socket identifier. */
@@ -172,5 +172,5 @@
 
 static int tcp_process_packet(device_id_t, packet_t, services_t);
-static int tcp_connect_core(socket_core_t *, 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_t *, tcp_socket_data_t *,
@@ -209,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. */
@@ -1678,5 +1678,5 @@
 }
 
-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)
 {
@@ -1704,5 +1704,5 @@
 }
 
-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)
 {
@@ -1732,5 +1732,5 @@
 }
 
-int tcp_connect_core(socket_core_t *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)
 {
@@ -2091,5 +2091,5 @@
 }
 
-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)
 {
@@ -2149,5 +2149,5 @@
 }
 
-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)
 {
@@ -2225,5 +2225,5 @@
 
 int
-tcp_close_message(socket_cores_ref local_sockets, int socket_id)
+tcp_close_message(socket_cores_t *local_sockets, int socket_id)
 {
 	socket_core_t *socket;
@@ -2327,5 +2327,5 @@
 }
 
-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)
 {
Index: uspace/srv/net/tl/tcp/tcp.h
===================================================================
--- uspace/srv/net/tl/tcp/tcp.h	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/srv/net/tl/tcp/tcp.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -262,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/udp/udp.c
===================================================================
--- uspace/srv/net/tl/udp/udp.c	(revision 4eca0560ec015aab6080f3c3fec0a783f2977837)
+++ uspace/srv/net/tl/udp/udp.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
@@ -453,5 +453,5 @@
  *			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)
@@ -609,5 +609,5 @@
  *			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)
 {