diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj b/pkg/msvc/msvc-2017-android/msvc-2017-android.NativeActivity/msvc-2017-android.NativeActivity.vcxproj
similarity index 98%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.NativeActivity/msvc-2017-android.NativeActivity.vcxproj
index 1da3a2b5e3..b491d44aaf 100644
--- a/pkg/msvc/msvc-2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj
+++ b/pkg/msvc/msvc-2017-android/msvc-2017-android.NativeActivity/msvc-2017-android.NativeActivity.vcxproj
@@ -69,11 +69,12 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{e27d73ec-6148-4817-b75c-adaa0c563939}</ProjectGuid>
     <Keyword>Android</Keyword>
-    <RootNamespace>msvc2017-android</RootNamespace>
+    <RootNamespace>msvc-2017-android</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <ApplicationType>Android</ApplicationType>
     <ApplicationTypeRevision>3.0</ApplicationTypeRevision>
+    <ProjectName>msvc-2017-android.NativeActivity</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -269,4 +270,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj.filters b/pkg/msvc/msvc-2017-android/msvc-2017-android.NativeActivity/msvc-2017-android.NativeActivity.vcxproj.filters
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.NativeActivity/msvc2017-android.NativeActivity.vcxproj.filters
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.NativeActivity/msvc-2017-android.NativeActivity.vcxproj.filters
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/AndroidManifest.xml b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/AndroidManifest.xml
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/AndroidManifest.xml
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/AndroidManifest.xml
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/build.xml b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/build.xml
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/build.xml
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/build.xml
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/msvc2017-android.Packaging.androidproj b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/msvc-2017-android.Packaging.androidproj
similarity index 90%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/msvc2017-android.Packaging.androidproj
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/msvc-2017-android.Packaging.androidproj
index 68ae46bceb..8c8883cb06 100644
--- a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/msvc2017-android.Packaging.androidproj
+++ b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/msvc-2017-android.Packaging.androidproj
@@ -35,7 +35,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <RootNamespace>msvc2017-android</RootNamespace>
+    <RootNamespace>msvc-2017-android</RootNamespace>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <ProjectVersion>1.0</ProjectVersion>
     <ProjectGuid>{94b52983-76de-4545-a708-433c377727c7}</ProjectGuid>
@@ -44,34 +44,42 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Application</ConfigurationType>
+    <AndroidAPILevel>android-23</AndroidAPILevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Application</ConfigurationType>
+    <AndroidAPILevel>android-23</AndroidAPILevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Application</ConfigurationType>
+    <AndroidAPILevel>android-23</AndroidAPILevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Application</ConfigurationType>
+    <AndroidAPILevel>android-23</AndroidAPILevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Application</ConfigurationType>
+    <AndroidAPILevel>android-23</AndroidAPILevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Application</ConfigurationType>
+    <AndroidAPILevel>android-23</AndroidAPILevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>Application</ConfigurationType>
+    <AndroidAPILevel>android-23</AndroidAPILevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Application</ConfigurationType>
+    <AndroidAPILevel>android-23</AndroidAPILevel>
   </PropertyGroup>
   <Import Project="$(AndroidTargetsPath)\Android.props" />
   <ImportGroup Label="ExtensionSettings" />
@@ -124,7 +132,7 @@
     <AntProjectPropertiesFile Include="project.properties" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\msvc2017-android.NativeActivity\msvc2017-android.NativeActivity.vcxproj">
+    <ProjectReference Include="..\msvc-2017-android.NativeActivity\msvc-2017-android.NativeActivity.vcxproj">
       <Project>{e27d73ec-6148-4817-b75c-adaa0c563939}</Project>
     </ProjectReference>
   </ItemGroup>
@@ -152,4 +160,4 @@
   </ItemGroup>
   <Import Project="$(AndroidTargetsPath)\Android.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-hdpi/ic_launcher.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-hdpi/ic_launcher.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-hdpi/ic_launcher.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-ldpi/ic_launcher.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-ldpi/ic_launcher.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-ldpi/ic_launcher.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-mdpi/ic_launcher.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-mdpi/ic_launcher.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-mdpi/ic_launcher.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xhdpi/banner.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xhdpi/banner.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xhdpi/banner.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xhdpi/banner.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xhdpi/ic_launcher.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xhdpi/ic_launcher.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xhdpi/ic_launcher.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xhdpi/ouya_icon.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xhdpi/ouya_icon.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xhdpi/ouya_icon.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xhdpi/ouya_icon.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xxhdpi/ic_launcher.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xxhdpi/ic_launcher.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xxhdpi/ic_launcher.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xxxhdpi/ic_launcher.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xxxhdpi/ic_launcher.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable-xxxhdpi/ic_launcher.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable-xxxhdpi/ic_launcher.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable/banner.png b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable/banner.png
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/res/drawable/banner.png
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/res/drawable/banner.png
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/mainmenu/MainMenuActivity.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/preferences/util/ConfigFile.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/preferences/util/ConfigFile.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/preferences/util/ConfigFile.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/preferences/util/ConfigFile.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/preferences/util/UserPreferences.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/preferences/util/UserPreferences.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/preferences/util/UserPreferences.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/preferences/util/UserPreferences.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityCamera.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityIntent.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityLocation.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityPast.java b/pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityPast.java
similarity index 100%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityPast.java
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.Packaging/src/com/retroarch/browser/retroactivity/RetroActivityPast.java
diff --git a/pkg/msvc/msvc-2017-android/msvc2017-android.sln b/pkg/msvc/msvc-2017-android/msvc-2017-android.sln
similarity index 86%
rename from pkg/msvc/msvc-2017-android/msvc2017-android.sln
rename to pkg/msvc/msvc-2017-android/msvc-2017-android.sln
index 3943f80457..3b63d42249 100644
--- a/pkg/msvc/msvc-2017-android/msvc2017-android.sln
+++ b/pkg/msvc/msvc-2017-android/msvc-2017-android.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msvc2017-android", "msvc2017-android", "{82FC602D-4083-4ED5-858B-A066A4280E4C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msvc-2017-android", "msvc-2017-android", "{82FC602D-4083-4ED5-858B-A066A4280E4C}"
 EndProject
-Project("{39E2626F-3545-4960-A6E8-258AD8476CE5}") = "msvc2017-android.Packaging", "msvc2017-android.Packaging\msvc2017-android.Packaging.androidproj", "{94B52983-76DE-4545-A708-433C377727C7}"
+Project("{39E2626F-3545-4960-A6E8-258AD8476CE5}") = "msvc-2017-android.Packaging", "msvc-2017-android.Packaging\msvc-2017-android.Packaging.androidproj", "{94B52983-76DE-4545-A708-433C377727C7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc2017-android.NativeActivity", "msvc2017-android.NativeActivity\msvc2017-android.NativeActivity.vcxproj", "{E27D73EC-6148-4817-B75C-ADAA0C563939}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msvc-2017-android.NativeActivity", "msvc-2017-android.NativeActivity\msvc-2017-android.NativeActivity.vcxproj", "{E27D73EC-6148-4817-B75C-ADAA0C563939}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution