diff --git a/configuration.h b/configuration.h
index 916c4fa648..f3b8e90b14 100644
--- a/configuration.h
+++ b/configuration.h
@@ -379,7 +379,7 @@ typedef struct settings
       unsigned input_libretro_device[MAX_USERS];
       unsigned input_analog_dpad_mode[MAX_USERS];
 
-      unsigned input_keymapper_multi_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
+      unsigned input_keymapper_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
 
       unsigned input_remap_ids[MAX_USERS][RARCH_CUSTOM_BIND_LIST_END];
 
diff --git a/input/input_mapper.c b/input/input_mapper.c
index 5d09aa580b..68bfe29e0b 100644
--- a/input/input_mapper.c
+++ b/input/input_mapper.c
@@ -109,22 +109,22 @@ void input_mapper_poll(input_mapper_t *handle)
       {
          if (j < RETROK_LAST)
          {
-            if (input_state(i, RETRO_DEVICE_JOYPAD, 0, j) && settings->uints.input_keymapper_multi_ids[i][j] != RETROK_UNKNOWN)
+            if (input_state(i, RETRO_DEVICE_JOYPAD, 0, j) && settings->uints.input_keymapper_ids[i][j] != RETROK_UNKNOWN)
             {
                MAPPER_SET_KEY (handle,
-                  settings->uints.input_keymapper_multi_ids[i][j]);
+                  settings->uints.input_keymapper_ids[i][j]);
                input_keyboard_event(true,
-                     settings->uints.input_keymapper_multi_ids[i][j],
+                     settings->uints.input_keymapper_ids[i][j],
                      0, 0, RETRO_DEVICE_KEYBOARD);
                key_event[j] = true;
             }
             else
             {
                if (key_event[j] == false && 
-                  settings->uints.input_keymapper_multi_ids[i][j] != RETROK_UNKNOWN)
+                  settings->uints.input_keymapper_ids[i][j] != RETROK_UNKNOWN)
                {
                   input_keyboard_event(false,
-                        settings->uints.input_keymapper_multi_ids[i][j],
+                        settings->uints.input_keymapper_ids[i][j],
                         0, 0, RETRO_DEVICE_KEYBOARD);
                }
             }
diff --git a/input/input_remapping.c b/input/input_remapping.c
index b1920ee0c0..ad41480c26 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -87,9 +87,9 @@ bool input_remapping_load_file(void *data, const char *path)
          key_remap = -1;
 
          if (config_get_int(conf, keymapper_ident[j], &key_remap))
-            settings->uints.input_keymapper_multi_ids[i][j] = key_remap;
+            settings->uints.input_keymapper_ids[i][j] = key_remap;
          else
-            settings->uints.input_keymapper_multi_ids[i][j] = RETROK_UNKNOWN;
+            settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN;
 
 
       }
@@ -262,7 +262,7 @@ void input_remapping_set_defaults(bool deinit)
          const struct  retro_keybind *keybind  = &input_config_binds[i][j];
          if (keybind)
             settings->uints.input_remap_ids[i][j] = keybind->id;
-         settings->uints.input_keymapper_multi_ids[i][j] = RETROK_UNKNOWN;
+         settings->uints.input_keymapper_ids[i][j] = RETROK_UNKNOWN;
 
       }
       for (j = 0; j < 4; j++)
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index fdad42fb50..9743ba6c4b 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -644,7 +644,7 @@ static void menu_action_setting_disp_set_label_input_desc_kbd(
 
    id = (type / (offset + 1)) - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
    remap_id =
-      settings->uints.input_keymapper_multi_ids[offset][id];
+      settings->uints.input_keymapper_ids[offset][id];
 
    RARCH_LOG("o: %d, type: %d, remap_id: %d\n", offset, type, remap_id);
 
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 4b579fe169..ab5aaad644 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -123,7 +123,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
    id = (type / (offset + 1)) - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
 
    remap_id =
-      settings->uints.input_keymapper_multi_ids[offset][id];
+      settings->uints.input_keymapper_ids[offset][id];
 
    for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
    {
@@ -136,7 +136,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
    else
       key_id = MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
 
-   settings->uints.input_keymapper_multi_ids[offset][id] = key_descriptors[key_id].key;
+   settings->uints.input_keymapper_ids[offset][id] = key_descriptors[key_id].key;
 
    return 0;
 }
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index f98f1e72a3..a5d9de6188 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -117,7 +117,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
    id = (type / (offset + 1)) - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN;
 
    remap_id =
-      settings->uints.input_keymapper_multi_ids[offset][id];
+      settings->uints.input_keymapper_ids[offset][id];
 
    for (key_id = 0; key_id < MENU_SETTINGS_INPUT_DESC_KBD_END - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN; key_id++)
    {
@@ -130,7 +130,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
    else
       key_id = 0;
 
-   settings->uints.input_keymapper_multi_ids[offset][id] = key_descriptors[key_id].key;
+   settings->uints.input_keymapper_ids[offset][id] = key_descriptors[key_id].key;
 
    return 0;
 }