Index: uspace/drv/hid/usbhid/generic/hiddev.c
===================================================================
--- uspace/drv/hid/usbhid/generic/hiddev.c	(revision fcdab1e7f2666339b07146358eb663d5e441b470)
+++ uspace/drv/hid/usbhid/generic/hiddev.c	(revision a75f9cbcd575cbe8cbbe9f257a7443b453ef36fb)
@@ -220,5 +220,5 @@
 {
 	/* Continue polling until the device is about to be removed. */
-	return !hid_dev->will_deinit;
+	return !hid_dev->poll_stop;
 }
 
Index: uspace/drv/hid/usbhid/kbd/kbddev.c
===================================================================
--- uspace/drv/hid/usbhid/kbd/kbddev.c	(revision fcdab1e7f2666339b07146358eb663d5e441b470)
+++ uspace/drv/hid/usbhid/kbd/kbddev.c	(revision a75f9cbcd575cbe8cbbe9f257a7443b453ef36fb)
@@ -710,5 +710,5 @@
 
 	/* Continue polling until the device is about to be removed. */
-	return !hid_dev->will_deinit;
+	return !hid_dev->poll_stop;
 }
 
Index: uspace/drv/hid/usbhid/main.c
===================================================================
--- uspace/drv/hid/usbhid/main.c	(revision fcdab1e7f2666339b07146358eb663d5e441b470)
+++ uspace/drv/hid/usbhid/main.c	(revision a75f9cbcd575cbe8cbbe9f257a7443b453ef36fb)
@@ -144,8 +144,8 @@
 
 	/* Join polling fibril. */
-	fibril_mutex_lock(&hid_dev->guard);
+	fibril_mutex_lock(&hid_dev->poll_guard);
 	while (hid_dev->running)
-		fibril_condvar_wait(&hid_dev->poll_end, &hid_dev->guard);
-	fibril_mutex_unlock(&hid_dev->guard);
+		fibril_condvar_wait(&hid_dev->poll_cv, &hid_dev->poll_guard);
+	fibril_mutex_unlock(&hid_dev->poll_guard);
 
 	/* Clean up. */
Index: uspace/drv/hid/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/hid/usbhid/mouse/mousedev.c	(revision fcdab1e7f2666339b07146358eb663d5e441b470)
+++ uspace/drv/hid/usbhid/mouse/mousedev.c	(revision a75f9cbcd575cbe8cbbe9f257a7443b453ef36fb)
@@ -415,5 +415,5 @@
 
 	/* Continue polling until the device is about to be removed. */
-	return !hid_dev->will_deinit;
+	return !hid_dev->poll_stop;
 }
 
Index: uspace/drv/hid/usbhid/multimedia/multimedia.c
===================================================================
--- uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision fcdab1e7f2666339b07146358eb663d5e441b470)
+++ uspace/drv/hid/usbhid/multimedia/multimedia.c	(revision a75f9cbcd575cbe8cbbe9f257a7443b453ef36fb)
@@ -246,5 +246,5 @@
 	usb_hid_report_path_t *path = usb_hid_report_path();
 	if (path == NULL)
-		return !hid_dev->will_deinit; /* This might be a temporary failure. */
+		return !hid_dev->poll_stop; /* This might be a temporary failure. */
 
 	int ret =
@@ -252,5 +252,5 @@
 	if (ret != EOK) {
 		usb_hid_report_path_free(path);
-		return !hid_dev->will_deinit; /* This might be a temporary failure. */
+		return !hid_dev->poll_stop; /* This might be a temporary failure. */
 	}
 
@@ -284,5 +284,5 @@
 	usb_hid_report_path_free(path);
 
-	return !hid_dev->will_deinit;
+	return !hid_dev->poll_stop;
 }
 /**
Index: uspace/drv/hid/usbhid/usbhid.c
===================================================================
--- uspace/drv/hid/usbhid/usbhid.c	(revision fcdab1e7f2666339b07146358eb663d5e441b470)
+++ uspace/drv/hid/usbhid/usbhid.c	(revision a75f9cbcd575cbe8cbbe9f257a7443b453ef36fb)
@@ -355,7 +355,7 @@
 	hid_dev->poll_pipe_mapping = NULL;
 
-	hid_dev->will_deinit = false;
-	fibril_mutex_initialize(&hid_dev->guard);
-	fibril_condvar_initialize(&hid_dev->poll_end);
+	hid_dev->poll_stop = false;
+	fibril_mutex_initialize(&hid_dev->poll_guard);
+	fibril_condvar_initialize(&hid_dev->poll_cv);
 
 	int rc = usb_hid_check_pipes(hid_dev, dev);
@@ -506,5 +506,5 @@
 
 	/* Continue polling until the device is about to be removed. */
-	return hid_dev->running && !hid_dev->will_deinit;
+	return hid_dev->running && !hid_dev->poll_stop;
 }
 
@@ -526,7 +526,7 @@
 
 	/* Signal polling end to joining thread. */
-	fibril_mutex_lock(&hid_dev->guard);
-	fibril_condvar_signal(&hid_dev->poll_end);
-	fibril_mutex_unlock(&hid_dev->guard);
+	fibril_mutex_lock(&hid_dev->poll_guard);
+	fibril_condvar_signal(&hid_dev->poll_cv);
+	fibril_mutex_unlock(&hid_dev->poll_guard);
 }
 
@@ -544,5 +544,5 @@
 {
 	assert(hid_dev);
-	hid_dev->will_deinit = true;
+	hid_dev->poll_stop = true;
 }
 
Index: uspace/drv/hid/usbhid/usbhid.h
===================================================================
--- uspace/drv/hid/usbhid/usbhid.h	(revision fcdab1e7f2666339b07146358eb663d5e441b470)
+++ uspace/drv/hid/usbhid/usbhid.h	(revision a75f9cbcd575cbe8cbbe9f257a7443b453ef36fb)
@@ -132,7 +132,10 @@
 	volatile bool running;
 
-	volatile bool will_deinit;
-	fibril_mutex_t guard;
-	fibril_condvar_t poll_end;
+	/** True if polling should stop as soon as possible */
+	volatile bool poll_stop;
+
+	/** Synchronization primitives for joining polling end. */
+	fibril_mutex_t poll_guard;
+	fibril_condvar_t poll_cv;
 };