diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 22295bea56..c5f886d60c 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -703,7 +703,7 @@ static int mui_get_core_title(char *s, size_t len)
    }
 
    if (string_is_empty(core_name))
-      core_name    = menu_hash_to_str(MENU_VALUE_NO_CORE);
+      core_name    = menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_CORE);
    if (!core_version)
       core_version = "";
 
@@ -1267,19 +1267,19 @@ static void mui_preswitch_tabs(mui_handle_t *mui, unsigned action)
    {
       case MUI_SYSTEM_TAB_MAIN:
          menu_stack->list[stack_size - 1].label = 
-            strdup(menu_hash_to_str(MENU_VALUE_MAIN_MENU));
+            strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU));
          menu_stack->list[stack_size - 1].type = 
             MENU_SETTINGS;
          break;
       case MUI_SYSTEM_TAB_PLAYLISTS:
          menu_stack->list[stack_size - 1].label = 
-            strdup(menu_hash_to_str(MENU_VALUE_PLAYLISTS_TAB));
+            strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB));
          menu_stack->list[stack_size - 1].type = 
             MENU_PLAYLISTS_TAB;
          break;
       case MUI_SYSTEM_TAB_SETTINGS:
          menu_stack->list[stack_size - 1].label = 
-            strdup(menu_hash_to_str(MENU_VALUE_SETTINGS_TAB));
+            strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_SETTINGS_TAB));
          menu_stack->list[stack_size - 1].type = 
             MENU_SETTINGS;
          break;
@@ -1348,8 +1348,8 @@ static int mui_list_push(void *data, void *userdata,
       case DISPLAYLIST_LOAD_CONTENT_LIST:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
          menu_entries_add_enum(info->list,
-               menu_hash_to_str(MENU_LABEL_VALUE_LOAD_CONTENT),
-               menu_hash_to_str(MENU_LABEL_LOAD_CONTENT),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT),
+               menu_hash_to_str_enum(MENU_ENUM_LABEL_LOAD_CONTENT),
                MENU_ENUM_LABEL_LOAD_CONTENT,
                MENU_SETTING_ACTION, 0, 0);
 
@@ -1357,14 +1357,14 @@ static int mui_list_push(void *data, void *userdata,
          if (core_info_list_num_info_files(list))
          {
             menu_entries_add_enum(info->list,
-                  menu_hash_to_str(MENU_LABEL_VALUE_DETECT_CORE_LIST),
-                  menu_hash_to_str(MENU_LABEL_DETECT_CORE_LIST),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_DETECT_CORE_LIST),
                   MENU_ENUM_LABEL_DETECT_CORE_LIST,
                   MENU_SETTING_ACTION, 0, 0);
 
             menu_entries_add_enum(info->list,
-                  menu_hash_to_str(MENU_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
-                  menu_hash_to_str(MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
                   MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST,
                   MENU_SETTING_ACTION, 0, 0);
          }
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 421ab65fd5..d02c7392d1 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -545,7 +545,7 @@ static void rgui_render(void *data)
       blit_line(
             RGUI_TERM_START_X(fb_width),
             RGUI_TERM_START_X(fb_width),
-            menu_hash_to_str(MENU_VALUE_BACK),
+            menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_BACK),
             TITLE_COLOR(settings));
 
    strlcpy(title_buf, string_to_upper(title_buf), sizeof(title_buf));
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 73f255f4b0..0d5ae998e2 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -1129,7 +1129,7 @@ static bool zarch_menu_init_list(void *data)
    file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
 
    strlcpy(info.label,
-         menu_hash_to_str(MENU_VALUE_HISTORY_TAB), sizeof(info.label));
+         menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HISTORY_TAB), sizeof(info.label));
 
    menu_entries_add(menu_stack,
          info.path, info.label, info.type, info.flags, 0);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 45c397e86d..2013f14da0 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -270,7 +270,7 @@ static void menu_displaylist_push_perfcounter(
    if (!counters || num == 0)
    {
       menu_entries_add(info->list,
-            menu_hash_to_str(MENU_LABEL_VALUE_NO_PERFORMANCE_COUNTERS),
+            menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS),
             "", 0, 0, 0);
       return;
    }
@@ -293,15 +293,15 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
    if (!core_info || !core_info->config_data)
    {
       menu_entries_add(info->list,
-            menu_hash_to_str(
-               MENU_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE),
+            menu_hash_to_str_enum(
+               MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE),
             "", 0, 0, 0);
       return 0;
    }
 
    strlcpy(tmp,
-         menu_hash_to_str(
-            MENU_LABEL_VALUE_CORE_INFO_CORE_NAME), sizeof(tmp));
+         menu_hash_to_str_enum(
+            MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME), sizeof(tmp));
    strlcat(tmp, ": ", sizeof(tmp));
    if (core_info->core_name)
       strlcat(tmp, core_info->core_name, sizeof(tmp));
@@ -310,7 +310,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
    strlcpy(tmp,
-         menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_CORE_LABEL), sizeof(tmp));
+         menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL), sizeof(tmp));
    strlcat(tmp, ": ", sizeof(tmp));
    if (core_info->display_name)
       strlcat(tmp, core_info->display_name, sizeof(tmp));
@@ -320,8 +320,8 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
    if (core_info->systemname)
    {
       strlcpy(tmp,
-            menu_hash_to_str(
-               MENU_LABEL_VALUE_CORE_INFO_SYSTEM_NAME),
+            menu_hash_to_str_enum(
+               MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME),
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       strlcat(tmp, core_info->systemname, sizeof(tmp));
@@ -332,7 +332,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
    if (core_info->system_manufacturer)
    {
       strlcpy(tmp,
-            menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER),
+            menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER),
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       strlcat(tmp, core_info->system_manufacturer, sizeof(tmp));
@@ -342,7 +342,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->categories_list)
    {
-      strlcpy(tmp, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_CATEGORIES),
+      strlcpy(tmp, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES),
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
@@ -353,7 +353,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->authors_list)
    {
-      strlcpy(tmp, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_AUTHORS),
+      strlcpy(tmp, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS),
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
@@ -364,7 +364,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->permissions_list)
    {
-      strlcpy(tmp, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_PERMISSIONS),
+      strlcpy(tmp, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS),
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
@@ -375,7 +375,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->licenses_list)
    {
-      strlcpy(tmp, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_LICENSES),
+      strlcpy(tmp, menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES),
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
@@ -387,7 +387,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
    if (core_info->supported_extensions_list)
    {
       strlcpy(tmp,
-            menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS),
+            menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS),
             sizeof(tmp));
       strlcat(tmp, ": ", sizeof(tmp));
       string_list_join_concat(tmp, sizeof(tmp),
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index 31b7ac6700..6cf1598c84 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -559,7 +559,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
                case ID_M_LOAD_CORE:
                   extensions  = "Libretro core (.dll)\0*.dll\0\All Files\0*.*\0";
 #ifdef HAVE_MENU
-                  title       = menu_hash_to_str(MENU_LABEL_VALUE_CORE_LIST);
+                  title       = menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_CORE_LIST);
 #else
                   title       = "Load Core";
 #endif
@@ -568,8 +568,8 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
                case ID_M_LOAD_CONTENT:
                   extensions  = "All Files\0*.*\0\0";
 #ifdef HAVE_MENU
-                  title       = menu_hash_to_str(
-                        MENU_LABEL_VALUE_LOAD_CONTENT_LIST);
+                  title       = menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST);
 #else
                   title       = "Load Content";
 #endif