diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c
index cd085d0cbe..05be2cb706 100644
--- a/android/native/jni/input_android.c
+++ b/android/native/jni/input_android.c
@@ -286,7 +286,7 @@ static void android_input_poll(void *data)
 {
    int ident;
    uint64_t *lifecycle_state = &g_extern.lifecycle_state;
-   *lifecycle_state &= ~((1ULL << RARCH_RESET) | (1ULL << RARCH_REWIND) | (1ULL << RARCH_FAST_FORWARD_KEY) | (1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_MUTE) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_RMENU_TOGGLE));
+   *lifecycle_state &= ~((1ULL << RARCH_RESET) | (1ULL << RARCH_REWIND) | (1ULL << RARCH_FAST_FORWARD_KEY) | (1ULL << RARCH_FAST_FORWARD_HOLD_KEY) | (1ULL << RARCH_MUTE) | (1ULL << RARCH_SAVE_STATE_KEY) | (1ULL << RARCH_LOAD_STATE_KEY) | (1ULL << RARCH_STATE_SLOT_PLUS) | (1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_MENU_TOGGLE));
 
    while ((ident = ALooper_pollAll((input_key_pressed_func(RARCH_PAUSE_TOGGLE)) ? -1 : 0,
                NULL, NULL, NULL)) >= 0)
@@ -363,7 +363,7 @@ static void android_input_poll(void *data)
                   }
                   else if (g_settings.input.back_behavior == BACK_BUTTON_MENU_TOGGLE)
                   {
-                     *lifecycle_state |= (1ULL << RARCH_RMENU_TOGGLE);
+                     *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
                      AInputQueue_finishEvent(android_app->inputQueue, event, handled);
                      break;
                   }
diff --git a/android/native/jni/input_autodetect.c b/android/native/jni/input_autodetect.c
index ba5585221a..16c783126d 100644
--- a/android/native/jni/input_autodetect.c
+++ b/android/native/jni/input_autodetect.c
@@ -139,7 +139,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
       }
    }
 
-   keycode_lut[AKEYCODE_MENU] |= ((RARCH_RMENU_TOGGLE + 1) << shift);
+   keycode_lut[AKEYCODE_MENU] |= ((RARCH_MENU_TOGGLE + 1) << shift);
 
    if (g_settings.input.autodetect_enable)
    {
@@ -319,7 +319,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
          keycode_lut[AKEYCODE_EQUALS] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
 
          // use this for the RGUI toggle
-         keycode_lut[AKEYCODE_MENU] |=  ((RARCH_RMENU_TOGGLE+1)      << shift);
+         keycode_lut[AKEYCODE_MENU] |=  ((RARCH_MENU_TOGGLE+1)      << shift);
 
          // Left Analog Up: 152
          // Left Analog Down: 146
@@ -492,7 +492,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
          else
          {
             //PS button will be used for RGUI toggle
-            keycode_lut[AKEYCODE_BUTTON_1] |= ((RARCH_RMENU_TOGGLE+1)     << shift);
+            keycode_lut[AKEYCODE_BUTTON_1] |= ((RARCH_MENU_TOGGLE+1)     << shift);
             keycode_lut[AKEYCODE_BUTTON_X] |=  ((RETRO_DEVICE_ID_JOYPAD_B+1)      << shift);
             keycode_lut[AKEYCODE_BUTTON_A] |=  ((RETRO_DEVICE_ID_JOYPAD_Y+1)      << shift);
          }
diff --git a/driver.h b/driver.h
index f1276b147f..0458767b7d 100644
--- a/driver.h
+++ b/driver.h
@@ -109,8 +109,8 @@ enum // RetroArch specific bind IDs.
    RARCH_DISK_NEXT,
 
 #ifdef HAVE_RMENU
-   RARCH_RMENU_TOGGLE,
-   RARCH_RMENU_QUICKMENU_TOGGLE,
+   RARCH_MENU_TOGGLE,
+   RARCH_MENU_QUICKMENU_TOGGLE,
 #endif
 
    RARCH_BIND_LIST_END,
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index 1bc66e0d96..004ded42db 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -1465,7 +1465,7 @@ static const struct retro_keybind _rmenu_nav_binds[] = {
    { 0, 0, NULL, 0, (1ULL << RETRO_DEVICE_ID_JOYPAD_B), 0 },
    { 0, 0, NULL, 0, (1ULL << RETRO_DEVICE_ID_JOYPAD_START), 0 },
    { 0, 0, NULL, 0, (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT), 0 },
-   { 0, 0, NULL, 0, (1ULL << RARCH_RMENU_TOGGLE), 0 },
+   { 0, 0, NULL, 0, (1ULL << RARCH_MENU_TOGGLE), 0 },
    { 0, 0, NULL, 0, (1ULL << RARCH_QUIT_KEY), 0 },
 #endif
 };
@@ -1730,7 +1730,7 @@ bool rmenu_iterate(void)
       input_state |= driver.input->input_state(NULL, rmenu_nav_binds, 0,
             RETRO_DEVICE_JOYPAD, 0, i) ? (1ULL << i) : 0;
 
-   input_state |= driver.input->key_pressed(driver.input_data, RARCH_RMENU_TOGGLE) ? (1ULL << GX_DEVICE_NAV_MENU) : 0;
+   input_state |= driver.input->key_pressed(driver.input_data, RARCH_MENU_TOGGLE) ? (1ULL << GX_DEVICE_NAV_MENU) : 0;
    input_state |= driver.input->key_pressed(driver.input_data, RARCH_QUIT_KEY) ? (1ULL << GX_DEVICE_NAV_QUIT) : 0;
 
 #ifdef HAVE_OVERLAY
diff --git a/gx/gx_input.c b/gx/gx_input.c
index 8c75e0d7c1..4cbadde846 100644
--- a/gx/gx_input.c
+++ b/gx/gx_input.c
@@ -460,8 +460,8 @@ static void gx_input_poll(void *data)
          (1ULL << RARCH_STATE_SLOT_MINUS) | 
          (1ULL << RARCH_REWIND) |
          (1ULL << RARCH_QUIT_KEY) |
-         (1ULL << RARCH_RMENU_TOGGLE) |
-         (1ULL << RARCH_RMENU_QUICKMENU_TOGGLE));
+         (1ULL << RARCH_MENU_TOGGLE) |
+         (1ULL << RARCH_MENU_QUICKMENU_TOGGLE));
 
    if (
 #ifdef HW_RVL
@@ -528,7 +528,7 @@ static void gx_input_poll(void *data)
                | GX_CLASSIC_HOME
 #endif
                ))
-         *lifecycle_state |= (1ULL << RARCH_RMENU_TOGGLE);
+         *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
    }
 }
 
diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c
index 02633b1a50..43f8638f75 100644
--- a/ps3/ps3_input.c
+++ b/ps3/ps3_input.c
@@ -191,8 +191,8 @@ static void ps3_input_poll(void *data)
          (1ULL << RARCH_STATE_SLOT_MINUS) | 
          (1ULL << RARCH_REWIND) |
          (1ULL << RARCH_QUIT_KEY) |
-         (1ULL << RARCH_RMENU_TOGGLE) |
-         (1ULL << RARCH_RMENU_QUICKMENU_TOGGLE));
+         (1ULL << RARCH_MENU_TOGGLE) |
+         (1ULL << RARCH_MENU_QUICKMENU_TOGGLE));
 
    if ((*state_p1 & (1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_DOWN)) && !(*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R2)))
       *lifecycle_state |= (1ULL << RARCH_FAST_FORWARD_HOLD_KEY);
@@ -210,11 +210,11 @@ static void ps3_input_poll(void *data)
    if (!(g_extern.frame_count < g_extern.delay_timer[0]))
    {
       if ((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
-         *lifecycle_state |= (1ULL << RARCH_RMENU_TOGGLE);
+         *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
       if (!(*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
       {
-         *lifecycle_state |= (1ULL << RARCH_RMENU_TOGGLE);
-         *lifecycle_state |= (1ULL << RARCH_RMENU_QUICKMENU_TOGGLE);
+         *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
+         *lifecycle_state |= (1ULL << RARCH_MENU_QUICKMENU_TOGGLE);
       }
    }
 
diff --git a/retroarch.c b/retroarch.c
index e9fde9b042..4637c6a6d2 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2870,9 +2870,9 @@ bool rarch_main_iterate(void)
    }
 
 #ifdef HAVE_RMENU
-   if (input_key_pressed_func(RARCH_RMENU_TOGGLE) && g_extern.frame_count >= g_extern.delay_timer[0])
+   if (input_key_pressed_func(RARCH_MENU_TOGGLE) && g_extern.frame_count >= g_extern.delay_timer[0])
    {
-      if (input_key_pressed_func(RARCH_RMENU_QUICKMENU_TOGGLE))
+      if (input_key_pressed_func(RARCH_MENU_QUICKMENU_TOGGLE))
          g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME);
 
       g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
diff --git a/xdk/xdk_xinput_input.c b/xdk/xdk_xinput_input.c
index b18236abc3..9792e75a19 100644
--- a/xdk/xdk_xinput_input.c
+++ b/xdk/xdk_xinput_input.c
@@ -212,8 +212,8 @@ static void xdk_input_poll(void *data)
          (1ULL << RARCH_STATE_SLOT_MINUS) | 
          (1ULL << RARCH_REWIND) |
          (1ULL << RARCH_QUIT_KEY) |
-         (1ULL << RARCH_RMENU_TOGGLE) |
-         (1ULL << RARCH_RMENU_QUICKMENU_TOGGLE));
+         (1ULL << RARCH_MENU_TOGGLE) |
+         (1ULL << RARCH_MENU_QUICKMENU_TOGGLE));
 
    if ((*state_p1 & (1ULL << RARCH_ANALOG_RIGHT_Y_DPAD_DOWN)) && !(*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R2)))
       *lifecycle_state |= (1ULL << RARCH_FAST_FORWARD_HOLD_KEY);
@@ -231,11 +231,11 @@ static void xdk_input_poll(void *data)
    if (!(g_extern.frame_count < g_extern.delay_timer[0]))
    {
       if((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
-         *lifecycle_state |= (1ULL << RARCH_RMENU_TOGGLE);
+         *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
       if(!(*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
       {
-         *lifecycle_state |= (1ULL << RARCH_RMENU_TOGGLE);
-         *lifecycle_state |= (1ULL << RARCH_RMENU_QUICKMENU_TOGGLE);
+         *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
+         *lifecycle_state |= (1ULL << RARCH_MENU_QUICKMENU_TOGGLE);
       }
    }
 }