diff --git a/apps/SOURCES b/apps/SOURCES
index c2d591a18b..faf7247fcc 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -270,7 +270,7 @@ keymaps/keymap-ondavx777.c
 #elif CONFIG_KEYPAD == ONDAVX767_PAD
 keymaps/keymap-ondavx767.c
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
-    || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+    || (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 keymaps/keymap-yh8xx_yh9xx.c
 #elif CONFIG_KEYPAD == MINI2440_PAD
 keymaps/keymap-mini2440.c
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 9ffdb0798f..437e777976 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -204,7 +204,7 @@
 #define BATTERY_OFF_TXT "POWER"
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
       
 #define BATTERY_ON      BUTTON_LEFT
 #define BATTERY_OFF     BUTTON_RIGHT
diff --git a/apps/plugins/beatbox/beatbox.c b/apps/plugins/beatbox/beatbox.c
index 4001e51e23..914533151e 100644
--- a/apps/plugins/beatbox/beatbox.c
+++ b/apps/plugins/beatbox/beatbox.c
@@ -100,7 +100,7 @@
 #define BTN_DOWN         BUTTON_DOWN
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define BTN_QUIT         BUTTON_PLAY
 #define BTN_RIGHT        BUTTON_RIGHT
 #define BTN_UP           BUTTON_UP
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 2c8fecddea..8f1a2cd237 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -394,7 +394,7 @@ enum {
 #define BJACK_QUIT          BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define BJACK_SELECT_NAME  "PLAY"
 #define BJACK_STAY_NAME    "FFWD"
 #define BJACK_QUIT_NAME    "LONG REW"
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c
index 29b1b8fabd..e6f29817d6 100644
--- a/apps/plugins/bounce.c
+++ b/apps/plugins/bounce.c
@@ -468,7 +468,7 @@ enum plugin_status plugin_start(const void* parameter)
 {
     int w, h;
     char *off =
-#if (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) || \
+#if (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) || \
     (CONFIG_KEYPAD == SAMSUNG_YH820_PAD)
         "[Rew] to stop";
 #else
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 05c8c9c185..0a57cf37a4 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -244,7 +244,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define QUIT    BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define QUIT   BUTTON_REW
 #define SELECT BUTTON_PLAY
 #define LEFT   BUTTON_LEFT
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index 3254229cd0..e96010ec02 100644
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -83,7 +83,7 @@ enum {
 
 /* these are better off shooting with up */
 #if (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
- || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) \
+ || (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) \
  || (CONFIG_KEYPAD == ONDIO_PAD) \
  || (CONFIG_KEYPAD == IRIVER_H10_PAD)
 #define SHOOT_WITH_UP
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index f516cef1c3..375758fd36 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -392,7 +392,7 @@ F3: equal to "="
 #define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL)
 #define CALCULATOR_OPERATORS BUTTON_REC
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 
 #define CALCULATOR_LEFT  BUTTON_LEFT
 #define CALCULATOR_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 2ce0bed707..c04f6c1b82 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -261,7 +261,7 @@
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define CALENDAR_QUIT       BUTTON_REW
 #define CALENDAR_SELECT     BUTTON_PLAY
 #define CALENDAR_NEXT_WEEK  BUTTON_DOWN
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index e38d7f417f..cb4e6ad32d 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -371,7 +371,7 @@
 #define CB_SCROLL_LEFT   (BUTTON_LEFT|BUTTON_REPEAT)
 #define CB_SCROLL_RIGHT  (BUTTON_RIGHT|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define CB_SELECT  BUTTON_PLAY
 #define CB_UP      BUTTON_UP
 #define CB_DOWN    BUTTON_DOWN
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 7c25f9eada..363eaa1889 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -277,7 +277,7 @@
 #define CHC_SETTINGS_CANCEL BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define CHC_QUIT             BUTTON_REW
 #define CHC_STARTSTOP        BUTTON_PLAY
 #define CHC_RESET            BUTTON_FFWD
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index d9c165f00d..4f556850c0 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1144,7 +1144,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define CHIP8_OFF  BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define CHIP8_OFF  BUTTON_REW
 #define CHIP8_KEY0 BUTTON_FFWD
 #define CHIP8_KEY2 BUTTON_UP
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index 7189feda04..3c47633f85 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -161,7 +161,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define QUIT BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define QUIT        BUTTON_LEFT
 #define ACTION      BUTTON_RIGHT
 #define ACTION2     BUTTON_UP
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index d0e3f0caef..9c67111544 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -182,7 +182,7 @@
 #define CLIX_BUTTON_QUIT    BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define CLIX_BUTTON_QUIT    BUTTON_REW
 #define CLIX_BUTTON_LEFT    BUTTON_LEFT
 #define CLIX_BUTTON_RIGHT   BUTTON_RIGHT
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 2b0febfe68..d95cb01120 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -280,7 +280,7 @@
 #define CUBE_QUIT          BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define CUBE_QUIT          BUTTON_REW
 #define CUBE_NEXT          BUTTON_RIGHT
 #define CUBE_PREV          BUTTON_LEFT
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 8f13f4b9cd..3e5fd1537a 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -395,7 +395,7 @@ void I_ShutdownGraphics(void)
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
 #define DOOMBUTTON_ESC     BUTTON_POWER
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
 #define DOOMBUTTON_LEFT    BUTTON_LEFT
@@ -617,7 +617,7 @@ static inline void getkey()
          hswitch=0;
       }
 #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_1G2G_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+    (CONFIG_KEYPAD == IPOD_1G2G_PAD) || (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
       /* Bring up the menu */
       event.data1=KEY_ESCAPE;
 #else
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 9871c31eb9..40c251de15 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -216,7 +216,7 @@ GREY_INFO_STRUCT
 #   define FFT_QUIT         BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #   define FFT_PREV_GRAPH   BUTTON_LEFT
 #   define FFT_NEXT_GRAPH   BUTTON_RIGHT
 #   define FFT_ORIENTATION  BUTTON_UP
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 773bc080fb..8b19fe441c 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -345,7 +345,7 @@
 #define FLIPIT_QUIT         BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 
 #define FLIPIT_LEFT         BUTTON_LEFT
 #define FLIPIT_RIGHT        BUTTON_RIGHT
@@ -941,7 +941,7 @@ enum plugin_status plugin_start(const void* parameter)
     rb->lcd_putsxy(2, 28, "[VOL+] shuffle");
     rb->lcd_putsxy(2, 38, "[PREV] solution");
     rb->lcd_putsxy(2, 48, "[NEXT] step by step");
-#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) || \
+#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) || \
       (CONFIG_KEYPAD == SAMSUNG_YH820_PAD)
     rb->lcd_putsxy(2, 8, "Long [REW] to stop");
     rb->lcd_putsxy(2, 18, "[PLAY] toggle");
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index 6dbe53ab63..7a56c11118 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -332,7 +332,7 @@
 #define FRACTAL_PRECISION_DEC   (BUTTON_REC | BUTTON_DOWN)
 #define FRACTAL_RESET           BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define FRACTAL_QUIT            (BUTTON_REW | BUTTON_REPEAT)
 #define FRACTAL_UP              BUTTON_UP
 #define FRACTAL_DOWN            BUTTON_DOWN
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index 93fdf503e6..261fd8ebcc 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -318,7 +318,7 @@
 #define  GBN_BUTTON_PLAY               BUTTON_MENU | BUTTON_REL
 #define  GBN_BUTTON_NAV_MODE           BUTTON_OFF
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define  GBN_BUTTON_UP                 BUTTON_UP
 #define  GBN_BUTTON_DOWN               BUTTON_DOWN
 #define  GBN_BUTTON_LEFT               BUTTON_LEFT
diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c
index 31cd030f5b..4dd29cee0b 100644
--- a/apps/plugins/greyscale.c
+++ b/apps/plugins/greyscale.c
@@ -100,7 +100,7 @@
 #define GREYSCALE_OFF BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define GREYSCALE_SHIFT BUTTON_FFWD
 #define GREYSCALE_UP    BUTTON_UP
 #define GREYSCALE_DOWN  BUTTON_DOWN
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index 5c16ad28d8..dcacbeb35b 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -314,7 +314,7 @@
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define IMGVIEW_ZOOM_IN     (BUTTON_PLAY|BUTTON_UP)
 #define IMGVIEW_ZOOM_OUT    (BUTTON_PLAY|BUTTON_DOWN)
 #define IMGVIEW_UP          BUTTON_UP
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index d03b4ad8ea..b58114ef47 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -209,7 +209,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define QUIT BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 
 #define QUIT  BUTTON_REW
 #define LEFT  BUTTON_LEFT
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index d8a3cc39b5..2aef75712d 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -298,7 +298,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define HK_CANCEL "POWER"
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define JEWELS_UP     BUTTON_UP
 #define JEWELS_DOWN   BUTTON_DOWN
 #define JEWELS_LEFT   BUTTON_LEFT
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index bd910ac632..2f550f817c 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -115,7 +115,7 @@ const struct button_mapping pla_main_ctx[] =
     || (CONFIG_KEYPAD == SANSA_E200_PAD) \
     || (CONFIG_KEYPAD == SANSA_FUZE_PAD) \
     || (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
-    || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) \
+    || (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD) \
     || (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) \
     || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \
     || (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) \
@@ -386,7 +386,7 @@ const struct button_mapping pla_main_ctx[] =
     {PLA_SELECT_REL,        BUTTON_VOL_UP|BUTTON_REL,           BUTTON_VOL_UP},
     {PLA_SELECT_REPEAT,     BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE},
 #elif  (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
-    || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+    || (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
     {PLA_CANCEL,            BUTTON_REW|BUTTON_REL,              BUTTON_REW},
     {PLA_EXIT,              BUTTON_REW|BUTTON_REPEAT,           BUTTON_NONE},
     {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index b8516da048..b3e6d161f3 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -194,7 +194,7 @@
 #define BTN_QUIT         BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define BTN_QUIT         (BUTTON_PLAY|BUTTON_REPEAT)
 #define BTN_RIGHT        BUTTON_RIGHT
 #define BTN_LEFT         BUTTON_LEFT
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 6250cb180b..acd33451c8 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -257,7 +257,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define MINESWP_DISCOVER BUTTON_FFWD
 #   define MINESWP_INFO     BUTTON_REC
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #   define MINESWP_LEFT     BUTTON_LEFT
 #   define MINESWP_RIGHT    BUTTON_RIGHT
 #   define MINESWP_UP       BUTTON_UP
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 7da00ad23b..7bdf59934d 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2485,7 +2485,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define MP3ENC_DONE BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define MP3ENC_PREV   BUTTON_UP
 #define MP3ENC_NEXT   BUTTON_DOWN
 #define MP3ENC_DONE   BUTTON_PLAY
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 1f49d4ec48..f15269689a 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -205,7 +205,7 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define MPEG_START_TIME_SELECT      BUTTON_PLAY
 #define MPEG_START_TIME_LEFT        BUTTON_LEFT
 #define MPEG_START_TIME_RIGHT       BUTTON_RIGHT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 712e6489a1..37a8456d55 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -318,7 +318,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define MPEG_MENU       BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define MPEG_MENU       BUTTON_REW
 #define MPEG_STOP       (BUTTON_PLAY | BUTTON_REPEAT)
 #define MPEG_PAUSE      (BUTTON_PLAY | BUTTON_REL)
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 344a40f9bf..8162a37bf8 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -349,7 +349,7 @@
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define OSCILLOSCOPE_QUIT            BUTTON_POWER
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define OSCILLOSCOPE_QUIT            BUTTON_REW
 #define OSCILLOSCOPE_DRAWMODE        BUTTON_FFWD
 #define OSCILLOSCOPE_ADVMODE         (BUTTON_PLAY|BUTTON_RIGHT)
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index b46eaed7c1..bb132f7c4c 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -232,7 +232,7 @@
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
 #define PACMAN_MENU     BUTTON_POWER
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 
 #define PACMAN_UP       BUTTON_RIGHT
 #define PACMAN_DOWN     BUTTON_LEFT
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 5820d54fcd..e267b395d2 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -414,7 +414,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 
 #define QUIT_TEXT "POWER"
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define PEGBOX_QUIT     BUTTON_REW
 #define PEGBOX_RESTART  BUTTON_FFWD
 #define PEGBOX_LVL_UP   (BUTTON_PLAY|BUTTON_UP)
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 414c191e6f..4db3ad366d 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -155,7 +155,7 @@ const struct button_mapping pf_context_buttons[] =
     {PF_QUIT,         BUTTON_OFF,                 BUTTON_NONE},
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
     {PF_QUIT,         BUTTON_REC,                 BUTTON_NONE},
-#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
     {PF_QUIT,         BUTTON_REW|BUTTON_REPEAT,   BUTTON_REW},
     {PF_MENU,         BUTTON_REW|BUTTON_REL,      BUTTON_REW},
     {PF_SELECT,       BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY},
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index c344952073..05af3753a9 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -215,7 +215,7 @@ CONFIG_KEYPAD == ONDAVX777_PAD || \
 CONFIG_KEYPAD == MROBE500_PAD
 #define PONG_QUIT BUTTON_POWER
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define PONG_QUIT        (BUTTON_PLAY|BUTTON_REPEAT)
 #define PONG_PAUSE       (BUTTON_PLAY|BUTTON_REL)
 #define PONG_LEFT_UP     BUTTON_UP
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 001dc7b14e..2bb349d198 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -231,7 +231,7 @@
 #define REVERSI_BUTTON_MENU         BUTTON_MENU
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define REVERSI_BUTTON_QUIT      BUTTON_REW
 #define REVERSI_BUTTON_UP        BUTTON_UP
 #define REVERSI_BUTTON_DOWN      BUTTON_DOWN
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index d88eabea87..780da06c6a 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -328,7 +328,7 @@
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
 #define ROCKBLOX_OFF           BUTTON_POWER
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 
 #define ROCKBLOX_OFF           BUTTON_FFWD
 #define ROCKBLOX_ROTATE_CCW    BUTTON_UP
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index f4ca70cc68..374eb8528d 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -285,7 +285,7 @@ static void setoptions (void)
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
         options.MENU    = BUTTON_POWER;
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
         options.UP      = BUTTON_UP;
         options.DOWN    = BUTTON_DOWN;
 
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 725382c165..80e4a6d561 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -199,7 +199,7 @@
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define ROCKPAINT_QUIT      BUTTON_POWER
 
-#elif ( CONFIG_KEYPAD == SAMSUNG_YH920_PAD )
+#elif ( CONFIG_KEYPAD == SAMSUNG_YH92X_PAD )
 #define ROCKPAINT_QUIT      ( BUTTON_REW | BUTTON_REPEAT )
 #define ROCKPAINT_DRAW      BUTTON_PLAY
 #define ROCKPAINT_MENU      ( BUTTON_REW | BUTTON_REL )
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 82017bc7b9..9af0aa4c3e 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -220,7 +220,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PUZZLE_QUIT_TEXT "[POWER]"
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define PUZZLE_QUIT    BUTTON_REW
 #define PUZZLE_LEFT    BUTTON_LEFT
 #define PUZZLE_RIGHT   BUTTON_RIGHT
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index 4f02e99e8b..38020b07a8 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -191,7 +191,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
 #define SNAKE_PLAYPAUSE BUTTON_MENU
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define SNAKE_QUIT      BUTTON_REW
 #define SNAKE_LEFT      BUTTON_LEFT
 #define SNAKE_RIGHT     BUTTON_RIGHT
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index 4f026021f2..9cf3954fc2 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -323,7 +323,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SNAKE2_QUIT BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define SNAKE2_LEFT        BUTTON_LEFT
 #define SNAKE2_RIGHT       BUTTON_RIGHT
 #define SNAKE2_UP          BUTTON_UP
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index f085e1bff2..5662bceebe 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -490,7 +490,7 @@
 #define BUTTON_SAVE          BUTTON_PLAY
 #define BUTTON_SAVE_NAME "PLAY"
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define SOKOBAN_LEFT         BUTTON_LEFT
 #define SOKOBAN_RIGHT        BUTTON_RIGHT
 #define SOKOBAN_UP           BUTTON_UP
@@ -1622,7 +1622,7 @@ static int sokoban_menu(void)
                 rb->lcd_putsxy(3, 36, "[VOL-] Previous Level");
                 rb->lcd_putsxy(3, 46, "[NEXT+PREV] Restart Level");
                 rb->lcd_putsxy(3, 56, "[VOL+] Next Level");
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
                 rb->lcd_putsxy(3,  6, "[PLAY] Menu");
                 rb->lcd_putsxy(3, 16, "[REW]  Undo");
                 rb->lcd_putsxy(3, 26, "[FFWD] Redo");
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index c06e767a37..b5e982d208 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -469,7 +469,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define HK_CUR2STACK      "REC+UP"
 #   define HK_REM2STACK      "REC+RIGHT"
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #   define SOL_QUIT          BUTTON_REW
 #   define SOL_UP            BUTTON_UP
 #   define SOL_DOWN          BUTTON_DOWN
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 001cb1918d..b62b4d894c 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -230,7 +230,7 @@
 #define AST_QUIT BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 
 #define AST_PAUSE      BUTTON_FFWD
 #define AST_QUIT       BUTTON_REW
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index 955eb90bab..1fd59727fc 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -56,7 +56,7 @@
 #define SPLITEDIT_MENU_RUN BUTTON_RIGHT
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define SPLITEDIT_QUIT      (BUTTON_REC | BUTTON_REW)
 #define SPLITEDIT_PLAY      (BUTTON_REC | BUTTON_FFWD)
 #define SPLITEDIT_SAVE       BUTTON_FFWD
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 9d27432dff..c7e685e2c5 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -409,7 +409,7 @@
 #define STAR_LEVEL_DOWN_NAME    "REC+DOWN"
 #define STAR_LEVEL_REPEAT_NAME  "LONG FFWD"
 
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 
 #define STAR_QUIT           (BUTTON_REW|BUTTON_REPEAT)
 #define STAR_LEFT           BUTTON_LEFT
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 4ad6dc0c01..3bfad97d9a 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -224,7 +224,7 @@
 #define STOPWATCH_QUIT BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define STOPWATCH_QUIT        BUTTON_REW
 #define STOPWATCH_START_STOP  BUTTON_PLAY
 #define STOPWATCH_RESET_TIMER BUTTON_LEFT
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 634a874a87..349eb8bf7c 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -282,7 +282,7 @@
 #elif (CONFIG_KEYPAD == ONDAVX777_PAD)
 #define SUDOKU_BUTTON_QUIT BUTTON_POWER
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define SUDOKU_BUTTON_UP       BUTTON_UP
 #define SUDOKU_BUTTON_DOWN     BUTTON_DOWN
 #define SUDOKU_BUTTON_LEFT     BUTTON_LEFT
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c
index 75a877cf95..5452f4524f 100644
--- a/apps/plugins/text_editor.c
+++ b/apps/plugins/text_editor.c
@@ -459,7 +459,7 @@ enum plugin_status plugin_start(const void* parameter)
             case ACTION_STD_CONTEXT:
 /* These targets have unintuitive STD_MENU keymaps, so we use context keymap instead;
    We don't need the "delete line" action, since this can be done via the menu. */
-#if !(defined(SAMSUNG_YH920_PAD) || defined(SAMSUNG_YH820_PAD))
+#if !(defined(SAMSUNG_YH92X_PAD) || defined(SAMSUNG_YH820_PAD))
                 if (!line_count) break;
                 rb->strlcpy(copy_buffer, do_action(ACTION_GET, 0, cur_sel),
                             MAX_LINE_LEN);
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index f476316ef9..73f5377a2a 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -381,7 +381,7 @@
 #define TV_BOOKMARK (BUTTON_RIGHT|BUTTON_POWER)
 
 /* SAMSUNG YH-920 / YH-925 keys */
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 #define TV_QUIT         (BUTTON_REW|BUTTON_REPEAT)
 #define TV_SCROLL_UP    BUTTON_UP
 #define TV_SCROLL_DOWN  BUTTON_DOWN
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 93e89bbc19..222b57d792 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -284,7 +284,7 @@
 #define LABEL_QUIT "POWER"
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define VUMETER_QUIT       BUTTON_REW
 #define VUMETER_HELP       BUTTON_PLAY
 #define VUMETER_MENU       BUTTON_LEFT
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index c2125ac6d6..76d87d07d6 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -272,7 +272,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define BTN_QUIT BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 
 #define BTN_DIR_UP     BUTTON_UP
 #define BTN_DIR_DOWN   BUTTON_DOWN
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 4e98c62a68..cbb17434f8 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -233,7 +233,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define QUIT BUTTON_POWER
 
 #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \
-      CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+      CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 
 #define QUIT  BUTTON_REW
 #define LEFT  BUTTON_LEFT
diff --git a/apps/plugins/xworld/keymaps.h b/apps/plugins/xworld/keymaps.h
index 27a6be9bf0..651ecca250 100644
--- a/apps/plugins/xworld/keymaps.h
+++ b/apps/plugins/xworld/keymaps.h
@@ -36,7 +36,7 @@
     (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD)   || \
     (CONFIG_KEYPAD == GIGABEAT_PAD)         || \
     (CONFIG_KEYPAD == GIGABEAT_S_PAD)       || \
-    (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)    || \
+    (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)    || \
     (CONFIG_KEYPAD == SAMSUNG_YH820_PAD)    || \
     (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)      || \
     (CONFIG_KEYPAD == CREATIVE_ZEN_PAD)     || \
@@ -79,7 +79,7 @@
 #define BTN_FIRE       BUTTON_HOME
 #define BTN_PAUSE      BUTTON_SELECT
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+#elif (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define BTN_FIRE       BUTTON_FFWD
 #define BTN_PAUSE      BUTTON_REW
 
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index 0ff3f6c830..b658e78009 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -191,7 +191,7 @@
 #define ZX_MENU         BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 
 #define ZX_UP           BUTTON_UP
 #define ZX_DOWN         BUTTON_DOWN
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index 489d3e8efd..7fbad173ec 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -198,7 +198,7 @@
 #define KBD_DOWN BUTTON_DOWN
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 
 #define KBD_SELECT BUTTON_PLAY
 #define KBD_ABORT  BUTTON_REW
diff --git a/apps/radio/radio.c b/apps/radio/radio.c
index 424ed6a34c..d89c0be304 100644
--- a/apps/radio/radio.c
+++ b/apps/radio/radio.c
@@ -93,7 +93,7 @@
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || (CONFIG_KEYPAD == SANSA_C200_PAD) ||\
       (CONFIG_KEYPAD == SANSA_FUZE_PAD) || (CONFIG_KEYPAD == SANSA_CLIP_PAD) ||\
       (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD)||(CONFIG_KEYPAD == COWON_D2_PAD)||\
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)||(CONFIG_KEYPAD == MPIO_HD200_PAD)||\
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)||(CONFIG_KEYPAD == MPIO_HD200_PAD)||\
       (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD)
 #define FM_MENU
 #define FM_PRESET
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index cf90ab58c0..fed8605714 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -69,7 +69,7 @@
     || (CONFIG_KEYPAD == PBELL_VIBE500_PAD) \
     || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \
     || (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) \
-    || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+    || (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 
 /* certain key combos toggle input mode between keyboard input and Morse input */
 #define KBD_TOGGLE_INPUT
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c
index 07da6409e2..044c3fc9c0 100644
--- a/bootloader/main-pp.c
+++ b/bootloader/main-pp.c
@@ -83,7 +83,7 @@ extern void show_logo(void);
 #define BOOTLOADER_BOOT_OF      BUTTON_VOL_UP
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #define BOOTLOADER_BOOT_OF      BUTTON_LEFT
 
 #elif CONFIG_KEYPAD == SANSA_FUZE_PAD
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 1f57734231..dc5a9b5421 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -163,7 +163,7 @@
 #define SAMSUNG_YPZ5_PAD   59
 #define IHIFI_PAD          60
 #define SAMSUNG_YPR1_PAD  61
-#define SAMSUNG_YH920_PAD  62
+#define SAMSUNG_YH92X_PAD  62
 #define DX50_PAD           63
 
 /* CONFIG_REMOTE_KEYPAD */
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h
index 27f1ca76a3..0f7060c02f 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config/samsungyh920.h
@@ -90,7 +90,7 @@
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
-#define CONFIG_KEYPAD SAMSUNG_YH920_PAD
+#define CONFIG_KEYPAD SAMSUNG_YH92X_PAD
 
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h
index e6c2133034..8c102d7fd1 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config/samsungyh925.h
@@ -87,7 +87,7 @@
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
-#define CONFIG_KEYPAD SAMSUNG_YH920_PAD
+#define CONFIG_KEYPAD SAMSUNG_YH92X_PAD
 
 /* Define this to enable morse code input */
 #define HAVE_MORSE_INPUT
diff --git a/firmware/target/arm/pp/debug-pp.c b/firmware/target/arm/pp/debug-pp.c
index a77101eef4..52f6bf36b3 100644
--- a/firmware/target/arm/pp/debug-pp.c
+++ b/firmware/target/arm/pp/debug-pp.c
@@ -52,7 +52,7 @@
 #   define DEBUG_CANCEL  BUTTON_POWER
 
 #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+      (CONFIG_KEYPAD == SAMSUNG_YH92X_PAD)
 #   define DEBUG_CANCEL  BUTTON_PLAY
 
 #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES
index 6b248e9324..7f361959f4 100644
--- a/uisimulator/buttonmap/SOURCES
+++ b/uisimulator/buttonmap/SOURCES
@@ -59,7 +59,7 @@ onda-vx747.c
 onda-vx777.c
 #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
 samsung-yh820.c
-#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#elif CONFIG_KEYPAD == SAMSUNG_YH92X_PAD
 samsung-yh92x.c
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 pbell-vibe500.c