Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 7edfde96ace874a9c2308493e0c4724ca43463ab)
+++ uspace/lib/drv/generic/driver.c	(revision b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -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 b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -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 b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -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 b688fd884822ca3ea5bb45f1b6b2ca18b04efbcc)
@@ -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)
 {