Rename symbols of FiiO M3K Linux-based port

Mainly a straight replacement of FIIO_M3K -> FIIO_M3K_LINUX.

Change-Id: Id07c84f8150991d1b6851540c2c3f8f67e3f12c2

65 files changed, 79 insertions, 79 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 4ae04a4cf8..62291bb992 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -300,8 +300,8 @@ keymaps/keymap-xduoox3.c
 keymaps/keymap-xduoox3ii.c
 #elif CONFIG_KEYPAD == XDUOO_X20_PAD
 keymaps/keymap-xduoox20.c
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
-keymaps/keymap-fiiom3k.c
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
+keymaps/keymap-fiiom3klinux.c
 #elif CONFIG_KEYPAD == EROSQ_PAD
 keymaps/keymap-erosq.c
 #endif
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES
index 1d1fcd4783..c31f6605df 100644
--- a/apps/bitmaps/native/SOURCES
+++ b/apps/bitmaps/native/SOURCES
@@ -50,7 +50,7 @@ toolsicon.70x70x16.bmp
 hibyicon.130x130x16.bmp
 rockboxicon.130x130x16.bmp
 toolsicon.130x130x16.bmp
-#elif defined(FIIO_M3K)
+#elif defined(FIIO_M3K_LINUX)
 fiioicon.130x130x16.bmp
 rockboxicon.130x130x16.bmp
 toolsicon.130x130x16.bmp
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 7187e8135c..8716b302c4 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2528,7 +2528,7 @@ static const struct {
         { "Screendump", dbg_screendump },
 #endif
         { "Skin Engine RAM usage", dbg_skin_engine },
-#if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)) && !defined(SIMULATOR)
+#if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR)
         { "View HW info", dbg_hw_info },
 #endif
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3klinux.c
index 4fa97e9435..7cec8c67eb 100644
--- a/apps/keymaps/keymap-fiiom3k.c
+++ b/apps/keymaps/keymap-fiiom3klinux.c
@@ -19,7 +19,7 @@
  *
  ****************************************************************************/
 
-/* Button Code Definitions for FiiO M3K target */
+/* Button Code Definitions for FiiO M3K Linux target */
 
 #include "config.h"
 #include "action.h"
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index deee2815bb..dc22489b15 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -91,7 +91,7 @@
        CONFIG_KEYPAD == IHIFI_800_PAD || \
        CONFIG_KEYPAD == XDUOO_X3II_PAD || \
        CONFIG_KEYPAD == XDUOO_X20_PAD || \
-       CONFIG_KEYPAD == FIIO_M3K_PAD || \
+       CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD || \
        CONFIG_KEYPAD == EROSQ_PAD)
 
 #define BATTERY_ON  BUTTON_PLAY
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index b5e58c5914..f434784a5f 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -559,7 +559,7 @@ enum {
 #define BJACK_RIGHT         BUTTON_NEXT
 #define BJACK_LEFT          BUTTON_PREV
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define BJACK_SELECT_NAME   "PLAY"
 #define BJACK_STAY_NAME     "NEXT"
 #define BJACK_QUIT_NAME     "POWER"
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 4f4ffc8df6..70ad58a908 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -314,7 +314,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD
 #define UP        BUTTON_HOME
 #define DOWN      BUTTON_OPTION
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define QUIT      BUTTON_POWER
 #define LEFT      BUTTON_PREV
 #define RIGHT     BUTTON_NEXT
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 77f79f9057..46d9da6149 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -504,7 +504,7 @@ F3: equal to "="
 #define CALCULATOR_CALC      (BUTTON_PLAY|BUTTON_REPEAT)
 #define CALCULATOR_CLEAR     (BUTTON_POWER|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define CALCULATOR_LEFT      BUTTON_PREV
 #define CALCULATOR_RIGHT     BUTTON_NEXT
 #define CALCULATOR_UP        BUTTON_HOME
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index 59aba941ae..b52a62328f 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -391,7 +391,7 @@
 #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP
 #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define CALENDAR_QUIT       BUTTON_POWER
 #define CALENDAR_SELECT     BUTTON_PLAY
 #define CALENDAR_NEXT_WEEK  BUTTON_OPTION
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index e9b66787ee..aacc2ba412 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -539,7 +539,7 @@
 #define CB_SCROLL_LEFT   (BUTTON_PREV|BUTTON_REPEAT)
 #define CB_SCROLL_RIGHT  (BUTTON_NEXT|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define CB_SELECT  BUTTON_PLAY
 #define CB_UP      BUTTON_HOME
 #define CB_DOWN    BUTTON_OPTION
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 27b3990b8b..9b933cdcd4 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -376,7 +376,7 @@
 #define CHC_SETTINGS_OK     BUTTON_PLAY
 #define CHC_SETTINGS_CANCEL BUTTON_POWER
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define CHC_QUIT            BUTTON_POWER
 #define CHC_STARTSTOP       BUTTON_PLAY
 #define CHC_RESET           BUTTON_OPTION
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index 84e8e709c4..dde6faaccf 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1259,7 +1259,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define CHIP8_KEY6 BUTTON_NEXT
 #define CHIP8_KEY8 BUTTON_OPTION
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define CHIP8_OFF  BUTTON_POWER
 #define CHIP8_KEY2 BUTTON_HOME
 #define CHIP8_KEY4 BUTTON_PREV
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index 35c80a960b..23b32150da 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -198,7 +198,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define ACTION     BUTTON_SELECT
 #define ACTIONTEXT "Select"
 
-#elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD || CONFIG_KEYPAD == FIIO_M3K_PAD || CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD || CONFIG_KEYPAD == EROSQ_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD || CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD || CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD || CONFIG_KEYPAD == EROSQ_PAD
 #define QUIT       BUTTON_POWER
 #define ACTION     BUTTON_PLAY
 #define ACTIONTEXT "PLAY"
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index 08264e8490..eb0e0d1a59 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -292,7 +292,7 @@
 #define CLIX_BUTTON_RIGHT         BUTTON_NEXT
 #define CLIX_BUTTON_CLICK         BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define CLIX_BUTTON_QUIT          BUTTON_POWER
 #define CLIX_BUTTON_UP            BUTTON_HOME
 #define CLIX_BUTTON_DOWN          BUTTON_OPTION
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 416bf1105d..b84a2636cb 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -380,7 +380,7 @@
 #define CUBE_PAUSE         BUTTON_HOME
 #define CUBE_HIGHSPEED     BUTTON_PLAY
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #define CUBE_QUIT          BUTTON_POWER
 #define CUBE_NEXT          BUTTON_NEXT
 #define CUBE_PREV          BUTTON_PREV
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 99b4de827d..233c1cac8f 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -577,7 +577,7 @@ void I_ShutdownGraphics(void)
 #define DOOMBUTTON_ENTER   BUTTON_PLAY
 #define DOOMBUTTON_WEAPON  BUTTON_VOL_UP
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define DOOMBUTTON_UP      BUTTON_UP
 #define DOOMBUTTON_DOWN    BUTTON_DOWN
 #define DOOMBUTTON_LEFT    BUTTON_PREV
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index a4d59fff3d..4a6e64a5be 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -448,7 +448,7 @@
 #define FLIPIT_STEP_BY_STEP (BUTTON_HOME | BUTTON_PLAY)
 #define FLIPIT_TOGGLE       BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 
 #define FLIPIT_LEFT         BUTTON_PREV
 #define FLIPIT_RIGHT        BUTTON_NEXT
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index d4d013550e..55bd513fe0 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -470,7 +470,7 @@
 #define FRACTAL_PRECISION_DEC   (BUTTON_PLAY | BUTTON_PREV)
 #define FRACTAL_RESET           (BUTTON_HOME | BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define FRACTAL_QUIT            BUTTON_POWER
 #define FRACTAL_UP              BUTTON_HOME
 #define FRACTAL_DOWN            BUTTON_OPTION
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h
index db70216464..375588c7d8 100644
--- a/apps/plugins/goban/goban.h
+++ b/apps/plugins/goban/goban.h
@@ -455,7 +455,7 @@
 #define  GBN_BUTTON_CONTEXT            BUTTON_PLAY | BUTTON_REPEAT
 #define  GBN_BUTTON_NEXT_VAR           BUTTON_HOME | BUTTON_POWER
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #define  GBN_BUTTON_UP                 BUTTON_HOME
 #define  GBN_BUTTON_DOWN               BUTTON_OPTION
 #define  GBN_BUTTON_LEFT               BUTTON_PREV
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index 4559a7b3a3..221ea3380e 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -491,7 +491,7 @@
 #define IMGVIEW_MENU        BUTTON_POWER
 #define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define IMGVIEW_ZOOM_PRE    BUTTON_PLAY
 #define IMGVIEW_ZOOM_IN     (BUTTON_PLAY | BUTTON_REL)
 #define IMGVIEW_ZOOM_OUT    (BUTTON_PLAY | BUTTON_REPEAT)
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 1c39a01c87..21bba6d9d4 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -275,7 +275,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define RIGHT BUTTON_VOL_DOWN
 #define FIRE  BUTTON_VOL_UP
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 
 #define QUIT  BUTTON_POWER
 #define LEFT  BUTTON_HOME
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index b58c47dd12..928cd78c95 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -357,7 +357,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define HK_SELECT "PLAY"
 #define HK_CANCEL "POWER"
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define JEWELS_UP     BUTTON_HOME
 #define JEWELS_DOWN   BUTTON_OPTION
 #define JEWELS_LEFT   BUTTON_PREV
diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h
index 7c1b998400..b0667b13cc 100644
--- a/apps/plugins/lib/keymaps.h
+++ b/apps/plugins/lib/keymaps.h
@@ -223,7 +223,7 @@
 #define BTN_FIRE         BUTTON_PLAY
 #define BTN_PAUSE        BUTTON_POWER
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #define BTN_UP           BUTTON_VOL_UP
 #define BTN_DOWN         BUTTON_VOL_DOWN
 #define BTN_LEFT         BUTTON_PREV
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 4d2a08cf47..4b5a0a4505 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -233,7 +233,7 @@ const struct button_mapping pla_main_ctx[] =
     { PLA_DOWN_REPEAT,      BUTTON_OPTION|BUTTON_REPEAT,        BUTTON_NONE },
     { PLA_LEFT_REPEAT,      BUTTON_PREV|BUTTON_REPEAT,          BUTTON_NONE },
     { PLA_RIGHT_REPEAT,     BUTTON_NEXT|BUTTON_REPEAT,          BUTTON_NONE },
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
     { PLA_UP,               BUTTON_HOME,                        BUTTON_NONE },
     { PLA_DOWN,             BUTTON_OPTION,                      BUTTON_NONE },
     { PLA_LEFT,             BUTTON_PREV,                        BUTTON_NONE },
@@ -482,7 +482,7 @@ const struct button_mapping pla_main_ctx[] =
     {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
     {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
     {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
     {PLA_CANCEL,            BUTTON_POWER|BUTTON_REL,            BUTTON_POWER},
     {PLA_EXIT,              BUTTON_POWER|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 641991cfeb..7dde947e1c 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -301,7 +301,7 @@
 #define MIDI_VOL_DOWN     BUTTON_VOL_DOWN
 #define MIDI_PLAYPAUSE    BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define MIDI_QUIT         BUTTON_POWER
 #define MIDI_FFWD         BUTTON_NEXT
 #define MIDI_REWIND       BUTTON_PREV
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 11c0e86619..590ea56d08 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -395,7 +395,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define MINESWP_DISCOVER2  BUTTON_VOL_UP
 #   define MINESWP_INFO       (BUTTON_PLAY | BUTTON_OPTION)
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #   define MINESWP_LEFT       BUTTON_PREV
 #   define MINESWP_RIGHT      BUTTON_NEXT
 #   define MINESWP_UP         BUTTON_HOME
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 177835549c..244265b250 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2562,7 +2562,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define MP3ENC_DONE    BUTTON_POWER
 #define MP3ENC_SELECT  BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define MP3ENC_PREV    BUTTON_HOME
 #define MP3ENC_NEXT    BUTTON_OPTION
 #define MP3ENC_DONE    BUTTON_POWER
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 1bc7d4db96..44c72dd853 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -326,7 +326,7 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_RIGHT2      BUTTON_VOL_DOWN
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define MPEG_START_TIME_SELECT      BUTTON_PLAY
 #define MPEG_START_TIME_LEFT        BUTTON_PREV
 #define MPEG_START_TIME_RIGHT       BUTTON_NEXT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 619be8f1ef..81b6d37857 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -459,7 +459,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define MPEG_RW         BUTTON_PREV
 #define MPEG_FF         BUTTON_NEXT
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define MPEG_MENU       BUTTON_PLAY
 #define MPEG_STOP       BUTTON_POWER
 #define MPEG_PAUSE      BUTTON_HOME
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index 62c11b91c9..d50de7f2a0 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -498,7 +498,7 @@
 #define OSCILLOSCOPE_VOL_DOWN        BUTTON_VOL_DOWN
 #define NEED_LASTBUTTON
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #define OSCILLOSCOPE_QUIT            BUTTON_POWER
 #define OSCILLOSCOPE_DRAWMODE_PRE    BUTTON_PLAY
 #define OSCILLOSCOPE_DRAWMODE        (BUTTON_PLAY | BUTTON_REL)
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index 39583edbd4..48196146a7 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -373,7 +373,7 @@
 #define PACMAN_1UP      BUTTON_VOL_UP
 #define PACMAN_COIN     BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define PACMAN_UP       BUTTON_PREV
 #define PACMAN_DOWN     BUTTON_NEXT
 #define PACMAN_LEFT     BUTTON_HOME
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index a84b687763..e16cf2921e 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -643,7 +643,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define LVL_UP_TEXT "VOL+"
 #define LVL_DOWN_TEXT "VOL-"
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define PEGBOX_SELECT   BUTTON_PLAY
 #define PEGBOX_QUIT     BUTTON_POWER
 #define PEGBOX_RESTART  (BUTTON_POWER | BUTTON_HOME)
@@ -677,7 +677,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define LVL_UP_TEXT "VOL+"
 #define LVL_DOWN_TEXT "VOL-"
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define PEGBOX_SELECT   BUTTON_PLAY
 #define PEGBOX_QUIT     BUTTON_POWER
 #define PEGBOX_RESTART  (BUTTON_POWER | BUTTON_HOME)
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index d5952aac35..4df4db66bb 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -301,7 +301,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PONG_RIGHT_UP    BUTTON_HOME
 #define PONG_RIGHT_DOWN  BUTTON_NEXT
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define PONG_QUIT        BUTTON_POWER
 #define PONG_PAUSE       BUTTON_PLAY
 #define PONG_LEFT_UP     BUTTON_PREV
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 0a2348a28d..c94ca59179 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -330,7 +330,7 @@
 #define REVERSI_BUTTON_MENU        BUTTON_PLAY
 #define REVERSI_BUTTON_MENU_LONGPRESS
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define REVERSI_BUTTON_QUIT        BUTTON_POWER
 #define REVERSI_BUTTON_UP          BUTTON_HOME
 #define REVERSI_BUTTON_DOWN        BUTTON_OPTION
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 6a8b50a68d..7958818a8e 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -443,7 +443,7 @@
 #define ROCKBLOX_DROP          (BUTTON_PLAY|BUTTON_REL)
 #define ROCKBLOX_RESTART       (BUTTON_PLAY|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 
 #define ROCKBLOX_OFF           BUTTON_POWER
 #define ROCKBLOX_ROTATE_CCW    BUTTON_HOME
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index 75de5230f2..1f65b780a6 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -435,7 +435,7 @@ static void setoptions (void)
         options.SELECT  = BUTTON_VOL_UP;
         options.MENU    = BUTTON_POWER;
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
         options.UP      = BUTTON_PREV;
         options.DOWN    = BUTTON_NEXT;
 
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index f28fbdf622..e2b1f2a3e3 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -360,7 +360,7 @@
 #define ROCKPAINT_LEFT        BUTTON_PREV
 #define ROCKPAINT_RIGHT       BUTTON_NEXT
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define ROCKPAINT_QUIT        BUTTON_POWER
 #define ROCKPAINT_DRAW        BUTTON_PLAY
 #define ROCKPAINT_MENU        (BUTTON_HOME | BUTTON_POWER)
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 8c70f6b4a6..dec400c079 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -321,7 +321,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER)
 #define PUZZLE_PICTURE BUTTON_PLAY
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #define PUZZLE_QUIT    BUTTON_POWER
 #define PUZZLE_LEFT    BUTTON_PREV
 #define PUZZLE_RIGHT   BUTTON_NEXT
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index 0f2bcdce6c..c5c28eba6e 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -281,7 +281,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
 #define SNAKE_DOWN      BUTTON_OPTION
 #define SNAKE_PLAYPAUSE BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define SNAKE_QUIT      BUTTON_POWER
 #define SNAKE_LEFT      BUTTON_PREV
 #define SNAKE_RIGHT     BUTTON_NEXT
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index 464af413f9..fcc1790a13 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -410,7 +410,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define SNAKE2_PLAYPAUSE    BUTTON_PLAY
 #define SNAKE2_PLAYPAUSE_TEXT    "PLAY"
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #define SNAKE2_LEFT         BUTTON_PREV
 #define SNAKE2_RIGHT        BUTTON_NEXT
 #define SNAKE2_UP           BUTTON_HOME
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index e779722790..2dcea7546f 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -647,7 +647,7 @@
 #define BUTTON_SAVE BUTTON_PLAY
 #define BUTTON_SAVE_NAME "PLAY"
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define SOKOBAN_LEFT BUTTON_PREV
 #define SOKOBAN_RIGHT BUTTON_NEXT
 #define SOKOBAN_UP BUTTON_HOME
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 6c496663cf..d14c608396 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -665,7 +665,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #   define HK_CUR2STACK      "DBL PLAY"
 #   define HK_REM2STACK      "NEXT"
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #   define SOL_QUIT          BUTTON_POWER
 #   define SOL_UP            BUTTON_HOME
 #   define SOL_DOWN          BUTTON_OPTION
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 67816120a1..608f3ee512 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -336,7 +336,7 @@
 #define AST_RIGHT       BUTTON_NEXT
 #define AST_FIRE        BUTTON_PLAY
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #define AST_PAUSE       BUTTON_VOL_UP
 #define AST_QUIT        BUTTON_POWER
 #define AST_THRUST      BUTTON_HOME
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index e44c867cdc..9de5032699 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -604,7 +604,7 @@
 #define STAR_LEVEL_DOWN_NAME "PLAY + PREV"
 #define STAR_LEVEL_REPEAT_NAME "PLAY + OPTION"
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define STAR_QUIT           BUTTON_POWER
 #define STAR_LEFT           BUTTON_PREV
 #define STAR_RIGHT          BUTTON_NEXT
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index db9cfd57da..82e6fba5c6 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -285,7 +285,7 @@
 #define STOPWATCH_SCROLL_UP      BUTTON_HOME
 #define STOPWATCH_SCROLL_DOWN    BUTTON_OPTION
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define STOPWATCH_QUIT           BUTTON_POWER
 #define STOPWATCH_START_STOP     BUTTON_NEXT
 #define STOPWATCH_RESET_TIMER    BUTTON_PREV
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 36f47a377a..de3802d9bc 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -418,7 +418,7 @@
 #define SUDOKU_BUTTON_MENU       (BUTTON_POWER | BUTTON_REL)
 #define SUDOKU_BUTTON_POSSIBLE   (BUTTON_HOME | BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define SUDOKU_BUTTON_QUIT_PRE   BUTTON_POWER
 #define SUDOKU_BUTTON_QUIT       (BUTTON_POWER | BUTTON_REPEAT)
 #define SUDOKU_BUTTON_UP         BUTTON_HOME
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h
index cf3a2b777e..ba71201cda 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -533,7 +533,7 @@
 #define TV_LINE_DOWN    BUTTON_OPTION
 #define TV_BOOKMARK     (BUTTON_OPTION | BUTTON_PLAY)
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define TV_QUIT         BUTTON_POWER
 #define TV_SCROLL_UP    BUTTON_VOL_UP
 #define TV_SCROLL_DOWN  BUTTON_VOL_DOWN
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 80e1960fad..629294ce7f 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -408,7 +408,7 @@
 #define LABEL_MENU      "PLAY"
 #define LABEL_VOLUME    "VOL UP/DN"
 
-#elif (CONFIG_KEYPAD == FIIO_M3K_PAD)
+#elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD)
 #define VUMETER_QUIT    BUTTON_POWER
 #define VUMETER_HELP    BUTTON_HOME
 #define VUMETER_MENU    BUTTON_PLAY
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index e4286f35b4..d3db768535 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -371,7 +371,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define BTN_QUIT          BUTTON_POWER
 #define BTN_STOPRESET     (BUTTON_HOME | BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define BTN_DIR_UP        BUTTON_HOME
 #define BTN_DIR_DOWN      BUTTON_OPTION
 #define BTN_DIR_LEFT      BUTTON_PREV
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 55a1dc4bdb..e04ecc225d 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -324,7 +324,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define DOWN     BUTTON_OPTION
 #define PAUSE    BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 
 #define QUIT     BUTTON_POWER
 #define LEFT     BUTTON_PREV
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index 6c0fac6ddf..e62c33c157 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -274,7 +274,7 @@
 #define ZX_UP           BUTTON_HOME
 #define ZX_DOWN         BUTTON_OPTION
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 #define ZX_SELECT       BUTTON_PLAY
 #define ZX_MENU         BUTTON_POWER
 #define ZX_LEFT         BUTTON_PREV
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index f77ce538d1..6237ded8c1 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -266,7 +266,7 @@
 #define KBD_UP     BUTTON_HOME
 #define KBD_DOWN   BUTTON_OPTION
 
-#elif CONFIG_KEYPAD == FIIO_M3K_PAD
+#elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD
 
 #define KBD_SELECT BUTTON_PLAY
 #define KBD_ABORT  BUTTON_POWER
diff --git a/bootloader/SOURCES b/bootloader/SOURCES
index e775fbe246..3c9a3068ad 100644
--- a/bootloader/SOURCES
+++ b/bootloader/SOURCES
@@ -78,7 +78,7 @@ show_logo.c
 mpio_hd200_hd300.c
 #elif defined(SONY_NWZ_LINUX)
 nwz_linux.c
-#elif defined(HIBY_LINUX) || defined(FIIO_M3K)
+#elif defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)
 rocker_linux.c
 #elif defined(RK27_GENERIC) || defined(HM60X) || defined(HM801) \
       || defined(MA9) || defined(MA9C) || defined(MA8) || defined(MA8C) \
diff --git a/bootloader/rocker_linux.c b/bootloader/rocker_linux.c
index fc633d504e..c0cba2776c 100644
--- a/bootloader/rocker_linux.c
+++ b/bootloader/rocker_linux.c
@@ -72,7 +72,7 @@
 #define BUTTON_DOWN   BUTTON_HOME
 #define BUTTON_SELECT BUTTON_PLAY
 #include "bitmaps/hibyicon.h"
-#elif defined(FIIO_M3K)
+#elif defined(FIIO_M3K_LINUX)
 #define ICON_WIDTH  130
 #define ICON_HEIGHT 130
 #define ICON_NAME bm_fiioicon
@@ -95,7 +95,7 @@
 #endif
 
 #define BASE_DIR PIVOT_ROOT
-//#ifdef FIIO_M3K
+//#ifdef FIIO_M3K_LINUX
 //#define BASE_DIR "/mnt"
 //#else
 //#define BASE_DIR "/mnt/sd_0"
@@ -469,7 +469,7 @@ void run_script_menu(void)
 
 static void adb(int start)
 {
-#if defined(FIIO_M3K)
+#if defined(FIIO_M3K_LINUX)
     lcd_set_foreground(LCD_RGBPACK(255, 0, 0));
     lcd_putsf(0, 1, "ADB not supported!");
     sleep(2*HZ);
@@ -622,7 +622,7 @@ int main(int argc, char **argv)
 #endif
             mount_storage(false);
             /* boot OF */
-#if defined(FIIO_M3K)
+#if defined(FIIO_M3K_LINUX)
             execvp("/usr/project/bin/player_daemon", argv);
 #else
             execvp("/usr/bin/hiby_player", argv);
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 11929d8253..36a125783c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -115,7 +115,7 @@ target/hosted/sonynwz/nvp-nwz.c
 target/hosted/sonynwz/nwz-db.c
 #endif
 
-#if ((defined(HIBY_LINUX) || defined(FIIO_M3K)) && !defined(SIMULATOR))
+#if ((defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR))
 drivers/lcd-memframe.c
 target/hosted/alsa-controls.c
 target/hosted/pcm-alsa.c
@@ -148,7 +148,7 @@ target/hosted/usb-hiby.c
 target/hosted/button-devinput.c
 #endif
 
-#if (defined(FIIO_M3K)) && !defined(SIMULATOR)
+#if (defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR)
 target/hosted/fiio/buttonlight-fiio.c
 target/hosted/fiio/button-fiio.c
 target/hosted/fiio/debug-fiio.c
diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES
index 2b18ea2026..ebeaf49193 100644
--- a/firmware/asm/SOURCES
+++ b/firmware/asm/SOURCES
@@ -16,7 +16,7 @@ mempcpy.c
     defined(COWON_D2) || defined(MINI2440) || defined(SAMSUNG_YPR0) || \
     defined(SAMSUNG_YPR1) || defined(DX50) || defined(DX90) || (defined(MROBE_500) && !defined(LCD_USE_DMA)) || \
     defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || \
-    defined(FIIO_M3K)) && \
+    defined(FIIO_M3K_LINUX)) && \
     !defined(SIMULATOR)
 #if LCD_DEPTH >= 24
 lcd-as-memframe-24bit.c
diff --git a/firmware/drivers/audio/fiiolinux_codec.c b/firmware/drivers/audio/fiiolinux_codec.c
index b2d95c91e9..31731fd6ed 100644
--- a/firmware/drivers/audio/fiiolinux_codec.c
+++ b/firmware/drivers/audio/fiiolinux_codec.c
@@ -166,7 +166,7 @@ void audiohw_set_filter_roll_off(int value)
        1 = Slow;
        2 = Short Sharp
        3 = Short Slow */
-#if 0 //  defined(FIIO_M3K)
+#if 0 //  defined(FIIO_M3K_LINUX)
     // AK4376 supports this but the control isn't wired into ALSA!
     long int value_hw = value;
     alsa_controls_set_ints("AK4376 Digital Filter", 1, &value_hw);
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 547c359d8d..e35d407372 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -163,7 +163,7 @@
 #define IHIFI_800_PAD      68
 #define XDUOO_X3II_PAD     69
 #define XDUOO_X20_PAD      70
-#define FIIO_M3K_PAD       71
+#define FIIO_M3K_LINUX_PAD 71
 #define EROSQ_PAD          72
 
 /* CONFIG_REMOTE_KEYPAD */
@@ -603,8 +603,8 @@ Lyre prototype 1 */
 #include "config/xduoox3ii.h"
 #elif defined(XDUOO_X20)
 #include "config/xduoox20.h"
-#elif defined(FIIO_M3K)
-#include "config/fiiom3k.h"
+#elif defined(FIIO_M3K_LINUX)
+#include "config/fiiom3klinux.h"
 #elif defined(EROS_Q)
 #include "config/aigoerosq.h"
 #else
diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3klinux.h
index 6e831f2f55..51d2a222e6 100644
--- a/firmware/export/config/fiiom3k.h
+++ b/firmware/export/config/fiiom3klinux.h
@@ -1,5 +1,5 @@
 /*
- * This config file is for the FiiO M3K
+ * This config file is for the FiiO M3K (Linux version)
  */
 
 /* For Rolo and boot loader */
@@ -74,7 +74,7 @@
 #define HAVE_HEADPHONE_DETECTION
 
 /* KeyPad configuration for plugins */
-#define CONFIG_KEYPAD FIIO_M3K_PAD
+#define CONFIG_KEYPAD FIIO_M3K_LINUX_PAD
 
 /* Define this if a programmable hotkey is mapped */
 #define HAVE_HOTKEY
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h
index da5a2fb71c..f53d0eb480 100644
--- a/firmware/export/rbpaths.h
+++ b/firmware/export/rbpaths.h
@@ -43,7 +43,7 @@
 /* NOTE:  target-specific hosted HOME_DIR resides in filesystem-app.c */
 #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \
     defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \
-    defined(HIBY_LINUX) || defined(FIIO_M3K)
+    defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)
 
 #define HOME_DIR "/"
 
@@ -80,7 +80,7 @@
 
 #if defined(APPLICATION) && \
         !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \
-          defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K))
+          defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX))
 
 #define PLUGIN_DATA_DIR          ROCKBOX_DIR "/rocks.data"
 #define PLUGIN_GAMES_DATA_DIR    PLUGIN_DATA_DIR
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 68d7958870..f9a074349b 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -347,7 +347,7 @@ static inline void cpu_boost_unlock(void)
 #ifndef SIMULATOR
 bool dbg_ports(void);
 #endif
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)
 bool dbg_hw_info(void);
 #endif
 
diff --git a/firmware/font.c b/firmware/font.c
index b2ac1a3c3c..595410fed2 100644
--- a/firmware/font.c
+++ b/firmware/font.c
@@ -85,7 +85,7 @@
 /* compiled-in font */
 extern struct font sysfont;
 
-#if !defined(BOOTLOADER) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)
+#if !defined(BOOTLOADER) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)
 
 struct buflib_alloc_data {
     struct font font;    /* must be the first member! */
diff --git a/tools/builds.pm b/tools/builds.pm
index b46b32f0a0..fbe8902e9e 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -448,7 +448,7 @@ $releasenotes="/wiki/ReleaseNotes315";
         name => 'xDuoo X20',
         status => 2,
     },
-    'fiiom3k' => {
+    'fiiom3klinux' => {
         name => 'FiiO M3K',
         status => 1,
     },
diff --git a/tools/configure b/tools/configure
index 07d90b26ef..c057f90006 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1595,7 +1595,7 @@ cat <<EOF
  ==AgpTek==               252) 800               227) NW-A20 series
  240) Rocker                                     228) NWZ-A860 series
                           ==FiiO==               229) NWZ-S750 series
- ==AIGO==                 244) M3K
+ ==AIGO==                 244) M3K Linux
  245) Eros Q / K
 
 EOF
@@ -4088,12 +4088,12 @@ fi
     sysfontbl="16-Terminus"
     ;;
 
-    244|fiiom3k)
+    244|fiiom3klinux)
     application="yes"
     app_type="fiio"
     target_id=112
-    modelname="fiiom3k"
-    target="FIIO_M3K"
+    modelname="fiiom3klinux"
+    target="FIIO_M3K_LINUX"
     memory=16 # XXX Can probably go over 32?
     tool="cp "
     boottool="cp "
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index ac21a4c524..667dad318d 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -845,7 +845,7 @@ do
             #   glibc: 2.16
             #   alsa: 1.0.29
             #
-            # FiiO M3K:
+            # FiiO M3K Linux:
             #   kernel: 3.10.14
             #   glibc: 2.16
             #   alsa: 1.0.26