Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 7edfde96ace874a9c2308493e0c4724ca43463ab)
+++ uspace/lib/drv/generic/driver.c	(revision 566992e1d4649f5d2bb5e0b4c2843589efcd9fb3)
@@ -916,5 +916,5 @@
  * This allows handling connections the non-devman way.
  */
-void ddf_fun_set_conn_handler(ddf_fun_t *fun, async_client_conn_t conn)
+void ddf_fun_set_conn_handler(ddf_fun_t *fun, async_port_handler_t conn)
 {
 	assert(fun->ops == NULL);
@@ -955,5 +955,5 @@
 	 * incoming connections.
 	 */
-	async_set_client_connection(driver_connection);
+	async_set_fallback_port_handler(driver_connection, NULL);
 	int rc = devman_driver_register(driver->name);
 	if (rc != EOK) {
Index: uspace/lib/drv/generic/private/driver.h
===================================================================
--- uspace/lib/drv/generic/private/driver.h	(revision 7edfde96ace874a9c2308493e0c4724ca43463ab)
+++ uspace/lib/drv/generic/private/driver.h	(revision 566992e1d4649f5d2bb5e0b4c2843589efcd9fb3)
@@ -96,5 +96,5 @@
 	
 	/** Connection handler or @c NULL to use the DDF default handler. */
-	async_client_conn_t conn_handler;
+	async_port_handler_t conn_handler;
 	
 	/** Link in the list of functions handled by the driver */
Index: uspace/lib/drv/generic/remote_audio_pcm.c
===================================================================
--- uspace/lib/drv/generic/remote_audio_pcm.c	(revision 7edfde96ace874a9c2308493e0c4724ca43463ab)
+++ uspace/lib/drv/generic/remote_audio_pcm.c	(revision 566992e1d4649f5d2bb5e0b4c2843589efcd9fb3)
@@ -316,5 +316,5 @@
  */
 int audio_pcm_register_event_callback(audio_pcm_sess_t *sess,
-    async_client_conn_t event_callback, void *arg)
+    async_port_handler_t event_callback, void *arg)
 {
 	if (!event_callback)
Index: uspace/lib/drv/generic/remote_nic.c
===================================================================
--- uspace/lib/drv/generic/remote_nic.c	(revision 7edfde96ace874a9c2308493e0c4724ca43463ab)
+++ uspace/lib/drv/generic/remote_nic.c	(revision 566992e1d4649f5d2bb5e0b4c2843589efcd9fb3)
@@ -126,5 +126,5 @@
  *
  */
-int nic_callback_create(async_sess_t *dev_sess, async_client_conn_t cfun,
+int nic_callback_create(async_sess_t *dev_sess, async_port_handler_t cfun,
     void *carg)
 {
Index: uspace/lib/drv/include/audio_pcm_iface.h
===================================================================
--- uspace/lib/drv/include/audio_pcm_iface.h	(revision 7edfde96ace874a9c2308493e0c4724ca43463ab)
+++ uspace/lib/drv/include/audio_pcm_iface.h	(revision 566992e1d4649f5d2bb5e0b4c2843589efcd9fb3)
@@ -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 7edfde96ace874a9c2308493e0c4724ca43463ab)
+++ uspace/lib/drv/include/ddf/driver.h	(revision 566992e1d4649f5d2bb5e0b4c2843589efcd9fb3)
@@ -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 7edfde96ace874a9c2308493e0c4724ca43463ab)
+++ uspace/lib/drv/include/nic_iface.h	(revision 566992e1d4649f5d2bb5e0b4c2843589efcd9fb3)
@@ -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);