diff --git a/apps/app/modaltest/app.ts b/apps/app/modaltest/app.ts
index 908d22e8c..3ea293877 100644
--- a/apps/app/modaltest/app.ts
+++ b/apps/app/modaltest/app.ts
@@ -1,11 +1,11 @@
 import * as application from "tns-core-modules/application";
 // trace.addCategories(trace.categories.All);
-// application.run({ moduleName: "page.1" });
-// application.run({ moduleName: "main-page" });
+// application.run({ moduleName: "modaltest/page.1" });
+// application.run({ moduleName: "modaltest/main-page" });
 
-application.run({ moduleName: "modal-tab" });
-// application.run({ moduleName: "textview" });
+application.run({ moduleName: "modaltest/modal-tab" });
+// application.run({ moduleName: "modaltest/textview" });
 
-// application.start({ moduleName: "modal-tab.33" });
-// application.run({ moduleName: "modal-frame" });
-// application.start({ moduleName: "page.2" });
\ No newline at end of file
+// application.start({ moduleName: "modaltest/modal-tab.33" });
+// application.run({ moduleName: modaltest/modal-frame" });
+// application.start({ moduleName: "modaltest/page.2" });
\ No newline at end of file
diff --git a/apps/app/modaltest/main-page.ts b/apps/app/modaltest/main-page.ts
index 13cd6dc0a..3a153f016 100644
--- a/apps/app/modaltest/main-page.ts
+++ b/apps/app/modaltest/main-page.ts
@@ -7,17 +7,17 @@ export function onNavigatingTo(args: EventData) {
 
 export function navigate(args: EventData) {
     console.log("navigate");
-    (args.object as View).page.frame.navigate("page.1");
+    (args.object as View).page.frame.navigate("modaltest/page.1");
 }
 
 export function onModalTab(args: EventData) {
     const view = args.object as View;
-    view.showModal("modal-tab", "context", closeModal, false);
+    view.showModal("modaltest/modal-tab", "context", closeModal, false);
 }
 
 export function onModalFrame(args: EventData) {
     const view = args.object as View;
-    view.showModal("modal-frame", "context", closeModal, false);
+    view.showModal("modaltest/modal-frame", "context", closeModal, false);
 }
 
 export function onTap3(args: EventData) {
diff --git a/apps/app/modaltest/modal-frame.1.xml b/apps/app/modaltest/modal-frame.1.xml
index 39f23da4a..f02af917f 100644
--- a/apps/app/modaltest/modal-frame.1.xml
+++ b/apps/app/modaltest/modal-frame.1.xml
@@ -1,4 +1,4 @@
-<Page backgroundColor="pink" codeFile='~/page.2' actionBarHidden="true">
+<Page backgroundColor="pink" codeFile='~/modaltest/page.2' actionBarHidden="true">
     <Frame>
         <Page backgroundColor="purple">
             <ActionBar title=" AAA ">
diff --git a/apps/app/modaltest/modal-frame.xml b/apps/app/modaltest/modal-frame.xml
index c505323de..e048558bf 100644
--- a/apps/app/modaltest/modal-frame.xml
+++ b/apps/app/modaltest/modal-frame.xml
@@ -1,4 +1,4 @@
-<Frame codeFile='~/page.2'>
+<Frame codeFile='~/modaltest/page.2'>
     <Page backgroundColor="pink">
         <ActionBar title="{{ $value, 'Page ' + $value }} ">
             <ActionItem text="close" tap="closeModal" ios.position='right' />
diff --git a/apps/app/modaltest/modal-tab.33.xml b/apps/app/modaltest/modal-tab.33.xml
index 879f43090..a70d1183c 100644
--- a/apps/app/modaltest/modal-tab.33.xml
+++ b/apps/app/modaltest/modal-tab.33.xml
@@ -1,5 +1,5 @@
 <Page backgroundColor="blue" actionBarHidden="true" loaded="pageLoaded"
-    codeFile='~/modal-tab'>
+    codeFile='~/modaltest/modal-tab'>
     <ActionBar title="Frame in Modal Page">
         <ActionItem text="close" tap="closeModal" />
     </ActionBar>
diff --git a/apps/app/modaltest/modal-tab.ts b/apps/app/modaltest/modal-tab.ts
index 77ad7c505..1ebac4ff3 100644
--- a/apps/app/modaltest/modal-tab.ts
+++ b/apps/app/modaltest/modal-tab.ts
@@ -22,7 +22,7 @@ export function onTap(args) {
     const view = args.object as View;
     const page = view.page;
     let context = page.bindingContext || 0;
-    page.frame.navigate({ moduleName: "page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
+    page.frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
 }
 
 export function tenGoBacks(args) {
@@ -33,7 +33,7 @@ export function tenGoBacks(args) {
     let context = page.bindingContext || 0;
     let x = 4;
     while (x--) {
-        frame.navigate({ moduleName: "page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
+        frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
     }
 
     x = 4;
@@ -50,17 +50,17 @@ export function navigateToFrame(args: EventData) {
     const view = args.object as View;
     const page = view.page;
     const frame = page.frame;
-    frame.navigate("modal-frame");
+    frame.navigate("modaltest/modal-frame");
 }
 
 export function navigateToPageWithFrame(args: EventData) {
     const view = args.object as View;
     const page = view.page;
     const frame = page.frame;
-    frame.navigate("modal-frame.1");
+    frame.navigate("modaltest/modal-frame.1");
 }
 
 export function onModalFrame(args: EventData) {
     const view = args.object as View;
-    view.showModal("modal-frame", "some context", closeModal, false);
+    view.showModal("modaltest/modal-frame", "some context", undefined, false);
 }
\ No newline at end of file
diff --git a/apps/app/modaltest/page.2.ts b/apps/app/modaltest/page.2.ts
index 6a7424df7..affa4d90b 100644
--- a/apps/app/modaltest/page.2.ts
+++ b/apps/app/modaltest/page.2.ts
@@ -17,7 +17,7 @@ export function onTap(args: EventData) {
     const view = args.object as View;
     const page = view.page;
     let context = page.bindingContext || 0;
-    page.frame.navigate({ moduleName: "page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
+    page.frame.navigate({ moduleName: "modaltest/page.2", bindingContext: ++context, transition: { name: "fade", duration: 1000 } });
 }
 
 export function onBack(args: EventData) {
@@ -32,7 +32,7 @@ export function closeModal(args: EventData) {
 
 let modalContext = 0;
 export function showModal(args: EventData) {
-    (args.object as View).showModal("page.2", ++modalContext, function () {
+    (args.object as View).showModal("modaltest/page.2", ++modalContext, function () {
         console.log("Closed Modal: " + (args.object as View).bindingContext);
     });
 }
diff --git a/apps/app/modaltest/page.2.xml b/apps/app/modaltest/page.2.xml
index 4b6559eb5..31dbbb600 100644
--- a/apps/app/modaltest/page.2.xml
+++ b/apps/app/modaltest/page.2.xml
@@ -1,5 +1,5 @@
 <Page backgroundColor="pink" showingModally="showingModally">
-    <ActionBar title="{{ $value }} ">
+    <ActionBar title="{{ $value + ' page' }} ">
         <ActionItem text="close" tap="closeModal" ios.position='right' />
     </ActionBar>
     <StackLayout backgroundColor="orange">
diff --git a/apps/app/package.json b/apps/app/package.json
index 711929cac..c47b84805 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -1,4 +1,4 @@
 {
 	"name": "tns-samples-apps",
-	"main": "ui-tests-app/app.js"
+	"main": "modaltest/app.js"
 }