Index: uspace/lib/net/generic/generic.c
===================================================================
--- uspace/lib/net/generic/generic.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
+++ uspace/lib/net/generic/generic.c	(revision 390d80d3311996c5f585280d3918fd3f577111a9)
@@ -37,4 +37,5 @@
 #include <generic.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <ipc/services.h>
 #include <net/device.h>
@@ -56,5 +57,5 @@
     int state, services_t target)
 {
-	async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+	async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
 	    (sysarg_t) state, target);
 	
@@ -78,5 +79,5 @@
     int arg2, services_t service)
 {
-	return (int) async_req_3_0(phone, (sysarg_t) message,
+	return (int) async_obsolete_req_3_0(phone, (sysarg_t) message,
 	    (sysarg_t) device_id, (sysarg_t) arg2, (sysarg_t) service);
 }
@@ -107,5 +108,5 @@
 
 	/* Request the address */
-	message_id = async_send_1(phone, (sysarg_t) message,
+	message_id = async_obsolete_send_1(phone, (sysarg_t) message,
 	    (sysarg_t) device_id, NULL);
 	string = measured_strings_return(phone, address, data, 1);
@@ -145,5 +146,5 @@
 	sysarg_t suffix;
 	
-	sysarg_t result = async_req_1_4(phone, (sysarg_t) message,
+	sysarg_t result = async_obsolete_req_1_4(phone, (sysarg_t) message,
 	    (sysarg_t) device_id, &addr_len, &prefix, &content, &suffix);
 	
@@ -172,8 +173,8 @@
 {
 	if (error) {
-		async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
+		async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
 		    (sysarg_t) packet_id, (sysarg_t) target, (sysarg_t) error);
 	} else {
-		async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+		async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
 		    (sysarg_t) packet_id, (sysarg_t) target);
 	}
@@ -198,8 +199,8 @@
 {
 	if (error) {
-		async_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
+		async_obsolete_msg_4(phone, (sysarg_t) message, (sysarg_t) device_id,
 		    (sysarg_t) packet_id, (sysarg_t) sender, (sysarg_t) error);
 	} else {
-		async_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
+		async_obsolete_msg_3(phone, (sysarg_t) message, (sysarg_t) device_id,
 		    (sysarg_t) packet_id, (sysarg_t) sender);
 	}
@@ -243,5 +244,5 @@
 
 	/* Request the translation */
-	message_id = async_send_3(phone, (sysarg_t) message,
+	message_id = async_obsolete_send_3(phone, (sysarg_t) message,
 	    (sysarg_t) device_id, (sysarg_t) count, (sysarg_t) service, NULL);
 	measured_strings_send(phone, configuration, count);
Index: uspace/lib/net/generic/packet_remote.c
===================================================================
--- uspace/lib/net/generic/packet_remote.c	(revision ccca251bb0673718b534366ace0e22857d73804b)
+++ uspace/lib/net/generic/packet_remote.c	(revision 390d80d3311996c5f585280d3918fd3f577111a9)
@@ -37,4 +37,5 @@
 
 #include <async.h>
+#include <async_obsolete.h>
 #include <errno.h>
 #include <ipc/packet.h>
@@ -59,5 +60,5 @@
  * @return EOK on success.
  * @return Other error codes as defined for the pm_add() function.
- * @return Other error codes as defined for the async_share_in_start() function.
+ * @return Other error codes as defined for the async_obsolete_share_in_start() function.
  *
  */
@@ -69,8 +70,8 @@
 	int rc;
 	
-	message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
+	message = async_obsolete_send_1(phone, NET_PACKET_GET, packet_id, &answer);
 
 	*packet = (packet_t *) as_get_mappable_page(size);
-	rc = async_share_in_start_0_0(phone, *packet, size);
+	rc = async_obsolete_share_in_start_0_0(phone, *packet, size);
 	if (rc != EOK) {
 		munmap(*packet, size);
@@ -117,5 +118,5 @@
 		sysarg_t size;
 		
-		rc = async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
+		rc = async_obsolete_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id,
 		    &size);
 		if (rc != EOK)
@@ -154,5 +155,5 @@
 	int rc;
 	
-	rc = async_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len,
+	rc = async_obsolete_req_4_2(phone, NET_PACKET_CREATE_4, max_content, addr_len,
 	    max_prefix, max_suffix, &packet_id, &size);
 	if (rc != EOK)
@@ -185,5 +186,5 @@
 	int rc;
 	
-	rc = async_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id,
+	rc = async_obsolete_req_1_2(phone, NET_PACKET_CREATE_1, content, &packet_id,
 	    &size);
 	if (rc != EOK)
@@ -212,5 +213,5 @@
 void pq_release_remote(int phone, packet_id_t packet_id)
 {
-	async_msg_1(phone, NET_PACKET_RELEASE, packet_id);
+	async_obsolete_msg_1(phone, NET_PACKET_RELEASE, packet_id);
 }