Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c
===================================================================
--- uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision 5203e2569a38ea677d1b3f202650bb36f9609583)
+++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c	(revision 3b2e387cb8a2bc8a24070069619e024ef8c544c5)
@@ -44,5 +44,5 @@
 #include <async_obsolete.h>
 #include <str_error.h>
-#include <ipc/mouse.h>
+#include <ipc/mouseev.h>
 #include <io/console.h>
 
@@ -270,5 +270,5 @@
 	if ((shift_x != 0) || (shift_y != 0)) {
 		async_obsolete_req_2_0(mouse_dev->mouse_phone,
-		    MEVENT_MOVE, shift_x, shift_y);
+		    MOUSEEV_MOVE_EVENT, shift_x, shift_y);
 	}
 
@@ -296,15 +296,14 @@
 		    && field->value != 0) {
 			async_obsolete_req_2_0(mouse_dev->mouse_phone,
-			    MEVENT_BUTTON, field->usage, 1);
+			    MOUSEEV_BUTTON_EVENT, field->usage, 1);
 			mouse_dev->buttons[field->usage - field->usage_minimum]
 			    = field->value;
-		} else if (
-		    mouse_dev->buttons[field->usage - field->usage_minimum] != 0
+		} else if (mouse_dev->buttons[field->usage - field->usage_minimum] != 0
 		    && field->value == 0) {
-		       async_obsolete_req_2_0(mouse_dev->mouse_phone,
-			   MEVENT_BUTTON, field->usage, 0);
-		       mouse_dev->buttons[field->usage - field->usage_minimum]
-			   = field->value;
-	       }
+			async_obsolete_req_2_0(mouse_dev->mouse_phone,
+			   MOUSEEV_BUTTON_EVENT, field->usage, 0);
+			mouse_dev->buttons[field->usage - field->usage_minimum] =
+			   field->value;
+		}
 		
 		field = usb_hid_report_get_sibling(
Index: uspace/drv/bus/usb/usbmouse/mouse.c
===================================================================
--- uspace/drv/bus/usb/usbmouse/mouse.c	(revision 5203e2569a38ea677d1b3f202650bb36f9609583)
+++ uspace/drv/bus/usb/usbmouse/mouse.c	(revision 3b2e387cb8a2bc8a24070069619e024ef8c544c5)
@@ -38,5 +38,5 @@
 #include <errno.h>
 #include <str_error.h>
-#include <ipc/mouse.h>
+#include <ipc/mouseev.h>
 #include <async.h>
 #include "mouse.h"
@@ -86,5 +86,5 @@
 			
 			async_exch_t *exch = async_exchange_begin(mouse->console_sess);
-			async_req_2_0(exch, MEVENT_MOVE, -shift_x / 10, -shift_y / 10);
+			async_req_2_0(exch, MOUSEEV_MOVE_EVENT, -shift_x / 10, -shift_y / 10);
 			async_exchange_end(exch);
 		}
@@ -93,6 +93,6 @@
 			
 			async_exch_t *exch = async_exchange_begin(mouse->console_sess);
-			async_req_2_0(exch, MEVENT_BUTTON, 1, 1);
-			async_req_2_0(exch, MEVENT_BUTTON, 1, 0);
+			async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, 1, 1);
+			async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, 1, 0);
 			async_exchange_end(exch);
 		}