diff --git a/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts b/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts
index 6b22b0c1a1..66b5244a84 100644
--- a/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts
+++ b/src/components/action-sheet/test/basic/pages/modal-page/modal-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ViewController } from '../../../../../..';
+import { IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'modal-page'
 })
 @Component({
diff --git a/src/components/action-sheet/test/basic/pages/page-one/page-one.ts b/src/components/action-sheet/test/basic/pages/page-one/page-one.ts
index d6c7c8b6ba..012bb7c6e1 100644
--- a/src/components/action-sheet/test/basic/pages/page-one/page-one.ts
+++ b/src/components/action-sheet/test/basic/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ActionSheetController, AlertController, DeepLink, ModalController, Platform } from '../../../../../..';
+import { ActionSheetController, AlertController, IonicPage, ModalController, Platform } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/alert/test/basic/pages/modal-page/modal-page.ts b/src/components/alert/test/basic/pages/modal-page/modal-page.ts
index fadb3620d4..75ee285c68 100644
--- a/src/components/alert/test/basic/pages/modal-page/modal-page.ts
+++ b/src/components/alert/test/basic/pages/modal-page/modal-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ViewController } from '../../../../../..';
+import { IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'modal-page'
 })
 @Component({
diff --git a/src/components/alert/test/basic/pages/page-one/page-one.ts b/src/components/alert/test/basic/pages/page-one/page-one.ts
index 0c2e7d4133..e69b4803b7 100644
--- a/src/components/alert/test/basic/pages/page-one/page-one.ts
+++ b/src/components/alert/test/basic/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { AlertController, DeepLink, ModalController } from '../../../../../..';
+import { AlertController, IonicPage, ModalController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/app/test/cordova/pages/modal/modal-page.ts b/src/components/app/test/cordova/pages/modal/modal-page.ts
index 91670a65b9..79b5e44fef 100644
--- a/src/components/app/test/cordova/pages/modal/modal-page.ts
+++ b/src/components/app/test/cordova/pages/modal/modal-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ViewController } from '../../../../../..';
+import { IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'modal-page'
 })
 @Component({
diff --git a/src/components/app/test/cordova/pages/page-one/page-one.ts b/src/components/app/test/cordova/pages/page-one/page-one.ts
index 2bce7a0b0c..1fdf0802de 100644
--- a/src/components/app/test/cordova/pages/page-one/page-one.ts
+++ b/src/components/app/test/cordova/pages/page-one/page-one.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
 import { SomeData } from './provider-one';
 import { OtherData } from './provider-two';
 
-@DeepLink({
+@IonicPage({
   name: 'page-one'
 })
 @Component({
diff --git a/src/components/app/test/cordova/pages/page-three/page-three.ts b/src/components/app/test/cordova/pages/page-three/page-three.ts
index 28df360723..815a519136 100644
--- a/src/components/app/test/cordova/pages/page-three/page-three.ts
+++ b/src/components/app/test/cordova/pages/page-three/page-three.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'page-three'
 })
 @Component({
diff --git a/src/components/app/test/cordova/pages/page-two/page-two.ts b/src/components/app/test/cordova/pages/page-two/page-two.ts
index 71d73c6a3c..7881e90b8a 100644
--- a/src/components/app/test/cordova/pages/page-two/page-two.ts
+++ b/src/components/app/test/cordova/pages/page-two/page-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ModalController } from '../../../../../..';
+import { IonicPage, ModalController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'page-two'
 })
 @Component({
diff --git a/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts b/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts
index 20f9b2601c..c87f1e8c97 100644
--- a/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts
+++ b/src/components/app/test/cordova/pages/tabs-page-one/tabs-page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tabs-page-one'
 })
 @Component({
diff --git a/src/components/app/test/cordova/pages/tabs/tabs-page.ts b/src/components/app/test/cordova/pages/tabs/tabs-page.ts
index 7db12354de..36cac4bfd1 100644
--- a/src/components/app/test/cordova/pages/tabs/tabs-page.ts
+++ b/src/components/app/test/cordova/pages/tabs/tabs-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tabs-page'
 })
 @Component({
diff --git a/src/components/app/test/gesture-collision/pages/page-one/page-one.ts b/src/components/app/test/gesture-collision/pages/page-one/page-one.ts
index e32fac90de..c9a60bf501 100644
--- a/src/components/app/test/gesture-collision/pages/page-one/page-one.ts
+++ b/src/components/app/test/gesture-collision/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component, ViewChild } from '@angular/core';
-import { DeepLink, MenuController, Nav } from '../../../../../..';
+import { IonicPage, MenuController, Nav } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'page-one'
 })
 @Component({
diff --git a/src/components/app/test/gesture-collision/pages/page-two/page-two.ts b/src/components/app/test/gesture-collision/pages/page-two/page-two.ts
index c363a05ee1..edfbb4555d 100644
--- a/src/components/app/test/gesture-collision/pages/page-two/page-two.ts
+++ b/src/components/app/test/gesture-collision/pages/page-two/page-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { AlertController, DeepLink, NavController, Refresher } from '../../../../../..';
+import { AlertController, IonicPage, NavController, Refresher } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'page-two'
 })
 @Component({
diff --git a/src/components/item/test/groups/pages/session-detail/session-detail.ts b/src/components/item/test/groups/pages/session-detail/session-detail.ts
index f8c2df8a0f..828ecf3c0d 100644
--- a/src/components/item/test/groups/pages/session-detail/session-detail.ts
+++ b/src/components/item/test/groups/pages/session-detail/session-detail.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController, NavParams } from '../../../../../..';
+import { IonicPage, NavController, NavParams } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'session-detail.html'
 })
diff --git a/src/components/item/test/groups/pages/session-list/session-list.ts b/src/components/item/test/groups/pages/session-list/session-list.ts
index ae67f499f2..6bce8bc1a8 100644
--- a/src/components/item/test/groups/pages/session-list/session-list.ts
+++ b/src/components/item/test/groups/pages/session-list/session-list.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'session-list.html'
 })
diff --git a/src/components/list/test/inset/pages/page-one/page-one.ts b/src/components/list/test/inset/pages/page-one/page-one.ts
index 57f5283bb5..9c18e89a88 100644
--- a/src/components/list/test/inset/pages/page-one/page-one.ts
+++ b/src/components/list/test/inset/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/list/test/no-lines/pages/page-one/page-one.ts b/src/components/list/test/no-lines/pages/page-one/page-one.ts
index 57f5283bb5..9c18e89a88 100644
--- a/src/components/list/test/no-lines/pages/page-one/page-one.ts
+++ b/src/components/list/test/no-lines/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/loading/test/basic/pages/page-one/page-one.ts b/src/components/loading/test/basic/pages/page-one/page-one.ts
index f6e5757e1c..59aaee041d 100644
--- a/src/components/loading/test/basic/pages/page-one/page-one.ts
+++ b/src/components/loading/test/basic/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, LoadingController, NavController } from '../../../../../..';
+import { IonicPage, LoadingController, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html',
   styles: [
diff --git a/src/components/loading/test/basic/pages/page-three/page-three.ts b/src/components/loading/test/basic/pages/page-three/page-three.ts
index bfcc20012c..efd1c724d8 100644
--- a/src/components/loading/test/basic/pages/page-three/page-three.ts
+++ b/src/components/loading/test/basic/pages/page-three/page-three.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-three.html'
 })
diff --git a/src/components/loading/test/basic/pages/page-two/page-two.ts b/src/components/loading/test/basic/pages/page-two/page-two.ts
index 41f8c428fc..1542612d73 100644
--- a/src/components/loading/test/basic/pages/page-two/page-two.ts
+++ b/src/components/loading/test/basic/pages/page-two/page-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-two.html'
 })
diff --git a/src/components/loading/test/tabs/pages/page-one/page-one.ts b/src/components/loading/test/tabs/pages/page-one/page-one.ts
index c58178de3b..19fabbae85 100644
--- a/src/components/loading/test/tabs/pages/page-one/page-one.ts
+++ b/src/components/loading/test/tabs/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, LoadingController, NavController } from '../../../../../..';
+import { IonicPage, LoadingController, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/loading/test/tabs/pages/page-two/page-two.ts b/src/components/loading/test/tabs/pages/page-two/page-two.ts
index cf57da059d..9badbd33e5 100644
--- a/src/components/loading/test/tabs/pages/page-two/page-two.ts
+++ b/src/components/loading/test/tabs/pages/page-two/page-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-two.html'
 })
diff --git a/src/components/loading/test/tabs/pages/tabs-page/tabs-page.ts b/src/components/loading/test/tabs/pages/tabs-page/tabs-page.ts
index 1501d8d95b..9e36a52c3b 100644
--- a/src/components/loading/test/tabs/pages/tabs-page/tabs-page.ts
+++ b/src/components/loading/test/tabs/pages/tabs-page/tabs-page.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
 import { PageOne} from '../page-one/page-one';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'tabs-page.html'
 })
diff --git a/src/components/menu/test/basic/pages/modal-page/modal-page.ts b/src/components/menu/test/basic/pages/modal-page/modal-page.ts
index 66b6884d72..daf367cd24 100644
--- a/src/components/menu/test/basic/pages/modal-page/modal-page.ts
+++ b/src/components/menu/test/basic/pages/modal-page/modal-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ViewController } from '../../../../../..';
+import { IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'modal-page.html'
 })
diff --git a/src/components/menu/test/basic/pages/page-four/page-four.ts b/src/components/menu/test/basic/pages/page-four/page-four.ts
index 5f71a46c1f..08a080156b 100644
--- a/src/components/menu/test/basic/pages/page-four/page-four.ts
+++ b/src/components/menu/test/basic/pages/page-four/page-four.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-four.html'
 })
diff --git a/src/components/menu/test/basic/pages/page-one/page-one.ts b/src/components/menu/test/basic/pages/page-one/page-one.ts
index 2051b5d789..60115306ef 100644
--- a/src/components/menu/test/basic/pages/page-one/page-one.ts
+++ b/src/components/menu/test/basic/pages/page-one/page-one.ts
@@ -1,9 +1,9 @@
 import { Component, ViewChild } from '@angular/core';
-import { DeepLink, MenuController, Nav } from '../../../../../..';
+import { IonicPage, MenuController, Nav } from '../../../../../..';
 
 import { PageTwo } from '../page-two/page-two';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/menu/test/basic/pages/page-three/page-three.ts b/src/components/menu/test/basic/pages/page-three/page-three.ts
index 9b908bad19..9427fade68 100644
--- a/src/components/menu/test/basic/pages/page-three/page-three.ts
+++ b/src/components/menu/test/basic/pages/page-three/page-three.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-three.html'
 })
diff --git a/src/components/menu/test/basic/pages/page-two/page-two.ts b/src/components/menu/test/basic/pages/page-two/page-two.ts
index bb8003fed9..207a6461ee 100644
--- a/src/components/menu/test/basic/pages/page-two/page-two.ts
+++ b/src/components/menu/test/basic/pages/page-two/page-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { AlertController, DeepLink, ModalController, NavController } from '../../../../../..';
+import { AlertController, IonicPage, ModalController, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-two.html'
 })
diff --git a/src/components/modal/test/basic/pages/contact-us/contact-us.ts b/src/components/modal/test/basic/pages/contact-us/contact-us.ts
index 3fb47ea212..24a0c9bd21 100644
--- a/src/components/modal/test/basic/pages/contact-us/contact-us.ts
+++ b/src/components/modal/test/basic/pages/contact-us/contact-us.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'contact-us.html'
 })
diff --git a/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.ts b/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.ts
index 8047d4c637..c675f571a4 100644
--- a/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.ts
+++ b/src/components/modal/test/basic/pages/modal-pass-data/modal-pass-data.ts
@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
-import { AlertController, DeepLink, NavParams, ToastController, ViewController } from '../../../../../..';
+import { AlertController, IonicPage, NavParams, ToastController, ViewController } from '../../../../../..';
 
 import { SomeAppProvider } from '../../services/some-app-provider';
 import { SomeComponentProvider } from './provider';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'modal-pass-data.html',
   providers: [
diff --git a/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.ts b/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.ts
index ad6f53388e..662e4c4b5d 100644
--- a/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.ts
+++ b/src/components/modal/test/basic/pages/modal-with-inputs/modal-with-inputs.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ViewController } from '../../../../../..';
+import { IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'modal-with-inputs.html'
 })
diff --git a/src/components/modal/test/basic/pages/page-one/page-one.ts b/src/components/modal/test/basic/pages/page-one/page-one.ts
index d5449b1648..cc9f73f076 100644
--- a/src/components/modal/test/basic/pages/page-one/page-one.ts
+++ b/src/components/modal/test/basic/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { Config, DeepLink, NavController, ModalController, ToastController, Platform } from '../../../../../..';
+import { Config, IonicPage, NavController, ModalController, ToastController, Platform } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/modal/test/basic/pages/page-three/page-three.ts b/src/components/modal/test/basic/pages/page-three/page-three.ts
index df1faeda90..8516bd0a8e 100644
--- a/src/components/modal/test/basic/pages/page-three/page-three.ts
+++ b/src/components/modal/test/basic/pages/page-three/page-three.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController, NavParams } from '../../../../../..';
+import { IonicPage, NavController, NavParams } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-three.html'
 })
diff --git a/src/components/modal/test/basic/pages/page-two/page-two.ts b/src/components/modal/test/basic/pages/page-two/page-two.ts
index 122c1837a2..64e111fb32 100644
--- a/src/components/modal/test/basic/pages/page-two/page-two.ts
+++ b/src/components/modal/test/basic/pages/page-two/page-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, ActionSheetController, AlertController, DeepLink, ModalController, NavController, ToastController } from '../../../../../..';
+import { App, ActionSheetController, AlertController, IonicPage, ModalController, NavController, ToastController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-two.html'
 })
diff --git a/src/components/modal/test/basic/pages/toolbar/toolbar.ts b/src/components/modal/test/basic/pages/toolbar/toolbar.ts
index f8a5628ca0..bf42b8c3b7 100644
--- a/src/components/modal/test/basic/pages/toolbar/toolbar.ts
+++ b/src/components/modal/test/basic/pages/toolbar/toolbar.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { AlertController, DeepLink, ViewController } from '../../../../../..';
+import { AlertController, IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'toolbar.html'
 })
diff --git a/src/components/nav/test/basic/pages/another-page/another-page.ts b/src/components/nav/test/basic/pages/another-page/another-page.ts
index 5219d90afb..27ca3283c1 100644
--- a/src/components/nav/test/basic/pages/another-page/another-page.ts
+++ b/src/components/nav/test/basic/pages/another-page/another-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController, ViewController } from '../../../../../..';
+import { IonicPage, NavController, ViewController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'another-page'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/first-page/first-page.ts b/src/components/nav/test/basic/pages/first-page/first-page.ts
index ccf320eb1e..1fc238c2d1 100644
--- a/src/components/nav/test/basic/pages/first-page/first-page.ts
+++ b/src/components/nav/test/basic/pages/first-page/first-page.ts
@@ -1,9 +1,9 @@
 import { Component, ViewChild } from '@angular/core';
-import { AlertController, Content, DeepLink, NavController, ViewController } from '../../../../../..';
+import { AlertController, Content, IonicPage, NavController, ViewController } from '../../../../../..';
 
 import { MyCmpTest } from './my-component';
 
-@DeepLink({
+@IonicPage({
   name: 'first-page'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/full-page/full-page.ts b/src/components/nav/test/basic/pages/full-page/full-page.ts
index d7828a48fc..18c5cd15e6 100644
--- a/src/components/nav/test/basic/pages/full-page/full-page.ts
+++ b/src/components/nav/test/basic/pages/full-page/full-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, AlertController, DeepLink, NavController, NavParams, ViewController } from '../../../../../..';
+import { App, AlertController, IonicPage, NavController, NavParams, ViewController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'full-page'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts b/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts
index 8eda3c1924..593efbce48 100644
--- a/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts
+++ b/src/components/nav/test/basic/pages/primary-header-page/primary-header-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { AlertController, DeepLink, NavController, ViewController } from '../../../../../..';
+import { AlertController, IonicPage, NavController, ViewController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'primary-header-page'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts b/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts
index 7a523c0c52..d712ef5642 100644
--- a/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts
+++ b/src/components/nav/test/basic/pages/redirect-page/redirect-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'redirect-page'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts b/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts
index 9197bbe921..2c77784e7c 100644
--- a/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts
+++ b/src/components/nav/test/basic/pages/tab-item-page/tab-item-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, DeepLink, Tabs} from '../../../../../..';
+import { App, IonicPage, Tabs} from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab-item-page'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/tab-one/tab-one.ts b/src/components/nav/test/basic/pages/tab-one/tab-one.ts
index 7f17282a65..3d23f2ea44 100644
--- a/src/components/nav/test/basic/pages/tab-one/tab-one.ts
+++ b/src/components/nav/test/basic/pages/tab-one/tab-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, DeepLink, NavController, Tabs } from '../../../../../..';
+import { App, IonicPage, NavController, Tabs } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab-one'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/tab-three/tab-three.ts b/src/components/nav/test/basic/pages/tab-three/tab-three.ts
index 7f380ab05f..dfecf2d3d7 100644
--- a/src/components/nav/test/basic/pages/tab-three/tab-three.ts
+++ b/src/components/nav/test/basic/pages/tab-three/tab-three.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { AlertController, App, DeepLink, ModalController, Tabs } from '../../../../../..';
+import { AlertController, App, IonicPage, ModalController, Tabs } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab-three'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/tab-two/tab-two.ts b/src/components/nav/test/basic/pages/tab-two/tab-two.ts
index c9342647ca..b1b6ee523f 100644
--- a/src/components/nav/test/basic/pages/tab-two/tab-two.ts
+++ b/src/components/nav/test/basic/pages/tab-two/tab-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, DeepLink, Tabs } from '../../../../../..';
+import { App, IonicPage, Tabs } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab-two'
 })
 @Component({
diff --git a/src/components/nav/test/basic/pages/tabs/tabs.ts b/src/components/nav/test/basic/pages/tabs/tabs.ts
index 15e8e331fa..b7c41b6715 100644
--- a/src/components/nav/test/basic/pages/tabs/tabs.ts
+++ b/src/components/nav/test/basic/pages/tabs/tabs.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, Tab } from '../../../../../..';
+import { IonicPage, Tab } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tabs'
 })
 @Component({
diff --git a/src/components/nav/test/child-navs/pages/first-page/first-page.ts b/src/components/nav/test/child-navs/pages/first-page/first-page.ts
index c44a231484..8fc7fe11a9 100644
--- a/src/components/nav/test/child-navs/pages/first-page/first-page.ts
+++ b/src/components/nav/test/child-navs/pages/first-page/first-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/nav/test/child-navs/pages/fourth-page/fourth-page.ts b/src/components/nav/test/child-navs/pages/fourth-page/fourth-page.ts
index 46586e0bc4..d6ed4e8cf9 100644
--- a/src/components/nav/test/child-navs/pages/fourth-page/fourth-page.ts
+++ b/src/components/nav/test/child-navs/pages/fourth-page/fourth-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   template: `
   <ion-content>
diff --git a/src/components/nav/test/child-navs/pages/landing-page/landing-page.ts b/src/components/nav/test/child-navs/pages/landing-page/landing-page.ts
index cc43f46d7b..93703f3365 100644
--- a/src/components/nav/test/child-navs/pages/landing-page/landing-page.ts
+++ b/src/components/nav/test/child-navs/pages/landing-page/landing-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/nav/test/child-navs/pages/second-page/second-page.ts b/src/components/nav/test/child-navs/pages/second-page/second-page.ts
index 2feab389a5..f6bec58c6c 100644
--- a/src/components/nav/test/child-navs/pages/second-page/second-page.ts
+++ b/src/components/nav/test/child-navs/pages/second-page/second-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/nav/test/child-navs/pages/third-page/third-page.ts b/src/components/nav/test/child-navs/pages/third-page/third-page.ts
index 39961e88a0..f9447194ab 100644
--- a/src/components/nav/test/child-navs/pages/third-page/third-page.ts
+++ b/src/components/nav/test/child-navs/pages/third-page/third-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   template: `
   <ion-header>
diff --git a/src/components/picker/test/basic/pages/page-one/page-one.ts b/src/components/picker/test/basic/pages/page-one/page-one.ts
index d66e5fc352..c00e384150 100644
--- a/src/components/picker/test/basic/pages/page-one/page-one.ts
+++ b/src/components/picker/test/basic/pages/page-one/page-one.ts
@@ -1,8 +1,8 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 
-import { DeepLink, NavController, PickerController } from '../../../../../..';
+import { IonicPage, NavController, PickerController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html',
   encapsulation: ViewEncapsulation.None,
diff --git a/src/components/popover/test/basic/pages/page-one/page-one.ts b/src/components/popover/test/basic/pages/page-one/page-one.ts
index 22c5b7f552..e1355283fc 100644
--- a/src/components/popover/test/basic/pages/page-one/page-one.ts
+++ b/src/components/popover/test/basic/pages/page-one/page-one.ts
@@ -1,8 +1,8 @@
 import { Component, ViewChild, ElementRef } from '@angular/core';
 
-import { DeepLink, PopoverController } from '../../../../../..';
+import { IonicPage, PopoverController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html',
   selector: 'e2e-popover-basic'
diff --git a/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts
index 8319782d94..c899992f93 100644
--- a/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts
+++ b/src/components/popover/test/basic/pages/popover-list-page/popover-list-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ViewController } from '../../../../../..';
+import { IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'popover-list-page.html'
 })
diff --git a/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts
index 22d011af44..8affd53d8a 100644
--- a/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts
+++ b/src/components/popover/test/basic/pages/popover-long-list-page/popover-long-list-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'popover-long-list-page.html'
 })
diff --git a/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts
index 5210778d98..e98c8e66a3 100644
--- a/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts
+++ b/src/components/popover/test/basic/pages/popover-radio-page/popover-radio-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavParams } from '../../../../../..';
+import { IonicPage, NavParams } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'popover-radio-page.html',
   selector: 'e2e-popover-basic'
diff --git a/src/components/radio/test/basic/pages/page-one/page-one.ts b/src/components/radio/test/basic/pages/page-one/page-one.ts
index 3e39410caa..d3fd3e7ee7 100644
--- a/src/components/radio/test/basic/pages/page-one/page-one.ts
+++ b/src/components/radio/test/basic/pages/page-one/page-one.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 
-import { DeepLink, RadioButton, RadioGroup } from '../../../../../..';
+import { IonicPage, RadioButton, RadioGroup } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/searchbar/test/basic/pages/root-page/root-page.ts b/src/components/searchbar/test/basic/pages/root-page/root-page.ts
index 7ba0f36a29..3027cf40e0 100644
--- a/src/components/searchbar/test/basic/pages/root-page/root-page.ts
+++ b/src/components/searchbar/test/basic/pages/root-page/root-page.ts
@@ -1,7 +1,7 @@
 import { Component, ChangeDetectorRef } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'root-page.html'
 })
diff --git a/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts b/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
index ede0a13cd2..dace0d2c72 100644
--- a/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
+++ b/src/components/searchbar/test/nav/pages/detail-page/detail-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavParams } from '../../../../../..';
+import { IonicPage, NavParams } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'detail-page.html'
 })
diff --git a/src/components/searchbar/test/nav/pages/main-page/main-page.ts b/src/components/searchbar/test/nav/pages/main-page/main-page.ts
index 9c1e8d5257..6f8568abf1 100644
--- a/src/components/searchbar/test/nav/pages/main-page/main-page.ts
+++ b/src/components/searchbar/test/nav/pages/main-page/main-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'main-page.html'
 })
diff --git a/src/components/searchbar/test/nav/pages/modal-page/modal-page.ts b/src/components/searchbar/test/nav/pages/modal-page/modal-page.ts
index 4c49f9cb26..4894b303c2 100644
--- a/src/components/searchbar/test/nav/pages/modal-page/modal-page.ts
+++ b/src/components/searchbar/test/nav/pages/modal-page/modal-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ViewController } from '../../../../../..';
+import { IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'modal-page.html'
 })
diff --git a/src/components/searchbar/test/nav/pages/search-page/search-page.ts b/src/components/searchbar/test/nav/pages/search-page/search-page.ts
index 671d637615..316029c459 100644
--- a/src/components/searchbar/test/nav/pages/search-page/search-page.ts
+++ b/src/components/searchbar/test/nav/pages/search-page/search-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController, ModalController } from '../../../../../..';
+import { IonicPage, NavController, ModalController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'search-page.html'
 })
diff --git a/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.ts b/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.ts
index e77e73c890..3455600d74 100644
--- a/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.ts
+++ b/src/components/searchbar/test/nav/pages/tabs-page/tabs-page.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
 import { SearchPage } from '../search-page/search-page';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'tabs-page.html'
 })
diff --git a/src/components/segment/test/basic/pages/home-page/home-page.ts b/src/components/segment/test/basic/pages/home-page/home-page.ts
index 08fb938067..6f6728025e 100644
--- a/src/components/segment/test/basic/pages/home-page/home-page.ts
+++ b/src/components/segment/test/basic/pages/home-page/home-page.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 import { FormBuilder, Validators } from '@angular/forms';
-import { DeepLink, SegmentButton } from '../../../../../..';
+import { IonicPage, SegmentButton } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'home-page.html'
 })
diff --git a/src/components/segment/test/nav/pages/first-page/first-page.ts b/src/components/segment/test/nav/pages/first-page/first-page.ts
index 787bf26e6e..985a123857 100644
--- a/src/components/segment/test/nav/pages/first-page/first-page.ts
+++ b/src/components/segment/test/nav/pages/first-page/first-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController } from '../../../../../..';
+import { IonicPage, NavController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'first-page.html'
 })
diff --git a/src/components/segment/test/nav/pages/second-page/second-page.ts b/src/components/segment/test/nav/pages/second-page/second-page.ts
index 8f459145ac..3d0c465199 100644
--- a/src/components/segment/test/nav/pages/second-page/second-page.ts
+++ b/src/components/segment/test/nav/pages/second-page/second-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'second-page.html'
 })
diff --git a/src/components/select/test/multiple-value/pages/page-one/page-one.ts b/src/components/select/test/multiple-value/pages/page-one/page-one.ts
index 409f6010bd..701530d7cd 100644
--- a/src/components/select/test/multiple-value/pages/page-one/page-one.ts
+++ b/src/components/select/test/multiple-value/pages/page-one/page-one.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/select/test/single-value/pages/page-one/page-one.ts b/src/components/select/test/single-value/pages/page-one/page-one.ts
index fbb4952bc7..6ece493507 100644
--- a/src/components/select/test/single-value/pages/page-one/page-one.ts
+++ b/src/components/select/test/single-value/pages/page-one/page-one.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
 export interface Currency {
   symbol: string;
@@ -8,7 +8,7 @@ export interface Currency {
   name: string;
 }
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.ts b/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.ts
index 4481b9ba8c..8c6ad2d2f7 100644
--- a/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.ts
+++ b/src/components/tabs/test/advanced/pages/modal-chat-page/modal-chat-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, ViewController } from '../../../../../..';
+import { IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'modal-chat-page'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.ts b/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.ts
index 528760c956..877debe0eb 100644
--- a/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.ts
+++ b/src/components/tabs/test/advanced/pages/signin-page/sign-in-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'sign-in'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
index 96acb45c3a..46ee24017c 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page1/tab1-page1.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, DeepLink, NavController, NavParams, Tabs } from '../../../../../..';
+import { App, IonicPage, NavController, NavParams, Tabs } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab1-page1'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.ts b/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.ts
index 3e8d92c3b4..619c7bd850 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page2/tab1-page2.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, Tabs } from '../../../../../..';
+import { IonicPage, Tabs } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab1-page2'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.ts b/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.ts
index 79dfedd362..a4a5d52bf1 100644
--- a/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.ts
+++ b/src/components/tabs/test/advanced/pages/tab1-page3/tab1-page3.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab1-page3'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.ts b/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.ts
index 74d8ca45ec..c2b6e96b55 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page1/tab2-page1.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab2-page1'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.ts b/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.ts
index bc62c31428..eaa9f7bc44 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page2/tab2-page2.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab2-page2'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.ts b/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.ts
index 2a7ebec6c8..7753be4b43 100644
--- a/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.ts
+++ b/src/components/tabs/test/advanced/pages/tab2-page3/tab2-page3.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController} from '../../../../../..';
+import { IonicPage, NavController} from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab2-page3'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.ts b/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.ts
index 5221d3c2ea..9c9e2b9a76 100644
--- a/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.ts
+++ b/src/components/tabs/test/advanced/pages/tab3-page1/tab3-page1.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tab3-page1'
 })
 @Component({
diff --git a/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts b/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
index 7f9d6a672f..2104292d6d 100644
--- a/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
+++ b/src/components/tabs/test/advanced/pages/tabs-page/tabs.ts
@@ -1,7 +1,7 @@
 import { Component, ViewChild } from '@angular/core';
-import { AlertController, DeepLink, NavController, NavParams, ModalController, Tabs, Tab } from '../../../../../..';
+import { AlertController, IonicPage, NavController, NavParams, ModalController, Tabs, Tab } from '../../../../../..';
 
-@DeepLink({
+@IonicPage({
   name: 'tabs-page'
 })
 @Component({
diff --git a/src/components/tabs/test/badges/pages/page-one/page-one.ts b/src/components/tabs/test/badges/pages/page-one/page-one.ts
index a6c2e51cd2..c2ec840642 100644
--- a/src/components/tabs/test/badges/pages/page-one/page-one.ts
+++ b/src/components/tabs/test/badges/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   template: 'hi'
 })
diff --git a/src/components/tabs/test/basic/pages/modal-page/modal-page.ts b/src/components/tabs/test/basic/pages/modal-page/modal-page.ts
index c58ce21236..7a2b2f80b7 100644
--- a/src/components/tabs/test/basic/pages/modal-page/modal-page.ts
+++ b/src/components/tabs/test/basic/pages/modal-page/modal-page.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, DeepLink, ViewController } from '../../../../../..';
+import { App, IonicPage, ViewController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'modal-page.html'
 })
diff --git a/src/components/tabs/test/basic/pages/tab-one/tab-one.ts b/src/components/tabs/test/basic/pages/tab-one/tab-one.ts
index a820171c77..bcf163c7c9 100644
--- a/src/components/tabs/test/basic/pages/tab-one/tab-one.ts
+++ b/src/components/tabs/test/basic/pages/tab-one/tab-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, DeepLink, Tabs } from '../../../../../..';
+import { App, IonicPage, Tabs } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'tab-one.html'
 })
diff --git a/src/components/tabs/test/basic/pages/tab-three/tab-three.ts b/src/components/tabs/test/basic/pages/tab-three/tab-three.ts
index 475860ebb0..a2ea8659c9 100644
--- a/src/components/tabs/test/basic/pages/tab-three/tab-three.ts
+++ b/src/components/tabs/test/basic/pages/tab-three/tab-three.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, AlertController, DeepLink, ModalController, Tabs } from '../../../../../..';
+import { App, AlertController, IonicPage, ModalController, Tabs } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'tab-three.html'
 })
diff --git a/src/components/tabs/test/basic/pages/tab-two/tab-two.ts b/src/components/tabs/test/basic/pages/tab-two/tab-two.ts
index 48d3a71eaa..e8bae3cba0 100644
--- a/src/components/tabs/test/basic/pages/tab-two/tab-two.ts
+++ b/src/components/tabs/test/basic/pages/tab-two/tab-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { App, DeepLink, Tabs } from '../../../../../..';
+import { App, IonicPage, Tabs } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'tab-two.html'
 })
diff --git a/src/components/tabs/test/basic/pages/tabs-page/tabs-page.ts b/src/components/tabs/test/basic/pages/tabs-page/tabs-page.ts
index a65d2837f4..ea16f3aec2 100644
--- a/src/components/tabs/test/basic/pages/tabs-page/tabs-page.ts
+++ b/src/components/tabs/test/basic/pages/tabs-page/tabs-page.ts
@@ -1,9 +1,9 @@
 import { Component } from '@angular/core';
-import { Config, DeepLink, Tab } from '../../../../../..';
+import { Config, IonicPage, Tab } from '../../../../../..';
 
 import { TabOne } from '../tab-one/tab-one';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'tabs-page.html'
 })
diff --git a/src/components/tabs/test/colors/pages/page-one/page-one.ts b/src/components/tabs/test/colors/pages/page-one/page-one.ts
index a6c2e51cd2..c2ec840642 100644
--- a/src/components/tabs/test/colors/pages/page-one/page-one.ts
+++ b/src/components/tabs/test/colors/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   template: 'hi'
 })
diff --git a/src/components/toast/test/basic/pages/page-one/page-one.ts b/src/components/toast/test/basic/pages/page-one/page-one.ts
index 0718f5490b..0e74313d73 100644
--- a/src/components/toast/test/basic/pages/page-one/page-one.ts
+++ b/src/components/toast/test/basic/pages/page-one/page-one.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink, NavController, Toast, ToastController } from '../../../../../..';
+import { IonicPage, NavController, Toast, ToastController } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-one.html'
 })
diff --git a/src/components/toast/test/basic/pages/page-two/page-two.ts b/src/components/toast/test/basic/pages/page-two/page-two.ts
index cf57da059d..9badbd33e5 100644
--- a/src/components/toast/test/basic/pages/page-two/page-two.ts
+++ b/src/components/toast/test/basic/pages/page-two/page-two.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { DeepLink } from '../../../../../..';
+import { IonicPage } from '../../../../../..';
 
-@DeepLink()
+@IonicPage()
 @Component({
   templateUrl: 'page-two.html'
 })
diff --git a/src/index.ts b/src/index.ts
index a46eae6a48..f0f199e5c3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -278,7 +278,7 @@ export { DeepLinker } from './navigation/deep-linker';
 export { NavController } from './navigation/nav-controller';
 export { NavControllerBase } from './navigation/nav-controller-base';
 export { NavParams } from './navigation/nav-params';
-export { NavLink, NavOptions, DeepLink, DeepLinkConfig, DeepLinkMetadata, DeepLinkMetadataFactory, DeepLinkMetadataType } from './navigation/nav-util';
+export { NavLink, NavOptions, IonicPage, DeepLinkConfig, DeepLinkMetadata, DeepLinkMetadataFactory, DeepLinkMetadataType } from './navigation/nav-util';
 export { UrlSerializer, DeepLinkConfigToken } from './navigation/url-serializer';
 export { ViewController } from './navigation/view-controller';
 export { ActionSheetCmp } from './components/action-sheet/action-sheet-component';
diff --git a/src/navigation/nav-util.ts b/src/navigation/nav-util.ts
index 1c294d3e50..54a7dede44 100644
--- a/src/navigation/nav-util.ts
+++ b/src/navigation/nav-util.ts
@@ -101,7 +101,7 @@ export function isNav(nav: any): boolean {
   return !!nav && !!nav.push;
 }
 
-export function DeepLink(config?: DeepLinkMetadataType): ClassDecorator {
+export function IonicPage(config?: DeepLinkMetadataType): ClassDecorator {
   return function(clazz: any) {
     return clazz;
   };