Index: uspace/drv/char/ps2mouse/ps2mouse.c
===================================================================
--- uspace/drv/char/ps2mouse/ps2mouse.c	(revision e86b8f0a4a36b968e6ed12053ec2fbf42b8b5f9e)
+++ uspace/drv/char/ps2mouse/ps2mouse.c	(revision 10a5479d350a463f993dd6fe5d5e8b478a242573)
@@ -116,5 +116,5 @@
 	assert(mouse);
 	assert(dev);
-	mouse->input_sess = NULL;
+	mouse->client_sess = NULL;
 	mouse->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
 	    dev->handle, IPC_FLAG_BLOCKING);
@@ -218,8 +218,8 @@
 
 		async_exch_t *exch =
-		    async_exchange_begin(mouse->input_sess);
+		    async_exchange_begin(mouse->client_sess);
 		if (!exch) {
 			ddf_msg(LVL_ERROR,
-			    "Failed to create input exchange.");
+			    "Failed creating exchange.");
 			continue;
 		}
@@ -277,8 +277,8 @@
 
 		async_exch_t *exch =
-		    async_exchange_begin(mouse->input_sess);
+		    async_exchange_begin(mouse->client_sess);
 		if (!exch) {
 			ddf_msg(LVL_ERROR,
-			    "Failed to create input exchange.");
+			    "Failed creating exchange.");
 			continue;
 		}
@@ -386,14 +386,14 @@
 		if (sess == NULL) {
 			ddf_msg(LVL_WARN,
-			    "Failed to create start input session");
+			    "Failed creating client callback session");
 			async_answer_0(icallid, EAGAIN);
 			break;
 		}
-		if (mouse->input_sess == NULL) {
-			mouse->input_sess = sess;
-			ddf_msg(LVL_DEBUG, "Set input session");
+		if (mouse->client_sess == NULL) {
+			mouse->client_sess = sess;
+			ddf_msg(LVL_DEBUG, "Set client session");
 			async_answer_0(icallid, EOK);
 		} else {
-			ddf_msg(LVL_ERROR, "Input session already set");
+			ddf_msg(LVL_ERROR, "Client session already set");
 			async_answer_0(icallid, ELIMIT);
 		}
Index: uspace/drv/char/ps2mouse/ps2mouse.h
===================================================================
--- uspace/drv/char/ps2mouse/ps2mouse.h	(revision e86b8f0a4a36b968e6ed12053ec2fbf42b8b5f9e)
+++ uspace/drv/char/ps2mouse/ps2mouse.h	(revision 10a5479d350a463f993dd6fe5d5e8b478a242573)
@@ -43,5 +43,5 @@
 	ddf_fun_t *mouse_fun;      /**< Mouse function. */
 	async_sess_t *parent_sess; /**< Connection to device providing data. */
-	async_sess_t *input_sess;  /**< Callback connection to consumer. */
+	async_sess_t *client_sess;  /**< Callback connection to client. */
 	fid_t polling_fibril;      /**< Fibril retrieving an parsing data. */
 } ps2_mouse_t;
Index: uspace/drv/char/xtkbd/xtkbd.c
===================================================================
--- uspace/drv/char/xtkbd/xtkbd.c	(revision e86b8f0a4a36b968e6ed12053ec2fbf42b8b5f9e)
+++ uspace/drv/char/xtkbd/xtkbd.c	(revision 10a5479d350a463f993dd6fe5d5e8b478a242573)
@@ -206,5 +206,5 @@
 	assert(kbd);
 	assert(dev);
-	kbd->input_sess = NULL;
+	kbd->client_sess = NULL;
 	kbd->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
 	    dev->handle, IPC_FLAG_BLOCKING);
@@ -296,8 +296,8 @@
 		if (key != 0) {
 			async_exch_t *exch =
-			    async_exchange_begin(kbd->input_sess);
+			    async_exchange_begin(kbd->client_sess);
 			if (!exch) {
 				ddf_msg(LVL_ERROR,
-				    "Failed to create input exchange.");
+				    "Failed creating exchange.");
 				continue;
 			}
@@ -352,14 +352,14 @@
 		if (sess == NULL) {
 			ddf_msg(LVL_WARN,
-			    "Failed to create start input session");
+			    "Failed creating callback session");
 			async_answer_0(icallid, EAGAIN);
 			break;
 		}
-		if (kbd->input_sess == NULL) {
-			kbd->input_sess = sess;
-			ddf_msg(LVL_DEBUG, "Set input session");
+		if (kbd->client_sess == NULL) {
+			kbd->client_sess = sess;
+			ddf_msg(LVL_DEBUG, "Set client session");
 			async_answer_0(icallid, EOK);
 		} else {
-			ddf_msg(LVL_ERROR, "Input session already set");
+			ddf_msg(LVL_ERROR, "Client session already set");
 			async_answer_0(icallid, ELIMIT);
 		}
Index: uspace/drv/char/xtkbd/xtkbd.h
===================================================================
--- uspace/drv/char/xtkbd/xtkbd.h	(revision e86b8f0a4a36b968e6ed12053ec2fbf42b8b5f9e)
+++ uspace/drv/char/xtkbd/xtkbd.h	(revision 10a5479d350a463f993dd6fe5d5e8b478a242573)
@@ -43,5 +43,5 @@
 	ddf_fun_t *kbd_fun;        /**< Keyboard function. */
 	async_sess_t *parent_sess; /**< Connection to device providing data. */
-	async_sess_t *input_sess;  /**< Callback connection to consumer. */
+	async_sess_t *client_sess; /**< Callback connection to client. */
 	fid_t polling_fibril;      /**< Fibril retrieving an parsing data. */
 } xt_kbd_t;