diff --git a/common/hotkey_store.cpp b/common/hotkey_store.cpp
index cea9b3c089..4892892648 100644
--- a/common/hotkey_store.cpp
+++ b/common/hotkey_store.cpp
@@ -40,13 +40,13 @@ public:
 };
 
 static GESTURE_PSEUDO_ACTION* g_gesturePseudoActions[] = {
-    new GESTURE_PSEUDO_ACTION( _( "Highlight Net" ), MD_CTRL + PSEUDO_WXK_LMB ),
-    new GESTURE_PSEUDO_ACTION( _( "Clear Net Highlighting" ), MD_CTRL + PSEUDO_WXK_LMB ),
+    new GESTURE_PSEUDO_ACTION( _( "Highlight Net" ), MD_CTRL + PSEUDO_WXK_CLICK ),
+    new GESTURE_PSEUDO_ACTION( _( "Clear Net Highlighting" ), MD_CTRL + PSEUDO_WXK_CLICK ),
     new GESTURE_PSEUDO_ACTION( _( "Pan Left/Right" ), MD_CTRL + PSEUDO_WXK_WHEEL ),
     new GESTURE_PSEUDO_ACTION( _( "Pan Up/Down" ), MD_SHIFT + PSEUDO_WXK_WHEEL ),
     new GESTURE_PSEUDO_ACTION( _( "Finish Drawing" ), PSEUDO_WXK_DBLCLICK ),
-    new GESTURE_PSEUDO_ACTION( _( "Add to Selection" ), MD_SHIFT + PSEUDO_WXK_LMB ),
-    new GESTURE_PSEUDO_ACTION( _( "Remove from Selection" ), MD_CTRL + PSEUDO_WXK_LMB ),
+    new GESTURE_PSEUDO_ACTION( _( "Add to Selection" ), MD_SHIFT + PSEUDO_WXK_CLICK ),
+    new GESTURE_PSEUDO_ACTION( _( "Remove from Selection" ), MD_CTRL + PSEUDO_WXK_CLICK ),
     new GESTURE_PSEUDO_ACTION( _( "Ignore Grid Snaps" ), MD_ALT ),
     new GESTURE_PSEUDO_ACTION( _( "Ignore Other Snaps" ), MD_SHIFT ),
 };
diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index 1e457a8aa5..e1c0ff2794 100644
--- a/common/hotkeys_basic.cpp
+++ b/common/hotkeys_basic.cpp
@@ -98,11 +98,9 @@ static struct hotkey_name_descr hotkeyNameList[] =
 
     { wxT( "" ),             0                                                        },
 
-    { wxT( "Left Button" ),   PSEUDO_WXK_LMB                                          },
-    { wxT( "Middle Button" ), PSEUDO_WXK_MMB                                          },
-    { wxT( "Right Button" ),  PSEUDO_WXK_RMB                                          },
-    { wxT( "Mouse Wheel" ),   PSEUDO_WXK_WHEEL                                        },
-    { wxT( "Double-click" ),  PSEUDO_WXK_DBLCLICK                                     },
+    { wxT( "Click" ),        PSEUDO_WXK_CLICK                                         },
+    { wxT( "DblClick" ),     PSEUDO_WXK_DBLCLICK                                      },
+    { wxT( "Wheel" ),        PSEUDO_WXK_WHEEL                                         },
 
     // Do not change this line: end of list
     { wxT( "" ),             KEY_NON_FOUND                                            }
diff --git a/include/hotkeys_basic.h b/include/hotkeys_basic.h
index 84f087553f..fc4ea51406 100644
--- a/include/hotkeys_basic.h
+++ b/include/hotkeys_basic.h
@@ -47,11 +47,9 @@ class EDA_BASE_FRAME;
 /*
  * Keep these out of the ASCII range, and out of the WXK range
  */
-#define PSEUDO_WXK_LMB      400
-#define PSEUDO_WXK_MMB      401
-#define PSEUDO_WXK_RMB      402
-#define PSEUDO_WXK_WHEEL    403
-#define PSEUDO_WXK_DBLCLICK 404
+#define PSEUDO_WXK_CLICK    400
+#define PSEUDO_WXK_DBLCLICK 401
+#define PSEUDO_WXK_WHEEL    402
 
 /**
  * Function KeyCodeFromKeyName