diff --git a/e2e/modal-navigation-ng/app/home/home.component.ts b/e2e/modal-navigation-ng/app/home/home.component.ts
index 8fc08fb7c..e0a58f50e 100644
--- a/e2e/modal-navigation-ng/app/home/home.component.ts
+++ b/e2e/modal-navigation-ng/app/home/home.component.ts
@@ -7,7 +7,7 @@ import { ViewContainerRefService } from "../shared/ViewContainerRefService";
 import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
 import { ModalComponent } from "../modal/modal.component";
 import { ModalViewComponent } from "../modal-shared/modal-view.component";
-import { confirm } from "ui/dialogs";
+import { confirm } from "tns-core-modules/ui/dialogs";
 
 import { AppModule } from "../app.module";
 
diff --git a/e2e/modal-navigation-ng/app/layout.component.ts b/e2e/modal-navigation-ng/app/layout.component.ts
index de4c8eb45..223e4dcdd 100644
--- a/e2e/modal-navigation-ng/app/layout.component.ts
+++ b/e2e/modal-navigation-ng/app/layout.component.ts
@@ -5,7 +5,7 @@ import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/dir
 import { ModalComponent } from "./modal/modal.component";
 import { ModalViewComponent } from "./modal-shared/modal-view.component";
 import { ModalRouterComponent } from "./modal/modal-router/modal-router.component";
-import { confirm } from "ui/dialogs";
+import { confirm } from "tns-core-modules/ui/dialogs";
 
 import { AppModule } from "./app.module";
 
diff --git a/e2e/modal-navigation-ng/app/modal-nested/modal-nested.component.ts b/e2e/modal-navigation-ng/app/modal-nested/modal-nested.component.ts
index 7069b058d..89cb66c56 100644
--- a/e2e/modal-navigation-ng/app/modal-nested/modal-nested.component.ts
+++ b/e2e/modal-navigation-ng/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/modal-navigation-ng/app/modal-second/modal-second.component.ts b/e2e/modal-navigation-ng/app/modal-second/modal-second.component.ts
index b357af3ff..01e203e56 100644
--- a/e2e/modal-navigation-ng/app/modal-second/modal-second.component.ts
+++ b/e2e/modal-navigation-ng/app/modal-second/modal-second.component.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-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/modal-navigation-ng/app/modal/modal.component.ts b/e2e/modal-navigation-ng/app/modal/modal.component.ts
index 55ff26525..a7caca12a 100644
--- a/e2e/modal-navigation-ng/app/modal/modal.component.ts
+++ b/e2e/modal-navigation-ng/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, EventData } 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/renderer/app/app.module.ts b/e2e/renderer/app/app.module.ts
index f4d071ac0..94a20f26e 100644
--- a/e2e/renderer/app/app.module.ts
+++ b/e2e/renderer/app/app.module.ts
@@ -10,7 +10,7 @@ import { AppComponent } from "./app.component";
 import { ItemsService } from "./items.service";
 
 import { rendererTraceCategory, viewUtilCategory, bootstrapCategory } from "nativescript-angular/trace";
-import { addCategories, enable, categories } from "trace";
+import { addCategories, enable, categories } from "tns-core-modules/trace";
 addCategories(bootstrapCategory);
 addCategories(rendererTraceCategory);
 addCategories(viewUtilCategory);
diff --git a/e2e/renderer/app/tab-view/tab-item-binding.component.ts b/e2e/renderer/app/tab-view/tab-item-binding.component.ts
index 66cf30f16..3f301dbc2 100644
--- a/e2e/renderer/app/tab-view/tab-item-binding.component.ts
+++ b/e2e/renderer/app/tab-view/tab-item-binding.component.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { isAndroid } from "platform";
+import { isAndroid } from "tns-core-modules/platform";
 
 function getIconSource(icon: string): string {
     const iconPrefix = isAndroid ? "res://" : "res://tabIcons/";
diff --git a/e2e/router/app/app.module.ts b/e2e/router/app/app.module.ts
index 82314813b..30b4f6cdf 100644
--- a/e2e/router/app/app.module.ts
+++ b/e2e/router/app/app.module.ts
@@ -10,7 +10,7 @@ import {
 import { AppComponent } from "./app.component";
 
 import { rendererTraceCategory, viewUtilCategory, routeReuseStrategyTraceCategory, routerTraceCategory } from "nativescript-angular/trace";
-import { setCategories, enable } from "trace";
+import { setCategories, enable } from "tns-core-modules/trace";
 setCategories(routerTraceCategory + "," + routeReuseStrategyTraceCategory);
 enable();
 
diff --git a/e2e/router/app/first/first.component.ts b/e2e/router/app/first/first.component.ts
index 36f42a746..6c7cdcc7c 100644
--- a/e2e/router/app/first/first.component.ts
+++ b/e2e/router/app/first/first.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
 import { RouterExtensions } from "nativescript-angular/router";
 
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 
 @Component({
     selector: "first",
diff --git a/e2e/router/app/lazy/lazy-componentless-route.component.ts b/e2e/router/app/lazy/lazy-componentless-route.component.ts
index 02734a982..0bd830aab 100644
--- a/e2e/router/app/lazy/lazy-componentless-route.component.ts
+++ b/e2e/router/app/lazy/lazy-componentless-route.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
 import { RouterExtensions } from "nativescript-angular/router";
 
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 
 @Component({
     selector: "lazy",
diff --git a/e2e/router/app/lazy/lazy.component.ts b/e2e/router/app/lazy/lazy.component.ts
index 0a3b5d1f3..1a92fbe09 100644
--- a/e2e/router/app/lazy/lazy.component.ts
+++ b/e2e/router/app/lazy/lazy.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
 import { RouterExtensions } from "nativescript-angular/router";
 
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 
 @Component({
     selector: "lazy",
diff --git a/e2e/router/app/second/detail.component.ts b/e2e/router/app/second/detail.component.ts
index 4f42260cd..f7827e2d2 100644
--- a/e2e/router/app/second/detail.component.ts
+++ b/e2e/router/app/second/detail.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
 
diff --git a/e2e/router/app/second/second.component.ts b/e2e/router/app/second/second.component.ts
index a827aab24..e01066171 100644
--- a/e2e/router/app/second/second.component.ts
+++ b/e2e/router/app/second/second.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 
 import { RouterExtensions } from "nativescript-angular/router";
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
 
diff --git a/e2e/single-page/app/app.module.ts b/e2e/single-page/app/app.module.ts
index 82314813b..30b4f6cdf 100644
--- a/e2e/single-page/app/app.module.ts
+++ b/e2e/single-page/app/app.module.ts
@@ -10,7 +10,7 @@ import {
 import { AppComponent } from "./app.component";
 
 import { rendererTraceCategory, viewUtilCategory, routeReuseStrategyTraceCategory, routerTraceCategory } from "nativescript-angular/trace";
-import { setCategories, enable } from "trace";
+import { setCategories, enable } from "tns-core-modules/trace";
 setCategories(routerTraceCategory + "," + routeReuseStrategyTraceCategory);
 enable();
 
diff --git a/e2e/single-page/app/first/first.component.ts b/e2e/single-page/app/first/first.component.ts
index d0ae3f94d..58956ec8f 100644
--- a/e2e/single-page/app/first/first.component.ts
+++ b/e2e/single-page/app/first/first.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy, OnChanges } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
 
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "rxjs";
 import { FrameService } from "nativescript-angular/platform-providers";
 
diff --git a/e2e/single-page/app/second/second.component.ts b/e2e/single-page/app/second/second.component.ts
index 1cfa15616..aa372c895 100644
--- a/e2e/single-page/app/second/second.component.ts
+++ b/e2e/single-page/app/second/second.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
 import { RouterExtensions } from "nativescript-angular/router";
diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts
index eedfe1344..bf72639af 100644
--- a/ng-sample/app/app.ts
+++ b/ng-sample/app/app.ts
@@ -20,11 +20,11 @@ import {
     bootstrapCategory,
 } from "nativescript-angular/trace";
 import { PAGE_FACTORY, PageFactory, PageFactoryOptions } from "nativescript-angular/platform-providers";
-import { Page } from "ui/page";
-import { Color } from "color";
+import { Page } from "tns-core-modules/ui/page";
+import { Color } from "tns-core-modules/color";
 import { log } from "tns-core-modules/profiling";
 
-import { setCategories, addCategories, enable, categories } from "trace";
+import { setCategories, addCategories, enable, categories } from "tns-core-modules/trace";
 addCategories(bootstrapCategory);
 // addCategories(rendererTraceCategory);
 // addCategories(routerTraceCategory);
diff --git a/ng-sample/app/examples/action-bar/action-bar-test.ts b/ng-sample/app/examples/action-bar/action-bar-test.ts
index 2186e2427..2b2111f53 100644
--- a/ng-sample/app/examples/action-bar/action-bar-test.ts
+++ b/ng-sample/app/examples/action-bar/action-bar-test.ts
@@ -1,5 +1,5 @@
 import { Component } from "@angular/core";
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 
 @Component({
     selector: "first",
diff --git a/ng-sample/app/examples/list/list-test.ts b/ng-sample/app/examples/list/list-test.ts
index 9390b6dfd..0a93bd4ad 100644
--- a/ng-sample/app/examples/list/list-test.ts
+++ b/ng-sample/app/examples/list/list-test.ts
@@ -1,6 +1,6 @@
 import {Component, Input, WrappedValue, ChangeDetectionStrategy, AfterViewChecked, DoCheck} from "@angular/core";
-import {Label} from "ui/label";
-import {ObservableArray} from "data/observable-array";
+import {Label} from "tns-core-modules/ui/label";
+import {ObservableArray} from "tns-core-modules/data/observable-array";
 
 class DataItem {
     constructor(public id: number, public name: string) { }
diff --git a/ng-sample/app/examples/modal/modal-nested-test.ts b/ng-sample/app/examples/modal/modal-nested-test.ts
index d1ae043f2..26f7f34cb 100644
--- a/ng-sample/app/examples/modal/modal-nested-test.ts
+++ b/ng-sample/app/examples/modal/modal-nested-test.ts
@@ -1,5 +1,5 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import * as dialogs from "ui/dialogs";
+import * as dialogs from "tns-core-modules/ui/dialogs";
 import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
 import { ModalContent } from "./modal-content";
 import { ModalTest } from "./modal-test";
diff --git a/ng-sample/app/examples/modal/modal-page-router-outlet-test.ts b/ng-sample/app/examples/modal/modal-page-router-outlet-test.ts
index 0477c8289..6a676dbaf 100644
--- a/ng-sample/app/examples/modal/modal-page-router-outlet-test.ts
+++ b/ng-sample/app/examples/modal/modal-page-router-outlet-test.ts
@@ -1,5 +1,5 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import * as dialogs from "ui/dialogs";
+import * as dialogs from "tns-core-modules/ui/dialogs";
 import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
 import { FirstComponent, SecondComponent, ThirdComponent, PageRouterOutletAppComponent } from "../router/page-router-outlet-test";
 
diff --git a/ng-sample/app/examples/modal/modal-router-outlet-test.ts b/ng-sample/app/examples/modal/modal-router-outlet-test.ts
index 9bdac0d99..46f69697f 100644
--- a/ng-sample/app/examples/modal/modal-router-outlet-test.ts
+++ b/ng-sample/app/examples/modal/modal-router-outlet-test.ts
@@ -1,5 +1,5 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import * as dialogs from "ui/dialogs";
+import * as dialogs from "tns-core-modules/ui/dialogs";
 import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
 import { FirstComponent, SecondComponent, RouterOutletAppComponent } from "../router/router-outlet-test";
 
diff --git a/ng-sample/app/examples/renderer-test.ts b/ng-sample/app/examples/renderer-test.ts
index 2a98415d1..fb03bd28c 100644
--- a/ng-sample/app/examples/renderer-test.ts
+++ b/ng-sample/app/examples/renderer-test.ts
@@ -1,6 +1,6 @@
 import { Component, Directive, Host, ElementRef, Input } from "@angular/core";
-import { Observable } from "data/observable";
-import { SegmentedBarItem } from "ui/segmented-bar";
+import { Observable } from "tns-core-modules/data/observable";
+import { SegmentedBarItem } from "tns-core-modules/ui/segmented-bar";
 
 function createTabItem(title: string) {
     let item = new SegmentedBarItem();
diff --git a/ng-sample/app/examples/router/login-test.ts b/ng-sample/app/examples/router/login-test.ts
index 284e2d8bd..3a30a55d4 100644
--- a/ng-sample/app/examples/router/login-test.ts
+++ b/ng-sample/app/examples/router/login-test.ts
@@ -1,7 +1,7 @@
 import { Component, Injectable } from "@angular/core";
 import { CanActivate, Resolve, ActivatedRouteSnapshot, RouterStateSnapshot } from "@angular/router";
 import { RouterExtensions, PageRoute } from "nativescript-angular/router";
-import * as appSettings from "application-settings";
+import * as appSettings from "tns-core-modules/application-settings";
 import { Observable } from "rxjs";
 import { map, switchMap } from "rxjs/operators";
 
diff --git a/ng-sample/app/examples/router/page-router-outlet-nested-test.ts b/ng-sample/app/examples/router/page-router-outlet-nested-test.ts
index a34844fce..df9363f01 100644
--- a/ng-sample/app/examples/router/page-router-outlet-nested-test.ts
+++ b/ng-sample/app/examples/router/page-router-outlet-nested-test.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router, Route } from "@angular/router";
 import { Location } from "@angular/common";
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
 
diff --git a/ng-sample/app/examples/router/page-router-outlet-test.ts b/ng-sample/app/examples/router/page-router-outlet-test.ts
index 9ce54352f..84c6f3606 100644
--- a/ng-sample/app/examples/router/page-router-outlet-test.ts
+++ b/ng-sample/app/examples/router/page-router-outlet-test.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Location } from "@angular/common";
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
 
diff --git a/ng-sample/app/performance/benchmark.ts b/ng-sample/app/performance/benchmark.ts
index 40d64aa30..5f32df717 100644
--- a/ng-sample/app/performance/benchmark.ts
+++ b/ng-sample/app/performance/benchmark.ts
@@ -1,6 +1,6 @@
-import {StackLayout} from "ui/layouts/stack-layout";
-import {Button} from "ui/button";
-import {Label} from "ui/label";
+import {StackLayout} from "tns-core-modules/ui/layouts/stack-layout";
+import {Button} from "tns-core-modules/ui/button";
+import {Label} from "tns-core-modules/ui/label";
 import {Inject, Component, ApplicationRef} from "@angular/core";
 import * as profiling from "./profiling";
 
diff --git a/tests/app/lazy-loaded.module.ts b/tests/app/lazy-loaded.module.ts
index 601f1f79f..ecc2bb19e 100644
--- a/tests/app/lazy-loaded.module.ts
+++ b/tests/app/lazy-loaded.module.ts
@@ -2,7 +2,7 @@ import { Component, NgModule } from "@angular/core";
 import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
 import { ModalDialogParams } from "nativescript-angular/directives/dialogs";
-import { Page } from "ui/page";
+import { Page } from "tns-core-modules/ui/page";
 
 import { lazyLoadHooksLogProvider } from "./main";
 import { SecondComponent } from "./second.component";
diff --git a/tests/app/main.ts b/tests/app/main.ts
index 1a4ed9852..9e11fb3a6 100644
--- a/tests/app/main.ts
+++ b/tests/app/main.ts
@@ -12,12 +12,12 @@ import { GestureComponent } from "./snippets/gestures.component";
 import { LayoutsComponent } from "./snippets/layouts.component";
 import { IconFontComponent } from "./snippets/icon-font.component";
 import { APP_ROOT_VIEW } from "nativescript-angular/platform-providers";
-import { Page } from "ui/page";
-import { StackLayout } from "ui/layouts/stack-layout";
+import { Page } from "tns-core-modules/ui/page";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 
-import * as application from "application";
-import "ui/styling/style";
-import "ui/frame";
+import * as application from "tns-core-modules/application";
+import "tns-core-modules/ui/styling/style";
+import "tns-core-modules/ui/frame";
 import { HOOKS_LOG } from "./base.component";
 import { MultiPageMain, routes as multiPageRoutes } from "./multi-page-main.component";
 import { SinglePageMain, routes as singlePageRoutes } from "./single-page-main.component";
@@ -35,7 +35,7 @@ import { BehaviorSubject } from "rxjs";
 
 import { GridLayout, ItemSpec } from "tns-core-modules/ui/layouts/grid-layout/grid-layout";
 
-import { enable, addCategories, categories } from "trace";
+import { enable, addCategories, categories } from "tns-core-modules/trace";
 import { Color } from "tns-core-modules/color/color";
 
 addCategories(rendererTraceCategory);
diff --git a/tests/app/tests/modal-dialog.ts b/tests/app/tests/modal-dialog.ts
index 54815d4ca..3c1e7a85f 100644
--- a/tests/app/tests/modal-dialog.ts
+++ b/tests/app/tests/modal-dialog.ts
@@ -1,11 +1,11 @@
 // make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
 import { Component, ViewContainerRef } from "@angular/core";
-import { Page } from "ui/page";
-import { topmost } from "ui/frame";
+import { Page } from "tns-core-modules/ui/page";
+import { topmost } from "tns-core-modules/ui/frame";
 import { ModalDialogParams, ModalDialogService } from "nativescript-angular/directives/dialogs";
 
-import { device, isIOS } from "platform";
+import { device, isIOS } from "tns-core-modules/platform";
 
 import { ComponentFixture, async } from "@angular/core/testing";
 import { nsTestBedRender, nsTestBedAfterEach, nsTestBedBeforeEach } from "nativescript-angular/testing";
diff --git a/tests/app/tests/ns-location-strategy.ts b/tests/app/tests/ns-location-strategy.ts
index e85ff327a..726f5776c 100644
--- a/tests/app/tests/ns-location-strategy.ts
+++ b/tests/app/tests/ns-location-strategy.ts
@@ -2,9 +2,9 @@
 import { assert } from "./test-config";
 import { DefaultUrlSerializer, UrlSegmentGroup, UrlTree } from "@angular/router";
 import { NSLocationStrategy, LocationState } from "nativescript-angular/router/ns-location-strategy";
-import { Frame, BackstackEntry, NavigationEntry } from "ui/frame";
-import { Page } from "ui/page";
-import { View } from "ui/core/view";
+import { Frame, BackstackEntry, NavigationEntry } from "tns-core-modules/ui/frame";
+import { Page } from "tns-core-modules/ui/page";
+import { View } from "tns-core-modules/ui/core/view";
 import { FrameService } from "nativescript-angular/platform-providers";
 
 export class FakeFrameService extends FrameService {
diff --git a/tests/app/tests/platform-filter-components.ts b/tests/app/tests/platform-filter-components.ts
index d239c495d..3a35843c1 100644
--- a/tests/app/tests/platform-filter-components.ts
+++ b/tests/app/tests/platform-filter-components.ts
@@ -3,7 +3,7 @@ import { assert } from "./test-config";
 import { Component, ElementRef } from "@angular/core";
 import { dumpView, createDevice } from "./test-utils";
 import { DEVICE } from "nativescript-angular/platform-providers";
-import { platformNames } from "platform";
+import { platformNames } from "tns-core-modules/platform";
 import { nsTestBedAfterEach, nsTestBedBeforeEach, nsTestBedRender } from "nativescript-angular/testing";
 
 @Component({
diff --git a/tests/app/tests/property-sets.ts b/tests/app/tests/property-sets.ts
index 823b4c098..20669874b 100644
--- a/tests/app/tests/property-sets.ts
+++ b/tests/app/tests/property-sets.ts
@@ -1,14 +1,14 @@
 // make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
-import {View} from "ui/core/view";
+import {View} from "tns-core-modules/ui/core/view";
 import {ViewUtil} from "nativescript-angular/view-util";
 import {
     NgView,
     ViewExtensions,
     ViewClassMeta,
 } from "nativescript-angular/element-registry";
-import {Red} from "color/known-colors";
-import {device, platformNames} from "platform";
+import {Red} from "tns-core-modules/color/known-colors";
+import {device, platformNames} from "tns-core-modules/platform";
 import {createDevice} from "./test-utils";
 
 class TestView extends View implements NgView {
diff --git a/tests/app/tests/renderer-tests.ts b/tests/app/tests/renderer-tests.ts
index 85ed3b369..9cc746d3e 100644
--- a/tests/app/tests/renderer-tests.ts
+++ b/tests/app/tests/renderer-tests.ts
@@ -2,8 +2,8 @@
 
 import { assert } from "./test-config";
 import { Component, ComponentRef, ElementRef, NgZone, Renderer2, ViewChild } from "@angular/core";
-import { ProxyViewContainer } from "ui/proxy-view-container";
-import { Red } from "color/known-colors";
+import { ProxyViewContainer } from "tns-core-modules/ui/proxy-view-container";
+import { Red } from "tns-core-modules/color/known-colors";
 import { dumpView } from "./test-utils";
 import { LayoutBase } from "tns-core-modules/ui/layouts/layout-base";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
diff --git a/tests/app/tests/style-properties.ts b/tests/app/tests/style-properties.ts
index 3a8fcc20e..b9510361f 100644
--- a/tests/app/tests/style-properties.ts
+++ b/tests/app/tests/style-properties.ts
@@ -1,9 +1,9 @@
 // make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
-import { TextField } from "ui/text-field";
-import { Red, Lime } from "color/known-colors";
+import { TextField } from "tns-core-modules/ui/text-field";
+import { Red, Lime } from "tns-core-modules/color/known-colors";
 import { NativeScriptRendererFactory, NativeScriptRenderer } from "nativescript-angular/renderer";
-import { device } from "platform";
+import { device } from "tns-core-modules/platform";
 import { ViewEncapsulation, RendererType2, Renderer2 } from "@angular/core";
 import { NgView } from "nativescript-angular/view-util";
 import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
diff --git a/tests/app/tests/test-utils.ts b/tests/app/tests/test-utils.ts
index 5e78de08a..660bd1a1c 100644
--- a/tests/app/tests/test-utils.ts
+++ b/tests/app/tests/test-utils.ts
@@ -1,6 +1,6 @@
-import { View } from "ui/core/view";
-import { TextBase } from "ui/text-base";
-import { Device } from "platform";
+import { View } from "tns-core-modules/ui/core/view";
+import { TextBase } from "tns-core-modules/ui/text-base";
+import { Device } from "tns-core-modules/platform";
 
 function getChildren(view: View): Array<View> {
     let children: Array<View> = [];
diff --git a/tests/app/tests/third-party-view.ts b/tests/app/tests/third-party-view.ts
index e9b371d73..af933f5da 100644
--- a/tests/app/tests/third-party-view.ts
+++ b/tests/app/tests/third-party-view.ts
@@ -1,4 +1,4 @@
-import {ContentView} from "ui/content-view";
+import {ContentView} from "tns-core-modules/ui/content-view";
 
 // >> third-party-simple-view
 export class SimpleTag extends ContentView {
diff --git a/tests/app/tests/third-party.ts b/tests/app/tests/third-party.ts
index 4cb3d2368..ccea47166 100644
--- a/tests/app/tests/third-party.ts
+++ b/tests/app/tests/third-party.ts
@@ -1,8 +1,8 @@
 // make sure you import mocha-config before @angular/core
 import {assert} from "./test-config";
 import {Component, ComponentRef, Directive, TemplateRef, ViewContainerRef} from "@angular/core";
-import {View} from "ui/core/view";
-import {Label} from "ui/label";
+import {View} from "tns-core-modules/ui/core/view";
+import {Label} from "tns-core-modules/ui/label";
 import {nsTestBedAfterEach, nsTestBedBeforeEach, nsTestBedRender} from "nativescript-angular/testing";
 // >> third-party-simple-view-registration
 import {registerElement} from "nativescript-angular/element-registry";
diff --git a/tests/app/tests/value-accessor-tests.ts b/tests/app/tests/value-accessor-tests.ts
index eff50e672..89869a04c 100644
--- a/tests/app/tests/value-accessor-tests.ts
+++ b/tests/app/tests/value-accessor-tests.ts
@@ -1,12 +1,12 @@
 // make sure you import mocha-config before @angular/core
 import { assert } from "./test-config";
-import { View } from "ui/core/view";
-import { Slider } from "ui/slider";
-import { Switch } from "ui/switch";
-import { DatePicker } from "ui/date-picker";
-import { TimePicker } from "ui/time-picker";
-import { ListPicker } from "ui/list-picker";
-import { TextField } from "ui/text-field";
+import { View } from "tns-core-modules/ui/core/view";
+import { Slider } from "tns-core-modules/ui/slider";
+import { Switch } from "tns-core-modules/ui/switch";
+import { DatePicker } from "tns-core-modules/ui/date-picker";
+import { TimePicker } from "tns-core-modules/ui/time-picker";
+import { ListPicker } from "tns-core-modules/ui/list-picker";
+import { TextField } from "tns-core-modules/ui/text-field";
 import {
     NumberValueAccessor,
     CheckedValueAccessor,