diff --git a/menu/intl/menu_hash_eo.c b/menu/intl/menu_hash_eo.c
index f219d39dbb..8a130da0f3 100644
--- a/menu/intl/menu_hash_eo.c
+++ b/menu/intl/menu_hash_eo.c
@@ -18,7 +18,7 @@
 
 #include "../menu_hash.h"
 
-const char *menu_hash_to_str_de_eo_msg(enum menu_hash_enums msg)
+const char *menu_hash_to_str_eo_enum(enum menu_hash_enums msg)
 {
    switch (msg)
    {
diff --git a/menu/intl/menu_hash_es.c b/menu/intl/menu_hash_es.c
index d488efcf8f..4595bf5d89 100644
--- a/menu/intl/menu_hash_es.c
+++ b/menu/intl/menu_hash_es.c
@@ -31,7 +31,7 @@
 /* DO NOT REMOVE THIS. If it causes build failure, it's because you saved the file as UTF-8. Read the above comment. */
 extern const char force_iso_8859_1[sizeof("¿áéíÍñóºú")==9+1 ? 1 : -1];
 
-const char *menu_hash_to_str_es_label_enum(enum menu_hash_enums msg)
+const char *menu_hash_to_str_es_enum(enum menu_hash_enums msg)
 {
    switch (msg)
    {
diff --git a/menu/menu_hash.c b/menu/menu_hash.c
index 39791640a9..4705631f66 100644
--- a/menu/menu_hash.c
+++ b/menu/menu_hash.c
@@ -77,7 +77,6 @@ const char *menu_hash_to_str_enum(enum menu_hash_enums msg)
    if (!settings)
       return "null";
 
-#if 0
 #ifdef HAVE_LANGEXTRA
    switch (settings->user_language)
    {
@@ -108,7 +107,6 @@ const char *menu_hash_to_str_enum(enum menu_hash_enums msg)
       default:
          break;
    }
-#endif
 #endif
 
    if (ret && !string_is_equal(ret, "null"))
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 7c011125a2..0525128cca 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -2368,7 +2368,7 @@ const char *menu_hash_to_str_de_enum(enum menu_hash_enums msg);
 int menu_hash_get_help_de(uint32_t hash, char *s, size_t len);
 
 const char *menu_hash_to_str_es(uint32_t hash);
-const char *menu_hash_to_str_es_label_enum(enum menu_hash_enums msg);
+const char *menu_hash_to_str_es_enum(enum menu_hash_enums msg);
 int menu_hash_get_help_es(uint32_t hash, char *s, size_t len);
 
 const char *menu_hash_to_str_fr(uint32_t hash);
@@ -2392,7 +2392,7 @@ const char *menu_hash_to_str_pt_enum(enum menu_hash_enums msg);
 int menu_hash_get_help_pt(uint32_t hash, char *s, size_t len);
 
 const char *menu_hash_to_str_eo(uint32_t hash);
-const char *menu_hash_to_str_de_eo_msg(enum menu_hash_enums msg);
+const char *menu_hash_to_str_eo_msg(enum menu_hash_enums msg);
 int menu_hash_get_help_eo(uint32_t hash, char *s, size_t len);
 
 const char *menu_hash_to_str_us(uint32_t hash);