diff --git a/frontend/frontend_android.c b/frontend/frontend_android.c
index 7f8a7dd930..04c8b416c3 100644
--- a/frontend/frontend_android.c
+++ b/frontend/frontend_android.c
@@ -239,8 +239,7 @@ begin_loop:
    {
       g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_PREINIT);
       while((input_key_pressed_func(RARCH_PAUSE_TOGGLE)) ?
-            android_run_events(android_app) :
-            rmenu_iterate());
+            android_run_events(android_app) : menu_iterate());
       g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
    }
    else
diff --git a/frontend/frontend_console.c b/frontend/frontend_console.c
index cbb2674930..a2e2644daf 100644
--- a/frontend/frontend_console.c
+++ b/frontend/frontend_console.c
@@ -319,7 +319,7 @@ begin_loop:
    else if(g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
    {
       g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_PREINIT);
-      while(rmenu_iterate());
+      while (menu_iterate());
       g_extern.lifecycle_mode_state &= ~(1ULL << MODE_MENU);
    }
    else
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index 004ded42db..d4527dcc49 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -1675,7 +1675,7 @@ int rmenu_input_process(void *data, void *state)
    return 0;
 }
 
-bool rmenu_iterate(void)
+bool menu_iterate(void)
 {
    static uint16_t old_input_state = 0;
    static bool initial_held = true;
diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index 6dcc9eb74e..3b5c0c5325 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -2637,7 +2637,7 @@ void menu_free(void)
       rmenu_state.free_resources(&rmenu_state);
 }
 
-bool rmenu_iterate(void)
+bool menu_iterate(void)
 {
    const char *msg;
 
diff --git a/frontend/menu/rmenu.h b/frontend/menu/rmenu.h
index 566482909e..a4513bba70 100644
--- a/frontend/menu/rmenu.h
+++ b/frontend/menu/rmenu.h
@@ -205,7 +205,7 @@ enum
 #define MAX_NO_OF_CONTROLS_SETTINGS		SETTING_CONTROLS_DEFAULT_ALL+1
 
 void menu_init (void);
-bool rmenu_iterate(void);
+bool menu_iterate(void);
 void menu_free (void);
 
 #endif /* MENU_H_ */
diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp
index e14a547397..b9d705290b 100644
--- a/frontend/menu/rmenu_xui.cpp
+++ b/frontend/menu/rmenu_xui.cpp
@@ -1291,7 +1291,7 @@ static void ingame_menu_resize (void)
       input_loop = INPUT_LOOP_MENU;
 }
 
-bool rmenu_iterate(void)
+bool menu_iterate(void)
 {
    const char *msg;
 
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index f62599c743..66bde4c0c6 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -194,7 +194,7 @@ void menu_init (void)
 {
 }
 
-bool rmenu_iterate(void)
+bool menu_iterate(void)
 {
    strlcpy(g_extern.fullpath, "/dev_hdd0/game/SSNE10000/USRDIR/mm3.nes", sizeof(g_extern.fullpath));
    g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME);
diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c
index e5c3005461..f850a3b1fe 100644
--- a/frontend/platform/platform_psp.c
+++ b/frontend/platform/platform_psp.c
@@ -94,7 +94,7 @@ static int setup_callback(void)
 
 void menu_init (void) {}
 
-bool rmenu_iterate(void)
+bool menu_iterate(void)
 {
    char path[256];
    snprintf(path, sizeof(path), "%s%s", default_paths.port_dir, "dkc.sfc");