diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 129767068..aa645455e 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -230,8 +230,12 @@
     <TypeScriptCompile Include="apps\ui-tests-app\pages\i73.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\pages\gestures.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\pages\listview_binding.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\modal-view\login-page.ts" />
-    <TypeScriptCompile Include="apps\ui-tests-app\modal-view\modal-view.ts" />
+    <TypeScriptCompile Include="apps\ui-tests-app\modal-view\login-page.ts">
+      <DependentUpon>login-page.xml</DependentUpon>
+    </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\ui-tests-app\modal-view\modalview.ts">
+      <DependentUpon>modalview.xml</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\ui-tests-app\pages\textfield.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\pages\text\text-field.ts" />
     <TypeScriptCompile Include="apps\ui-tests-app\pages\text\text-view.ts" />
@@ -724,8 +728,8 @@
     <Content Include="apps\template-master-detail\app.css" />
     <Content Include="apps\template-tab-navigation\app.css" />
     <Content Include="apps\ui-tests-app\modal-view\login-page.xml" />
-    <Content Include="apps\ui-tests-app\modal-view\modal-view.xml" />
-    <Resource Include="apps\ui-tests-app\pages\red.png" />
+    <Content Include="apps\ui-tests-app\modal-view\modalview.xml" />
+    <Content Include="apps\ui-tests-app\pages\red.png" />
     <Content Include="apps\ui-tests-app\pages\test2.png" />
     <Content Include="apps\ui-tests-app\pages\textfield.xml" />
     <Content Include="apps\ui-tests-app\pages\text\text-field.xml" />
diff --git a/apps/ui-tests-app/modal-view/modal-view.ts b/apps/ui-tests-app/modal-view/modalview.ts
similarity index 100%
rename from apps/ui-tests-app/modal-view/modal-view.ts
rename to apps/ui-tests-app/modal-view/modalview.ts
diff --git a/apps/ui-tests-app/modal-view/modal-view.xml b/apps/ui-tests-app/modal-view/modalview.xml
similarity index 100%
rename from apps/ui-tests-app/modal-view/modal-view.xml
rename to apps/ui-tests-app/modal-view/modalview.xml