diff --git a/e2e/nested-router-tab-view/app/login/login.component.ts b/e2e/nested-router-tab-view/app/login/login.component.ts
index 68b5916f3..98574863d 100644
--- a/e2e/nested-router-tab-view/app/login/login.component.ts
+++ b/e2e/nested-router-tab-view/app/login/login.component.ts
@@ -2,7 +2,7 @@ import { Component, ViewContainerRef } from "@angular/core";
 import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
 import { RouterExtensions } from "nativescript-angular/router";
 import { EventData } from "tns-core-modules/data/observable";
-import { confirm } from "ui/dialogs";
+import { confirm } from "tns-core-modules/ui/dialogs";
 
 import { AppModule } from "../app.module";
 
diff --git a/e2e/nested-router-tab-view/app/modal-nested/modal-nested.component.ts b/e2e/nested-router-tab-view/app/modal-nested/modal-nested.component.ts
index 7069b058d..89cb66c56 100644
--- a/e2e/nested-router-tab-view/app/modal-nested/modal-nested.component.ts
+++ b/e2e/nested-router-tab-view/app/modal-nested/modal-nested.component.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { View, ShownModallyData } from "ui/core/view"
+import { View, ShownModallyData } from "tns-core-modules/ui/core/view"
 import { ModalDialogParams } from "nativescript-angular/directives/dialogs";
 
 @Component({
diff --git a/e2e/nested-router-tab-view/app/modal-second/modal-second.component.ts b/e2e/nested-router-tab-view/app/modal-second/modal-second.component.ts
index a1b280964..819a73f78 100644
--- a/e2e/nested-router-tab-view/app/modal-second/modal-second.component.ts
+++ b/e2e/nested-router-tab-view/app/modal-second/modal-second.component.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { View, EventData } from "ui/core/view"
+import { View, EventData } from "tns-core-modules/ui/core/view"
 import { RouterExtensions } from "nativescript-angular/router";
 
 @Component({
diff --git a/e2e/nested-router-tab-view/app/modal/modal.component.ts b/e2e/nested-router-tab-view/app/modal/modal.component.ts
index 55ff26525..fc5068b2b 100644
--- a/e2e/nested-router-tab-view/app/modal/modal.component.ts
+++ b/e2e/nested-router-tab-view/app/modal/modal.component.ts
@@ -2,8 +2,8 @@ import { Component, ViewContainerRef } from "@angular/core";
 import { ModalDialogParams, ModalDialogOptions, ModalDialogService } from "nativescript-angular/directives/dialogs";
 import { RouterExtensions, PageRoute } from "nativescript-angular/router";
 import { ActivatedRoute } from "@angular/router";
-import { View, ShownModallyData, EventData } from "ui/core/view"
-import { confirm } from "ui/dialogs";
+import { View, ShownModallyData } from "tns-core-modules/ui/core/view"
+import { confirm } from "tns-core-modules/ui/dialogs";
 import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
 import { NestedModalComponent } from "../modal-nested/modal-nested.component";
 
diff --git a/e2e/nested-router-tab-view/app/tabs/tabs.component.ts b/e2e/nested-router-tab-view/app/tabs/tabs.component.ts
index 10ddc1b12..df5e2d619 100644
--- a/e2e/nested-router-tab-view/app/tabs/tabs.component.ts
+++ b/e2e/nested-router-tab-view/app/tabs/tabs.component.ts
@@ -3,8 +3,8 @@ import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/dir
 import { RouterExtensions } from "nativescript-angular/router";
 import { EventData } from "tns-core-modules/data/observable";
 import { ActivatedRoute } from "@angular/router";
-import { confirm } from "ui/dialogs";
-import { Page } from "ui/page";
+import { confirm } from "tns-core-modules/ui/dialogs";
+import { Page } from "tns-core-modules/ui/page";
 import { AppModule } from "../app.module";
 
 @Component({
diff --git a/tests/app/snippets/gestures.component.ts b/tests/app/snippets/gestures.component.ts
index 743b9e1f4..50f6cd9ce 100644
--- a/tests/app/snippets/gestures.component.ts
+++ b/tests/app/snippets/gestures.component.ts
@@ -5,7 +5,7 @@ import {
     PinchGestureEventData,
     RotationGestureEventData,
     SwipeGestureEventData,
-    TouchGestureEventData} from "ui/gestures";
+    TouchGestureEventData} from "tns-core-modules/ui/gestures";
 
 @Component({
     selector: "gestures",
diff --git a/tests/app/tests/third-party.ts b/tests/app/tests/third-party.ts
index ccea47166..e87925384 100644
--- a/tests/app/tests/third-party.ts
+++ b/tests/app/tests/third-party.ts
@@ -84,7 +84,7 @@ export class DocumentFormContainer {
 
 describe("Third party component snippets", () => {
     before(() => {
-        registerElement("document-form", () => require("ui/layouts/stack-layout").StackLayout);
+        registerElement("document-form", () => require("tns-core-modules/ui/layouts/stack-layout").StackLayout);
     });
 
     beforeEach(nsTestBedBeforeEach([