diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index d6935dfa39..4050a6f45b 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -220,7 +220,7 @@ static bool init_font(menu_handle_t *menu, const uint8_t *font_bmp_buf)
    if (!font)
       return false;
 
-   menu_display_ctl(MENU_DISPLAY_CTL_SET_FONT_FB_DATA_INIT, &fb_font_inited);
+   menu_display_ctl(MENU_DISPLAY_CTL_SET_FONT_DATA_INIT, &fb_font_inited);
 
    for (i = 0; i < 256; i++)
    {
@@ -720,14 +720,14 @@ static void rgui_free(void *data)
       free(menu->userdata);
    menu->userdata = NULL;
 
-   menu_display_ctl(MENU_DISPLAY_CTL_FONT_FB_DATA_INIT, &fb_font_inited);
+   menu_display_ctl(MENU_DISPLAY_CTL_FONT_DATA_INIT, &fb_font_inited);
 
    if (fb_font_inited)
       free((uint8_t*)disp->font.framebuf);
 
    fb_font_inited = false;
 
-   menu_display_ctl(MENU_DISPLAY_CTL_SET_FONT_FB_DATA_INIT, &fb_font_inited);
+   menu_display_ctl(MENU_DISPLAY_CTL_SET_FONT_DATA_INIT, &fb_font_inited);
 }
 
 static void rgui_set_texture(void)
diff --git a/menu/menu_display.c b/menu/menu_display.c
index 1e5037d191..31770fe1d8 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -286,7 +286,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
             frame_buf->pitch = *ptr;
          }
          return true;
-      case MENU_DISPLAY_CTL_FONT_FB_DATA_INIT:
+      case MENU_DISPLAY_CTL_FONT_DATA_INIT:
          {
             bool *ptr = (bool*)data;
             if (!ptr)
@@ -294,7 +294,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
             *ptr = disp->font.alloc_framebuf;
          }
          return true;
-      case MENU_DISPLAY_CTL_SET_FONT_FB_DATA_INIT:
+      case MENU_DISPLAY_CTL_SET_FONT_DATA_INIT:
          {
             bool *ptr = (bool*)data;
             if (!ptr)
diff --git a/menu/menu_display.h b/menu/menu_display.h
index 339c059716..11dcb39ea1 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -47,8 +47,8 @@ enum menu_display_ctl_state
    MENU_DISPLAY_CTL_FB_PITCH,
    MENU_DISPLAY_CTL_SET_FB_PITCH,
    MENU_DISPLAY_CTL_LIBRETRO,
-   MENU_DISPLAY_CTL_FONT_FB_DATA_INIT,
-   MENU_DISPLAY_CTL_SET_FONT_FB_DATA_INIT
+   MENU_DISPLAY_CTL_FONT_DATA_INIT,
+   MENU_DISPLAY_CTL_SET_FONT_DATA_INIT
 };
 
 typedef struct menu_display