diff --git a/duoqin/files/mtk-kpd.kcm b/duoqin/files/mtk-kpd.kcm
index 055c970..c8743f3 100644
--- a/duoqin/files/mtk-kpd.kcm
+++ b/duoqin/files/mtk-kpd.kcm
@@ -1,41 +1,37 @@
 type FULL
 
-key BUTTON_MODE {
+key BUTTON_Y {
+    base:                               fallback CALL
+    alt, meta:                          fallback POWER
+    ctrl:                               fallback SYSRQ
+}
+
+key BUTTON_X {
     base:                               fallback BACK
     alt, meta:                          fallback HOME
     ctrl:                               fallback APP_SWITCH
 }
 
-key BUTTON_Y {
-    base:                               fallback DPAD_UP
-    alt, meta:                          fallback VOLUME_UP
-}
-
-key BUTTON_A {
-    base:                               fallback DPAD_DOWN
-    alt, meta:                          fallback VOLUME_DOWN
-}
-
-key BUTTON_X {
-    base:                               fallback DPAD_LEFT
-    alt, meta:                          fallback BRIGHTNESS_DOWN
-}
-
-key BUTTON_A {
-    base:                               fallback DPAD_RIGHT
-    alt, meta:                          fallback BRIGHTNESS_UP
-}
-
-key BUTTON_SELECT {
+key BUTTON_Z {
     base:                               fallback ENTER
     alt, meta:                          fallback VOLUME_MUTE
     ctrl:                               fallback MUTE
 }
 
-key BUTTON_START {
-    base:                               fallback CALL
-    alt, meta:                          fallback POWER
-    ctrl:                               fallback SYSRQ
+key DPAD_UP {
+    alt, meta:                          fallback VOLUME_UP
+}
+
+key DPAD_DOWN {
+    alt, meta:                          fallback VOLUME_DOWN
+}
+
+key DPAD_LEFT {
+    alt, meta:                          fallback BRIGHTNESS_DOWN
+}
+
+key DPAD_RIGHT {
+    alt, meta:                          fallback BRIGHTNESS_UP
 }
 
 key 0 {
diff --git a/duoqin/files/mtk-kpd.kl b/duoqin/files/mtk-kpd.kl
index ce7bb61..e4ca2fb 100644
--- a/duoqin/files/mtk-kpd.kl
+++ b/duoqin/files/mtk-kpd.kl
@@ -10,28 +10,28 @@ key 10    9
 key 11    0
 
 # DPAD UP
-key 103   BUTTON_Y
+key 103   DPAD_UP
 
 # DPAD LEFT
-key 105   BUTTON_X
+key 105   DPAD_LEFT
 
 # DPAD RIGHT
-key 106   BUTTON_B
+key 106   DPAD_RIGHT
 
 # DPAD DOWN
-key 108   BUTTON_A
+key 108   DPAD_DOWN
 
 # BACK
-key 158   BUTTON_MODE
+key 158   BUTTON_X
 
 # STAR
 key 227   ALT_LEFT
 
 # CALL
-key 231   BUTTON_START
+key 231   BUTTON_Y
 
 # DPAD CENTER
-key 352   BUTTON_SELECT
+key 352   BUTTON_Z
 
 # POUND
 key 523   CTRL_RIGHT
\ No newline at end of file