diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 212f20800..57cabca14 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -574,9 +574,8 @@
     <Content Include="apps\tests\pages\files\test.minWH450.xml" />
     <Content Include="apps\tests\pages\files\test.xml" />
     <Content Include="apps\tests\file-name-resolver-tests\files\other.xml" />
-    <Content Include="apps\tests\file-name-resolver-tests\files\test.android.xml" />
-    <Content Include="apps\tests\file-name-resolver-tests\files\test.ios.land.xml" />
-    <Content Include="apps\tests\file-name-resolver-tests\files\test.android.minWH600.xml" />
+    <Content Include="apps\tests\file-name-resolver-tests\files\test.land.xml" />
+    <Content Include="apps\tests\file-name-resolver-tests\files\test.minWH600.xml" />
     <Content Include="apps\tests\file-name-resolver-tests\files\test.xml" />
     <Content Include="apps\tests\pages\page17.xml">
       <SubType>Designer</SubType>
@@ -1532,7 +1531,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
+      <UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts b/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts
index 2c7beff18..26c59637d 100644
--- a/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts
+++ b/apps/tests/file-name-resolver-tests/file-name-resolver-tests.ts
@@ -217,25 +217,25 @@ var testFilePath = "~/file-name-resolver-tests/files/test".replace("~", fs.known
 export function test_file_resolver_with_andorid_phone_portratit() {
     var fileResolver = new resolver.FileNameResolver(androidPhonePortraitContext);
     var result = fileResolver.resolveFileName(testFilePath, "xml");
-    TKUnit.assertEqual(result, testFilePath + ".android.xml", "File path");
+    TKUnit.assertEqual(result, testFilePath + ".xml", "File path");
 }
 
 export function test_file_resolver_with_andorid_phone_landscape() {
     var fileResolver = new resolver.FileNameResolver(androidPhoneLandsacpeContext);
     var result = fileResolver.resolveFileName(testFilePath, "xml");
-    TKUnit.assertEqual(result, testFilePath + ".android.xml", "File path");
+    TKUnit.assertEqual(result, testFilePath + ".land.xml", "File path");
 }
 
 export function test_file_resolver_with_andorid_tablet_portrait() {
     var fileResolver = new resolver.FileNameResolver(androidTabletPortraitContext);
     var result = fileResolver.resolveFileName(testFilePath, "xml");
-    TKUnit.assertEqual(result, testFilePath + ".android.minWH600.xml", "File path");
+    TKUnit.assertEqual(result, testFilePath + ".minWH600.xml", "File path");
 }
 
 export function test_file_resolver_with_ios_phone_landscape() {
     var fileResolver = new resolver.FileNameResolver(iPhoneLandscapeContext);
     var result = fileResolver.resolveFileName(testFilePath, "xml");
-    TKUnit.assertEqual(result, testFilePath + ".ios.land.xml", "File path");
+    TKUnit.assertEqual(result, testFilePath + ".land.xml", "File path");
 }
 
 export function test_file_resolver_with_ios_phone_portrait() {
diff --git a/apps/tests/file-name-resolver-tests/files/test.android.xml b/apps/tests/file-name-resolver-tests/files/test.android.xml
deleted file mode 100644
index e6232e926..000000000
--- a/apps/tests/file-name-resolver-tests/files/test.android.xml
+++ /dev/null
@@ -1 +0,0 @@
-test.android.xml
\ No newline at end of file
diff --git a/apps/tests/file-name-resolver-tests/files/test.ios.land.xml b/apps/tests/file-name-resolver-tests/files/test.land.xml
similarity index 100%
rename from apps/tests/file-name-resolver-tests/files/test.ios.land.xml
rename to apps/tests/file-name-resolver-tests/files/test.land.xml
diff --git a/apps/tests/file-name-resolver-tests/files/test.android.minWH600.xml b/apps/tests/file-name-resolver-tests/files/test.minWH600.xml
similarity index 100%
rename from apps/tests/file-name-resolver-tests/files/test.android.minWH600.xml
rename to apps/tests/file-name-resolver-tests/files/test.minWH600.xml