diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 5ccdc64d40..61b7b85708 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -134,40 +134,40 @@ static int action_iterate_help(menu_handle_t *menu,
 
                   s2,
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP),
                   desc[0],
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN),
                   desc[1],
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM),
                   desc[2],
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK),
                   desc[3],
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO),
                   desc[4],
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_START),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_START),
                   desc[5],
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU),
                   desc[6],
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT),
                   desc[7],
 
-                  menu_hash_to_str(
-                        MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD),
+                  menu_hash_to_str_enum(
+                        MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD),
                   desc[8]
 
                   );
@@ -366,7 +366,7 @@ int generic_menu_iterate(void *data, void *userdata, enum menu_action action)
 
             info.list = menu_stack;
             strlcpy(info.label,
-                  menu_hash_to_str(MENU_LABEL_HELP),
+                  menu_hash_to_str_enum(MENU_ENUM_LABEL_HELP),
                   sizeof(info.label));
 
             menu_displaylist_ctl(DISPLAYLIST_HELP, &info);
@@ -399,7 +399,7 @@ bool generic_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_MAIN_MENU), sizeof(info.label));
+         menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU), sizeof(info.label));
 
    menu_entries_add(menu_stack, info.path,
          info.label, info.type, info.flags, 0);
diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c
index 28115baa0e..b452e5c046 100644
--- a/menu/drivers/nuklear.c
+++ b/menu/drivers/nuklear.c
@@ -388,7 +388,7 @@ static bool nk_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/drivers/xmb.c b/menu/drivers/xmb.c
index bcd1cc204f..04fbef8082 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1275,7 +1275,7 @@ static void xmb_init_horizontal_list(xmb_handle_t *xmb)
    info.type_default = MENU_FILE_PLAIN;
    info.flags        = SL_FLAG_ALLOW_EMPTY_LIST;
    strlcpy(info.label,
-         menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST),
+         menu_hash_to_str_enum(MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST),
          sizeof(info.label));
    strlcpy(info.path,
          settings->directory.playlist,
@@ -2981,31 +2981,31 @@ static void xmb_list_cache(void *data, enum menu_list_type type, unsigned action
          {
             case XMB_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 XMB_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_TAB;
                break;
             case XMB_SYSTEM_TAB_HISTORY:
                menu_stack->list[stack_size - 1].label =
-                  strdup(menu_hash_to_str(MENU_VALUE_HISTORY_TAB));
+                  strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HISTORY_TAB));
                menu_stack->list[stack_size - 1].type =
                   MENU_HISTORY_TAB;
                break;
             case XMB_SYSTEM_TAB_ADD:
                menu_stack->list[stack_size - 1].label =
-                  strdup(menu_hash_to_str(MENU_VALUE_ADD_TAB));
+                  strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_ADD_TAB));
                menu_stack->list[stack_size - 1].type =
                   MENU_ADD_TAB;
                break;
             default:
                menu_stack->list[stack_size - 1].label =
-                  strdup(menu_hash_to_str(MENU_VALUE_HORIZONTAL_MENU));
+                  strdup(menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU));
                menu_stack->list[stack_size - 1].type =
                   MENU_SETTING_HORIZONTAL_MENU;
                break;
@@ -3193,7 +3193,7 @@ static bool xmb_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_MAIN_MENU), sizeof(info.label));
+         menu_hash_to_str_enum(MENU_ENUM_LABEL_VALUE_MAIN_MENU), sizeof(info.label));
 
    menu_entries_add_enum(menu_stack, info.path,
          info.label,