diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index a16209b09c..a3c6ca202a 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -833,7 +833,7 @@ static int action_bind_sublabel_remap_kbd_sublabel(
    unsigned user_idx = (type - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN) / RARCH_FIRST_CUSTOM_BIND;
 
    snprintf(s, len, "%s #%d: %s",
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER),
+         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
          user_idx + 1,
          input_config_get_device_display_name(user_idx) ?
          input_config_get_device_display_name(user_idx) :
@@ -895,7 +895,7 @@ static int action_bind_sublabel_remap_sublabel(
       / (RARCH_FIRST_CUSTOM_BIND + 8);
 
    snprintf(s, len, "%s #%d: %s",
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER),
+         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT),
          offset + 1,
          input_config_get_device_display_name(offset) ?
          input_config_get_device_display_name(offset) :
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 2170f1ee41..20aaecb00e 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -8120,7 +8120,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                            && !settings->bools.menu_show_sublabels)
                      {
                         snprintf(desc_label, sizeof(desc_label),
-                              "%s [%s %u]", descriptor, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), p + 1);
+                              "%s [%s %u]", descriptor, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), p + 1);
                         strlcpy(descriptor, desc_label, sizeof(descriptor));
                      }
 
@@ -8163,7 +8163,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                      {
                         snprintf(desc_label, sizeof(desc_label),
                               "%s [%s %u]", descriptor,
-                              msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), p + 1);
+                              msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), p + 1);
                         strlcpy(descriptor, desc_label, sizeof(descriptor));
                      }
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 3fa6f3da7f..1501f197dd 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -6893,7 +6893,7 @@ static bool setting_append_list_input_player_options(
       ((enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + user));
 
    snprintf(buffer[user],    sizeof(buffer[user]),
-         "%s %u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1);
+         "%s %u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), user + 1);
 
    strlcpy(group_lbl[user], temp_value, sizeof(group_lbl[user]));
 
@@ -6965,25 +6965,25 @@ static bool setting_append_list_input_player_options(
                "%s %u", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON), user + 1);
 
       snprintf(label[user], sizeof(label[user]),
-               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1,
+               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), user + 1,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX));
       snprintf(label_type[user], sizeof(label_type[user]),
-               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1,
+               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), user + 1,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE));
       snprintf(label_analog[user], sizeof(label_analog[user]),
-               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1,
+               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), user + 1,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE));
       snprintf(label_bind_all[user], sizeof(label_bind_all[user]),
-               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1,
+               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), user + 1,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL));
       snprintf(label_bind_defaults[user], sizeof(label_bind_defaults[user]),
-               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1,
+               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), user + 1,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL));
       snprintf(label_bind_all_save_autoconfig[user], sizeof(label_bind_all_save_autoconfig[user]),
-               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1,
+               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), user + 1,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG));
       snprintf(label_mouse_index[user], sizeof(label_mouse_index[user]),
-               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), user + 1,
+               "%s %u %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT), user + 1,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_INDEX));
 
       CONFIG_UINT_ALT(
diff --git a/retroarch.c b/retroarch.c
index 253b67be99..beb7e6c48f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -9326,7 +9326,7 @@ static bool rarch_environment_cb(unsigned cmd, void *data)
                         if (!description)
                            continue;
 
-                        RARCH_LOG("\tRetroPad, User %u, Button \"%s\" => \"%s\"\n",
+                        RARCH_LOG("\tRetroPad, Port %u, Button \"%s\" => \"%s\"\n",
                               p + 1, libretro_btn_desc[retro_id], description);
                      }
                   }