diff --git a/core/linux-dist/evdev.cpp b/core/linux-dist/evdev.cpp
index ecb13a3a0..dc588d1b7 100644
--- a/core/linux-dist/evdev.cpp
+++ b/core/linux-dist/evdev.cpp
@@ -141,18 +141,18 @@
 			load_keycode(&mf, "dreamcast", "btn_z"),
 			load_keycode(&mf, "dreamcast", "btn_start"),
 			load_keycode(&mf, "emulator",  "btn_escape"),
-			load_keycode(&mf, "dreamcast", "dpad_left"),
-			load_keycode(&mf, "dreamcast", "dpad_right"),
-			load_keycode(&mf, "dreamcast", "dpad_up"),
-			load_keycode(&mf, "dreamcast", "dpad_down"),
-			load_keycode(&mf, "dreamcast", "dpad2_left"),
-			load_keycode(&mf, "dreamcast", "dpad2_right"),
-			load_keycode(&mf, "dreamcast", "dpad2_up"),
-			load_keycode(&mf, "dreamcast", "dpad2_down"),
+			load_keycode(&mf, "dreamcast", "btn_dpad1_left"),
+			load_keycode(&mf, "dreamcast", "btn_dpad1_right"),
+			load_keycode(&mf, "dreamcast", "btn_dpad1_up"),
+			load_keycode(&mf, "dreamcast", "btn_dpad1_down"),
+			load_keycode(&mf, "dreamcast", "btn_dpad2_left"),
+			load_keycode(&mf, "dreamcast", "btn_dpad2_right"),
+			load_keycode(&mf, "dreamcast", "btn_dpad2_up"),
+			load_keycode(&mf, "dreamcast", "btn_dpad2_down"),
 			load_keycode(&mf, "compat",    "btn_trigger_left"),
 			load_keycode(&mf, "compat",    "btn_trigger_right"),
-			load_keycode(&mf, "compat",    "axis_dpad_x"),
-			load_keycode(&mf, "compat",    "axis_dpad_y"),
+			load_keycode(&mf, "compat",    "axis_dpad1_x"),
+			load_keycode(&mf, "compat",    "axis_dpad1_y"),
 			load_keycode(&mf, "compat",    "axis_dpad2_x"),
 			load_keycode(&mf, "compat",    "axis_dpad2_y"),
 			load_keycode(&mf, "dreamcast", "axis_x"),
diff --git a/shell/linux/mappings/controller_gcwz.cfg b/shell/linux/mappings/controller_gcwz.cfg
index 0111e30e3..8ab28b00f 100644
--- a/shell/linux/mappings/controller_gcwz.cfg
+++ b/shell/linux/mappings/controller_gcwz.cfg
@@ -10,7 +10,7 @@ btn_d = 0x0E
 btn_x = 0x2A
 btn_y = 0x39
 btn_start = 0x1C
-dpad_left = 0x69
-dpad_right = 0x6A
-dpad_up = 0x67
-dpad_down = 0x6C
+btn_dpad1_left = 0x69
+btn_dpad1_right = 0x6A
+btn_dpad1_up = 0x67
+btn_dpad1_down = 0x6C
diff --git a/shell/linux/mappings/controller_generic.cfg b/shell/linux/mappings/controller_generic.cfg
index aec0f6a6b..b6470dfb3 100644
--- a/shell/linux/mappings/controller_generic.cfg
+++ b/shell/linux/mappings/controller_generic.cfg
@@ -11,10 +11,10 @@ btn_x = 0x133
 btn_y = 0x134
 btn_z = 0x135
 btn_start = 0x13b
-dpad_left = 0x220
-dpad_right = 0x221
-dpad_up = 0x222
-dpad_down = 0x223
+btn_dpad1_left = 0x220
+btn_dpad1_right = 0x221
+btn_dpad1_up = 0x222
+btn_dpad1_down = 0x223
 axis_x = 0x00
 axis_y = 0x01
 axis_trigger_left = 0x02
@@ -23,7 +23,7 @@ axis_trigger_right = 0x05
 [compat]
 btn_trigger_left = 0x136
 btn_trigger_right = 0x137
-axis_dpad_x = 0x10
-axis_dpad_y = 0x11
+axis_dpad1_x = 0x10
+axis_dpad1_y = 0x11
 axis_dpad2_x = 0x12
 axis_dpad2_y = 0x13
\ No newline at end of file
diff --git a/shell/linux/mappings/controller_pandora.cfg b/shell/linux/mappings/controller_pandora.cfg
index 77f032b69..a4df02c27 100644
--- a/shell/linux/mappings/controller_pandora.cfg
+++ b/shell/linux/mappings/controller_pandora.cfg
@@ -8,11 +8,11 @@ btn_b = 107
 btn_c = 57
 btn_x = 102
 btn_y = 104
-btn_start  = 56
-dpad_left  = 105
-dpad_right = 106
-dpad_up    = 103
-dpad_down  = 108
+btn_start = 56
+btn_dpad1_left  = 105
+btn_dpad1_right = 106
+btn_dpad1_up    = 103
+btn_dpad1_down  = 108
 
 [compat]
 btn_trigger_left = 54
diff --git a/shell/linux/mappings/controller_xboxdrv.cfg b/shell/linux/mappings/controller_xboxdrv.cfg
index 1b2dda999..5b62f6010 100644
--- a/shell/linux/mappings/controller_xboxdrv.cfg
+++ b/shell/linux/mappings/controller_xboxdrv.cfg
@@ -17,5 +17,5 @@ axis_trigger_left = 0x0a
 axis_trigger_right = 0x09
 
 [compat]
-axis_dpad_x = 0x10
-axis_dpad_y = 0x11
+axis_dpad1_x = 0x10
+axis_dpad1_y = 0x11
diff --git a/shell/linux/mappings/controller_xpad.cfg b/shell/linux/mappings/controller_xpad.cfg
index 64476be77..2f190710e 100644
--- a/shell/linux/mappings/controller_xpad.cfg
+++ b/shell/linux/mappings/controller_xpad.cfg
@@ -11,15 +11,15 @@ btn_x = 0x133
 btn_y = 0x134
 btn_z = 0x13d
 btn_start = 0x13b
-dpad_left = 0x2c0
-dpad_right = 0x2c1
-dpad_up = 0x2c2
-dpad_down = 0x2c3
+btn_dpad1_left  = 0x2c0
+btn_dpad1_right = 0x2c1
+btn_dpad1_up    = 0x2c2
+btn_dpad1_down  = 0x2c3
 axis_x = 0x00
 axis_y = 0x01
 axis_trigger_left = 0x02
 axis_trigger_right = 0x05
 
 [compat]
-axis_dpad_x = 0x10
-axis_dpad_y = 0x11
+axis_dpad1_x = 0x10
+axis_dpad1_y = 0x11
diff --git a/shell/linux/mappings/keyboard.cfg b/shell/linux/mappings/keyboard.cfg
index cf06e7c7f..251de2dd3 100644
--- a/shell/linux/mappings/keyboard.cfg
+++ b/shell/linux/mappings/keyboard.cfg
@@ -11,10 +11,10 @@ btn_x = 45
 btn_y = 21
 btn_z = 44
 btn_start = 28
-dpad_left = 105
-dpad_right = 106
-dpad_up = 103
-dpad_down = 108
+btn_dpad1_left  = 105
+btn_dpad1_right = 106
+btn_dpad1_up    = 103
+btn_dpad1_down  = 108
 
 [compat]
 btn_trigger_left = 29