diff --git a/configuration.c b/configuration.c
index ea41f22593a1..d983eb1329a2 100644
--- a/configuration.c
+++ b/configuration.c
@@ -4583,7 +4583,7 @@ bool config_load_remap(const char *directory_input_remapping,
    settings_t *settings                   = config_st;
    bool notification_show_remap_load      = settings->bools.notification_show_remap_load;
    unsigned joypad_port                   = settings->uints.input_joypad_index[0];
-   const char *input_device_name          = input_config_get_device_name(joypad_port);
+   const char *input_device_name          = input_config_get_device_display_name(joypad_port);
    const char *input_device_dir           = NULL;
    char *remap_path                       = NULL;
    bool sort_remaps_by_controller         = settings->bools.input_remap_sort_by_controller_enable;
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index e644d2a2cbd5..13c5c07a87c8 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -3653,7 +3653,7 @@ static int generic_action_ok_remap_file_operation(const char *path,
    settings_t *settings                   = config_get_ptr();
    const char *directory_input_remapping  = settings->paths.directory_input_remapping;
    unsigned joypad_port                   = settings->uints.input_joypad_index[0];
-   const char *input_device_name          = input_config_get_device_name(joypad_port);
+   const char *input_device_name          = input_config_get_device_display_name(joypad_port);
    const char *input_device_dir           = NULL;
    char *remap_path                       = NULL;
    bool sort_remaps_by_controller         = settings->bools.input_remap_sort_by_controller_enable;