diff --git a/menu/drivers/shared.h b/menu/drivers/shared.h
index d257f0d3e5..8c57e2d22e 100644
--- a/menu/drivers/shared.h
+++ b/menu/drivers/shared.h
@@ -130,8 +130,8 @@ static INLINE void get_title(const char *label, const char *dir,
          strlcat(title, " - META KEYS", sizeof_title);
       else if (!strcmp(elem1, "Turbo/Deadzone"))
          strlcat(title, " - TURBO / DEADZONE", sizeof_title);
-      else if (!strcmp(elem1, "Joypad Mapping"))
-         strlcat(title, " - JOYPAD MAPPING", sizeof_title);
+      else if (!strcmp(elem1, "Input Device Mapping"))
+         strlcat(title, " - INPUT DEVICE MAPPING", sizeof_title);
       else if (!strcmp(elem1, "State"))
          strlcat(title, " - STATE", sizeof_title);
       else if (!strcmp(elem1, "Miscellaneous"))
diff --git a/settings.c b/settings.c
index 691b909e62..cd79a76245 100644
--- a/settings.c
+++ b/settings.c
@@ -3615,7 +3615,7 @@ static bool setting_append_list_driver_options(
    CONFIG_STRING_OPTIONS(
          settings->input.joypad_driver,
          "input_joypad_driver",
-         "Joypad Driver",
+         "Input Device Driver",
          config_get_default_joypad(),
          config_get_joypad_driver_options(),
          group_info.name,
@@ -4830,7 +4830,7 @@ static bool setting_append_list_input_options(
    START_SUB_GROUP(
          list,
          list_info,
-         "Joypad Mapping",
+         "Input Device Mapping",
          group_info.name,
          subgroup_info);
 
@@ -6157,7 +6157,7 @@ static bool setting_append_list_path_options(
    CONFIG_DIR(
          settings->input.autoconfig_dir,
          "joypad_autoconfig_dir",
-         "Joypad Autoconfig Directory",
+         "Input Device Autoconfig Directory",
          "",
          "<default>",
          group_info.name,