diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 655260a9fd..9820ef9369 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -464,7 +464,7 @@ unsigned menu_common_type_is(const char *label, unsigned type)
 {
    if (
          type == MENU_SETTINGS ||
-         type == MENU_SETTING_CATEGORY ||
+         type == MENU_SETTING_GROUP ||
          !strcmp(label, "Shader Options") ||
          !strcmp(label, "core_options") ||
          !strcmp(label, "core_information") ||
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 1da71ca9c4..f4b72abfef 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -75,11 +75,11 @@ typedef enum
    MENU_FILE_USE_DIRECTORY,
    MENU_FILE_CARCHIVE,
    MENU_FILE_IN_CARCHIVE,
-   MENU_SETTING_CATEGORY,
-   MENU_SETTING_SUBCATEGORY,
    MENU_SETTINGS,
    MENU_SETTING_DRIVER,
    MENU_SETTING_ACTION,
+   MENU_SETTING_GROUP,
+   MENU_SETTING_SUBGROUP,
    MENU_FILE_TYPE_T_LAST,
 } menu_file_type_t;
 
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index b635b03f56..8140acffa4 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -118,7 +118,7 @@ int setting_set_flags(rarch_setting_t *setting)
    if (setting->type == ST_PATH)
       return MENU_FILE_PATH;
    if (setting->type == ST_GROUP)
-      return MENU_SETTING_CATEGORY;
+      return MENU_SETTING_GROUP;
    return 0;
 }
 
diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c
index d16c9d7dcb..55844c2e4a 100644
--- a/frontend/menu/menu_entries_cbs.c
+++ b/frontend/menu/menu_entries_cbs.c
@@ -1866,7 +1866,7 @@ static int menu_entries_cbs_init_bind_ok_first(menu_file_list_cbs_t *cbs,
          cbs->action_ok = action_ok_custom_viewport;
          break;
       case MENU_SETTINGS:
-      case MENU_SETTING_CATEGORY:
+      case MENU_SETTING_GROUP:
          cbs->action_ok = action_ok_push_default;
          break;
       case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_CYCLE_TRAY_STATUS:
@@ -2013,7 +2013,7 @@ static void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
       cbs->action_deferred_push = deferred_push_history_list;
    else if (!strcmp(label, "Shader Options"))
       cbs->action_deferred_push = deferred_push_shader_options;
-   else if (type == MENU_SETTING_CATEGORY)
+   else if (type == MENU_SETTING_GROUP)
       cbs->action_deferred_push = deferred_push_category;
    else if (!strcmp(label, "deferred_core_list"))
       cbs->action_deferred_push = deferred_push_core_list_deferred;