-#define MV_BUTTON_1 (1 << 4)
-#define MV_BUTTON_2 (1 << 5)
-#define MV_MOTION (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
-#define MV_BUTTON (MV_BUTTON_1 | MV_BUTTON_2)
+#define KEY_BUTTON_1 (1 << 4)
+#define KEY_BUTTON_2 (1 << 5)
+#define KEY_MOTION (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)
+#define KEY_BUTTON (KEY_BUTTON_1 | KEY_BUTTON_2)
+#define KEY_ACTION (KEY_MOTION | KEY_BUTTON)