diff --git a/.gitignore b/.gitignore
index f5c1f603a..991763a9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ e2e/**/test-results.xml
 
 # Webpack configuration files
 webpack.config.js
+tsconfig.esm.json
 
 # Generated files
 *.map
diff --git a/e2e/modal-navigation/app/app.ts b/e2e/modal-navigation/app/app.ts
index ae7b39686..e0ef2193e 100644
--- a/e2e/modal-navigation/app/app.ts
+++ b/e2e/modal-navigation/app/app.ts
@@ -1,4 +1,3 @@
-import "./bundle-config";
 import * as application from "tns-core-modules/application";
 
 application.run({ moduleName: "app-root" });
diff --git a/e2e/modal-navigation/app/bundle-config.ts b/e2e/modal-navigation/app/bundle-config.ts
deleted file mode 100644
index 6dec5b29c..000000000
--- a/e2e/modal-navigation/app/bundle-config.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-if ((<any>global).TNS_WEBPACK) {
-    // Register tns-core-modules UI framework modules
-    require("bundle-entry-points");
-
-    // Register application modules
-    // This will register each `root`, `page`, `fragment` postfixed xml, css, js, ts, scss file in the app/ folder
-    const context = (<any>require).context("~/", true, /(root|page|fragment)\.(xml|css|js|ts|scss|less|sass)$/);
-    global.registerWebpackModules(context);
-}
diff --git a/e2e/modal-navigation/app/home/home-page.ts b/e2e/modal-navigation/app/home/home-page.ts
index f7871e800..7c37d2b84 100644
--- a/e2e/modal-navigation/app/home/home-page.ts
+++ b/e2e/modal-navigation/app/home/home-page.ts
@@ -42,7 +42,7 @@ export function onModalPage(args: EventData) {
 
 export function onModalLayout(args: EventData) {
     const view = args.object as View;
-    view.showModal("modal-layout/modal-layout",
+    view.showModal("modal-layout/modal-layout-root",
         "context",
         () => console.log("home-page modal layout closed"),
         false);
diff --git a/e2e/modal-navigation/app/modal-layout/modal-layout.ts b/e2e/modal-navigation/app/modal-layout/modal-layout-root.ts
similarity index 100%
rename from e2e/modal-navigation/app/modal-layout/modal-layout.ts
rename to e2e/modal-navigation/app/modal-layout/modal-layout-root.ts
diff --git a/e2e/modal-navigation/app/modal-layout/modal-layout.xml b/e2e/modal-navigation/app/modal-layout/modal-layout-root.xml
similarity index 100%
rename from e2e/modal-navigation/app/modal-layout/modal-layout.xml
rename to e2e/modal-navigation/app/modal-layout/modal-layout-root.xml
diff --git a/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts
index f4db7ac8a..2aa94460a 100644
--- a/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts
+++ b/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts
@@ -9,7 +9,7 @@ import {
     testNestedModalPageBackground
 } from "./shared.e2e-spec"
 
-describe("modal frame:", () => {
+describe("modal-frame:", () => {
 
     let driver: AppiumDriver;
     let screen: Screen;
diff --git a/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts
index 7e8315a9f..e36238969 100644
--- a/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts
+++ b/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts
@@ -9,7 +9,7 @@ import {
     testNestedModalPageBackground
 } from "./shared.e2e-spec"
 
-describe("modal layout:", () => {
+describe("modal-layout:", () => {
 
     let driver: AppiumDriver;
     let screen: Screen;
diff --git a/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts
index 8b3cb19c4..b678319b2 100644
--- a/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts
+++ b/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts
@@ -8,7 +8,7 @@ import {
     testNestedModalPageBackground
 } from "./shared.e2e-spec"
 
-describe("modal page:", () => {
+describe("modal-page:", () => {
 
     let driver: AppiumDriver;
     let screen: Screen;
diff --git a/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts
index a3f5f6bf3..9a7cb224b 100644
--- a/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts
+++ b/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts
@@ -11,7 +11,7 @@ import {
     testSecondItemBackground
 } from "./shared.e2e-spec"
 
-describe("modal tab:", () => {
+describe("modal-tab:", () => {
 
     let driver: AppiumDriver;
     let screen: Screen;