diff --git a/demos/component-docs/action-sheets/basic/pages.ts b/demos/component-docs/action-sheets/basic/pages.ts
index be890cd7e5..894a4a42c6 100644
--- a/demos/component-docs/action-sheets/basic/pages.ts
+++ b/demos/component-docs/action-sheets/basic/pages.ts
@@ -49,13 +49,13 @@ export class BasicPage {
       destructiveText: 'Delete',
       titleText: 'Albums',
       cancelText: 'Cancel',
-      cancel: function() {
+      cancel: () => {
         console.log('Canceled');
       },
       destructiveButtonClicked: () => {
         console.log('Destructive clicked');
       },
-      buttonClicked: function(index) {
+      buttonClicked: (index) => {
         console.log('Button clicked', index);
         if (index == 1) { return false; }
         return true;
diff --git a/demos/component-docs/tabs/basic/pages.ts b/demos/component-docs/tabs/basic/pages.ts
index 1a8577c7d2..1154657ec0 100644
--- a/demos/component-docs/tabs/basic/pages.ts
+++ b/demos/component-docs/tabs/basic/pages.ts
@@ -13,7 +13,7 @@ import * as helpers from '../../helpers';
     '</ion-content>',
   directives: [forwardRef(() => helpers.AndroidAttribute)],
 })
-class TabTextCtrl {
+class TabTextPage {
   constructor() {
   }
 }
@@ -28,8 +28,8 @@ class TabTextCtrl {
 })
 export class BasicPage {
   constructor() {
-    this.tabOne = TabTextCtrl;
-    this.tabTwo = TabTextCtrl;
-    this.tabThree = TabTextCtrl;
+    this.tabOne = TabTextPage;
+    this.tabTwo = TabTextPage;
+    this.tabThree = TabTextPage;
   }
 }
diff --git a/demos/component-docs/tabs/icon-text/pages.ts b/demos/component-docs/tabs/icon-text/pages.ts
index a490ef6e1c..1d19314bb8 100644
--- a/demos/component-docs/tabs/icon-text/pages.ts
+++ b/demos/component-docs/tabs/icon-text/pages.ts
@@ -13,7 +13,7 @@ import * as helpers from '../../helpers';
   '</ion-content>',
   directives: [forwardRef(() => helpers.AndroidAttribute)],
 })
-class TabIconTextCtrl {
+class TabIconTextPage {
   constructor() {
   }
 }
@@ -29,9 +29,9 @@ class TabIconTextCtrl {
 })
 export class IconTextPage {
   constructor() {
-    this.tabOne = TabIconTextCtrl;
-    this.tabTwo = TabIconTextCtrl;
-    this.tabThree = TabIconTextCtrl;
-    this.tabFour = TabIconTextCtrl;
+    this.tabOne = TabIconTextPage;
+    this.tabTwo = TabIconTextPage;
+    this.tabThree = TabIconTextPage;
+    this.tabFour = TabIconTextPage;
   }
 }
diff --git a/demos/component-docs/tabs/icon/pages.ts b/demos/component-docs/tabs/icon/pages.ts
index 19f689abd6..9aa4aa0f53 100644
--- a/demos/component-docs/tabs/icon/pages.ts
+++ b/demos/component-docs/tabs/icon/pages.ts
@@ -13,7 +13,7 @@ import * as helpers from '../../helpers';
   '</ion-content>',
   directives: [forwardRef(() => helpers.AndroidAttribute)],
 })
-class TabIconCtrl {
+class TabIconPage {
   constructor() {
   }
 }
@@ -29,9 +29,9 @@ class TabIconCtrl {
 })
 export class IconPage {
   constructor() {
-    this.tabOne = TabIconCtrl;
-    this.tabTwo = TabIconCtrl;
-    this.tabThree = TabIconCtrl;
-    this.tabFour = TabIconCtrl;
+    this.tabOne = TabIconPage;
+    this.tabTwo = TabIconPage;
+    this.tabThree = TabIconPage;
+    this.tabFour = TabIconPage;
   }
 }