Index: uspace/lib/c/include/net/modules.h
===================================================================
--- uspace/lib/c/include/net/modules.h	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/lib/c/include/net/modules.h	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -49,12 +49,4 @@
 #include <sys/time.h>
 
-/** Registers the module service at the name server.
- *
- * @param[in] me	The module service.
- * @param[out] phonehash The created phone hash.
- */
-#define REGISTER_ME(me, phonehash) \
-	ipc_connect_to_me(PHONE_NS, (me), 0, 0, (phonehash))
-
 /** Connect to the needed module function type definition.
  *
Index: uspace/srv/hw/netif/dp8390/dp8390_module.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -310,5 +310,5 @@
 	async_set_interrupt_received(irq_handler);
 
-	return REGISTER_ME(SERVICE_DP8390, &phonehash);
+	return ipc_connect_to_me(PHONE_NS, SERVICE_DP8390, 0, 0, &phonehash);
 }
 
Index: uspace/srv/net/il/arp/arp_module.c
===================================================================
--- uspace/srv/net/il/arp/arp_module.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/il/arp/arp_module.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -79,5 +79,5 @@
 		goto out;
 	
-	rc = REGISTER_ME(SERVICE_ARP, &phonehash);
+	rc = ipc_connect_to_me(PHONE_NS, SERVICE_ARP, 0, 0, &phonehash);
 	if (rc != EOK)
 		goto out;
Index: uspace/srv/net/il/ip/ip_module.c
===================================================================
--- uspace/srv/net/il/ip/ip_module.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/il/ip/ip_module.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -80,5 +80,5 @@
 		goto out;
 	
-	rc = REGISTER_ME(SERVICE_IP, &phonehash);
+	rc = ipc_connect_to_me(PHONE_NS, SERVICE_IP, 0, 0, &phonehash);
 	if (rc != EOK)
 		goto out;
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/net/net.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -335,5 +335,5 @@
 		goto out;
 	
-	rc = REGISTER_ME(SERVICE_NETWORKING, &phonehash);
+	rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, &phonehash);
 	if (rc != EOK)
 		goto out;
Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/netif/lo/lo.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -166,5 +166,5 @@
 	sysarg_t phonehash;
 
-	return REGISTER_ME(SERVICE_LO, &phonehash);
+	return ipc_connect_to_me(PHONE_NS, SERVICE_LO, 0, 0, &phonehash);
 }
 
Index: uspace/srv/net/nil/eth/eth_module.c
===================================================================
--- uspace/srv/net/nil/eth/eth_module.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/nil/eth/eth_module.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -66,5 +66,5 @@
 		goto out;
 
-	rc = REGISTER_ME(SERVICE_ETHERNET, &phonehash);
+	rc = ipc_connect_to_me(PHONE_NS, SERVICE_ETHERNET, 0, 0, &phonehash);
 	if (rc != EOK)
 		goto out;
Index: uspace/srv/net/nil/nildummy/nildummy_module.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy_module.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/nil/nildummy/nildummy_module.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -67,5 +67,5 @@
 		goto out;
 	
-	rc = REGISTER_ME(SERVICE_NILDUMMY, &phonehash);
+	rc = ipc_connect_to_me(PHONE_NS, SERVICE_NILDUMMY, 0, 0, &phonehash);
 	if (rc != EOK)
 		goto out;
Index: uspace/srv/net/tl/icmp/icmp_module.c
===================================================================
--- uspace/srv/net/tl/icmp/icmp_module.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/tl/icmp/icmp_module.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -74,5 +74,5 @@
 		goto out;
 
-	rc = REGISTER_ME(SERVICE_ICMP, &phonehash);
+	rc = ipc_connect_to_me(PHONE_NS, SERVICE_ICMP, 0, 0, &phonehash);
 	if (rc != EOK)
 		goto out;
Index: uspace/srv/net/tl/tcp/tcp_module.c
===================================================================
--- uspace/srv/net/tl/tcp/tcp_module.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/tl/tcp/tcp_module.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -75,5 +75,5 @@
 		goto out;
 
-	rc = REGISTER_ME(SERVICE_TCP, &phonehash);
+	rc = ipc_connect_to_me(PHONE_NS, SERVICE_TCP, 0, 0, &phonehash);
 	if (rc != EOK)
 		goto out;
Index: uspace/srv/net/tl/udp/udp_module.c
===================================================================
--- uspace/srv/net/tl/udp/udp_module.c	(revision 1b59023d265904456c850e31b8b942f8cf34a860)
+++ uspace/srv/net/tl/udp/udp_module.c	(revision f87c900c7fef92da44a2955846d21ab799a9a150)
@@ -75,5 +75,5 @@
 		goto out;
 	
-	rc = REGISTER_ME(SERVICE_UDP, &phonehash);
+	rc = ipc_connect_to_me(PHONE_NS, SERVICE_UDP, 0, 0, &phonehash);
 	if (rc != EOK)
 		goto out;