Index: uspace/lib/drv/include/audio_pcm_iface.h
===================================================================
--- uspace/lib/drv/include/audio_pcm_iface.h	(revision 8a64320e304a59746f5987caeba986e6baf11dd7)
+++ uspace/lib/drv/include/audio_pcm_iface.h	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
@@ -85,5 +85,5 @@
 int audio_pcm_query_cap(audio_pcm_sess_t *, audio_cap_t);
 int audio_pcm_register_event_callback(audio_pcm_sess_t *,
-    async_client_conn_t, void *);
+    async_port_handler_t, void *);
 int audio_pcm_unregister_event_callback(audio_pcm_sess_t *);
 
Index: uspace/lib/drv/include/ddf/driver.h
===================================================================
--- uspace/lib/drv/include/ddf/driver.h	(revision 8a64320e304a59746f5987caeba986e6baf11dd7)
+++ uspace/lib/drv/include/ddf/driver.h	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
@@ -133,5 +133,5 @@
 extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
 extern void ddf_fun_set_ops(ddf_fun_t *, ddf_dev_ops_t *);
-extern void ddf_fun_set_conn_handler(ddf_fun_t *, async_client_conn_t);
+extern void ddf_fun_set_conn_handler(ddf_fun_t *, async_port_handler_t);
 extern int ddf_fun_add_to_category(ddf_fun_t *, const char *);
 
Index: uspace/lib/drv/include/nic_iface.h
===================================================================
--- uspace/lib/drv/include/nic_iface.h	(revision 8a64320e304a59746f5987caeba986e6baf11dd7)
+++ uspace/lib/drv/include/nic_iface.h	(revision d9e68d07a1ce78ab2bebb77398cc506402a01544)
@@ -48,5 +48,5 @@
 
 extern int nic_send_frame(async_sess_t *, void *, size_t);
-extern int nic_callback_create(async_sess_t *, async_client_conn_t, void *);
+extern int nic_callback_create(async_sess_t *, async_port_handler_t, void *);
 extern int nic_get_state(async_sess_t *, nic_device_state_t *);
 extern int nic_set_state(async_sess_t *, nic_device_state_t);