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)
 {