diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp
index 4c3a927e2f..2bbb9d2e5c 100644
--- a/frontend/menu/rmenu_xui.cpp
+++ b/frontend/menu/rmenu_xui.cpp
@@ -145,7 +145,7 @@ CREATE_CLASS(CRetroArchMain, L"RetroArchMain");
 CREATE_CLASS(CRetroArchFileBrowser, L"RetroArchFileBrowser");
 CREATE_CLASS(CRetroArchCoreBrowser, L"RetroArchCoreBrowser");
 CREATE_CLASS(CRetroArchShaderBrowser, L"RetroArchShaderBrowser");
-CREATE_CLASS(CRetroArchQuickMenu, L"RetroArchQuickMenu");
+CREATE_CLASS(CRetroArchVideoOptions, L"RetroArchVideoOptions");
 CREATE_CLASS(CRetroArchSettings, L"RetroArchSettings");
 CREATE_CLASS(CRetroArchControls, L"RetroArchControls");
 
@@ -163,7 +163,7 @@ HRESULT CRetroArch::RegisterXuiClasses (void)
    CRetroArchFileBrowser::Register();
    CRetroArchCoreBrowser::Register();
    CRetroArchShaderBrowser::Register();
-   CRetroArchQuickMenu::Register();
+   CRetroArchVideoOptions::Register();
    CRetroArchControls::Register();
    CRetroArchSettings::Register();
 
@@ -177,7 +177,7 @@ HRESULT CRetroArch::UnregisterXuiClasses (void)
    XuiUnregisterClass(L"RetroArchCoreBrowser");
    XuiUnregisterClass(L"RetroArchShaderBrowser");
    XuiUnregisterClass(L"RetroArchFileBrowser");
-   XuiUnregisterClass(L"RetroArchQuickMenu");
+   XuiUnregisterClass(L"RetroArchVideoOptions");
    XuiUnregisterClass(L"RetroArchControls");
    XuiUnregisterClass(L"RetroArchSettings");
 
@@ -712,7 +712,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled
    return 0;
 }
 
-HRESULT CRetroArchQuickMenu::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
+HRESULT CRetroArchVideoOptions::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
 {
    GetChildById(L"XuiMenuList", &m_menulist);
    GetChildById(L"XuiBackButton", &m_back);
@@ -746,7 +746,7 @@ HRESULT CRetroArchQuickMenu::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
    return 0;
 }
 
-HRESULT CRetroArchQuickMenu::OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled)
+HRESULT CRetroArchVideoOptions::OnControlNavigate(XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled)
 {
    bool aspectratio_changed = false;
    int current_index;
@@ -837,7 +837,7 @@ HRESULT CRetroArchQuickMenu::OnControlNavigate(XUIMessageControlNavigate *pContr
    return 0;
 }
 
-HRESULT CRetroArchQuickMenu::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
+HRESULT CRetroArchVideoOptions::OnNotifyPress( HXUIOBJ hObjPressed,  int & bHandled )
 {
    process_input_ret = 0;
 
diff --git a/media/360/generate_xuis.bat b/media/360/generate_xuis.bat
index ea940a6241..ff2e3b8009 100644
--- a/media/360/generate_xuis.bat
+++ b/media/360/generate_xuis.bat
@@ -1,7 +1,7 @@
 @echo off
 cd sd
 
-@echo "Creating sd/rarch_quickmenu.xui ..."
+@echo "Creating sd/rarch_video_options.xui ..."
 call :subroutine_a
 @echo "Creating sd/rarch_settings.xui ..."
 call :subroutine_b
@@ -17,7 +17,7 @@ call :subroutine_f
 cd ../
 cd hd
 
-@echo "Creating hd/rarch_quickmenu.xui ..."
+@echo "Creating hd/rarch_video_options.xui ..."
 call :subroutine_a
 @echo "Creating hd/rarch_settings.xui ..."
 call :subroutine_b
@@ -32,8 +32,8 @@ call :subroutine_f
 goto :eof
 
 :subroutine_a
-del rarch_quickmenu.xui 2>NUL
-call rarch_quickmenu.bat
+del rarch_video_options.xui 2>NUL
+call rarch_video_options.bat
 goto :eof
 
 :subroutine_b
diff --git a/media/360/hd/rarch_quickmenu.bat b/media/360/hd/rarch_video_options.bat
similarity index 72%
rename from media/360/hd/rarch_quickmenu.bat
rename to media/360/hd/rarch_video_options.bat
index f525d0537a..b75c7af938 100644
--- a/media/360/hd/rarch_quickmenu.bat
+++ b/media/360/hd/rarch_video_options.bat
@@ -5,9 +5,9 @@ for /f "tokens=* delims=" %%f in ('type rarch_main.xui') do CALL :DOREPLACE "%%f
 GOTO :EOF
 :DOREPLACE
 SET INPUT=%*
-SET OUTPUT=%INPUT:RetroArchMain=RetroArchQuickMenu%
+SET OUTPUT=%INPUT:RetroArchMain=RetroArchVideoOptions%
 
-for /f "tokens=* delims=" %%g in ('ECHO %OUTPUT%') do ECHO %%~g>>rarch_quickmenu.xui
+for /f "tokens=* delims=" %%g in ('ECHO %OUTPUT%') do ECHO %%~g>>rarch_video_options.xui
 
 EXIT /b
 
diff --git a/media/360/sd/rarch_quickmenu.bat b/media/360/sd/rarch_video_options.bat
similarity index 72%
rename from media/360/sd/rarch_quickmenu.bat
rename to media/360/sd/rarch_video_options.bat
index f525d0537a..b75c7af938 100644
--- a/media/360/sd/rarch_quickmenu.bat
+++ b/media/360/sd/rarch_video_options.bat
@@ -5,9 +5,9 @@ for /f "tokens=* delims=" %%f in ('type rarch_main.xui') do CALL :DOREPLACE "%%f
 GOTO :EOF
 :DOREPLACE
 SET INPUT=%*
-SET OUTPUT=%INPUT:RetroArchMain=RetroArchQuickMenu%
+SET OUTPUT=%INPUT:RetroArchMain=RetroArchVideoOptions%
 
-for /f "tokens=* delims=" %%g in ('ECHO %OUTPUT%') do ECHO %%~g>>rarch_quickmenu.xui
+for /f "tokens=* delims=" %%g in ('ECHO %OUTPUT%') do ECHO %%~g>>rarch_video_options.xui
 
 EXIT /b
 
diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj
index 04d1a3a0ea..df80cef732 100644
--- a/msvc/RetroArch-360/RetroArch-360.vcxproj
+++ b/msvc/RetroArch-360/RetroArch-360.vcxproj
@@ -506,20 +506,20 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\media\360\sd\rarch_quickmenu.xui">
+    <CustomBuild Include="..\..\media\360\sd\rarch_video_options.xui">
       <FileType>Document</FileType>
-      <Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\sd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\sd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\sd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\sd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\sd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\sd\rarch_quickmenu.xur"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\sd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\sd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\sd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\sd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\sd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\sd\rarch_quickmenu.xur;</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\sd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\sd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\sd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\sd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\sd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\sd\rarch_video_options.xur"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\sd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\sd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\sd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\sd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\sd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\sd\rarch_video_options.xur;</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
@@ -585,20 +585,20 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_main.xui" "$(OutDir)media\hd\rarch_main.xur"</Command>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_main.xui" "$(OutDir)media\hd\rarch_main.xur"</Command>
     </CustomBuild>
-    <CustomBuild Include="..\..\media\360\hd\rarch_quickmenu.xui">
+    <CustomBuild Include="..\..\media\360\hd\rarch_video_options.xui">
       <FileType>Document</FileType>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\hd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\hd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\hd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\hd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\hd\rarch_quickmenu.xur;</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\hd\rarch_quickmenu.xur;</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\hd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\hd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\hd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\hd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\hd\rarch_quickmenu.xur"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_quickmenu.xui" "$(OutDir)media\hd\rarch_quickmenu.xur"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">$(OutDir)media\hd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">$(OutDir)media\hd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">$(OutDir)media\hd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">$(OutDir)media\hd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">$(OutDir)media\hd\rarch_video_options.xur;</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">$(OutDir)media\hd\rarch_video_options.xur;</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">xui2bin /D /NOLOGO "%(RelativeDir)rarch_video_options.xui" "$(OutDir)media\hd\rarch_video_options.xur"</Command>
     </CustomBuild>
     <CustomBuild Include="..\..\media\360\hd\rarch_settings.xui">
       <FileType>Document</FileType>
@@ -683,4 +683,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
index 830f54c175..cfa4eafcf6 100644
--- a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
+++ b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
@@ -147,10 +147,10 @@
     <CustomBuild Include="..\..\media\360\hd\rarch_main.xui">
       <Filter>Source Files\media\hd</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\media\360\hd\rarch_quickmenu.xui">
+    <CustomBuild Include="..\..\media\360\hd\rarch_video_options.xui">
       <Filter>Source Files\media\hd</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\media\360\sd\rarch_quickmenu.xui">
+    <CustomBuild Include="..\..\media\360\sd\rarch_video_options.xui">
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
     <CustomBuild Include="..\..\media\360\hd\rarch_settings.xui">
@@ -178,4 +178,4 @@
       <Filter>Source Files\media\sd</Filter>
     </CustomBuild>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>