diff --git a/ionic/components/action-menu/action-menu.ts b/ionic/components/action-menu/action-menu.ts
index bae5ebb87e..c2a90f78c4 100644
--- a/ionic/components/action-menu/action-menu.ts
+++ b/ionic/components/action-menu/action-menu.ts
@@ -6,7 +6,7 @@
 * The ActionMenu is a modal menu with options to select based on an action.
 */
 
-import {View, Injectable, NgFor, NgIf, CSSClass} from 'angular2/angular2';
+import {View, Injectable, NgFor, NgIf, NgClass} from 'angular2/angular2';
 
 import {TapClick} from '../button/button';
 import {Overlay} from '../overlay/overlay';
@@ -22,19 +22,19 @@ import * as util from 'ionic/util';
         '<div class="action-menu-group action-menu-options">' +
           '<div class="action-menu-title" *ng-if="titleText">{{titleText}}</div>' +
           '<button (^click)="_buttonClicked(index)" *ng-for="#b of buttons; #index = index" class="action-menu-option">' +
-            '<i class="icon" [class]="b.icon" *ng-if="b.icon"></i> ' +
+            '<i class="icon" [ng-class]="b.icon" *ng-if="b.icon"></i> ' +
             '{{b.text}}' +
           '</button>' +
           '<button *ng-if="destructiveText" (click)="_destructive()" class="destructive action-menu-destructive">' +
-            '<i class="icon" [class]="destructiveIcon" *ng-if="destructiveIcon"></i> ' +
+            '<i class="icon" [ng-class]="destructiveIcon" *ng-if="destructiveIcon"></i> ' +
             '{{destructiveText}}</button>' +
         '</div>' +
         '<div class="action-menu-group action-menu-cancel" *ng-if="cancelText">' +
-          '<button (click)="_cancel()"><i class="icon" [class]="cancelIcon"></i> {{cancelText}}</button>' +
+          '<button (click)="_cancel()"><i class="icon" [ng-class]="cancelIcon"></i> {{cancelText}}</button>' +
         '</div>' +
       '</div>' +
     '</action-menu-wrapper>',
-  directives: [NgFor, NgIf, CSSClass, TapClick]
+  directives: [NgFor, NgIf, NgClass, TapClick]
 })
 class ActionMenuDirective {
 
diff --git a/ionic/components/app/test/barkpark/index.ts b/ionic/components/app/test/barkpark/index.ts
index 7edbd453f5..e5cc3adcc1 100644
--- a/ionic/components/app/test/barkpark/index.ts
+++ b/ionic/components/app/test/barkpark/index.ts
@@ -1,4 +1,4 @@
-import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
 import {Log} from 'ionic/util'
 
 import {App, IonicView, NavController} from 'ionic/ionic'
diff --git a/ionic/components/app/test/music/index.ts b/ionic/components/app/test/music/index.ts
index bf5dd8548a..d8bbd171e4 100644
--- a/ionic/components/app/test/music/index.ts
+++ b/ionic/components/app/test/music/index.ts
@@ -1,5 +1,5 @@
 import {Directive, ElementRef} from 'angular2/angular2';
-import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
 
 import {App, NavController, IonicView} from 'ionic/ionic';
 
diff --git a/ionic/components/app/test/net/index.ts b/ionic/components/app/test/net/index.ts
index 54bc411d2e..a52c227a6e 100644
--- a/ionic/components/app/test/net/index.ts
+++ b/ionic/components/app/test/net/index.ts
@@ -1,5 +1,5 @@
 import {Component} from 'angular2/angular2';
-import {Control, ControlGroup, formDirectives} from 'angular2/forms';
+import {Control, ControlGroup} from 'angular2/forms';
 
 import {App, Http} from 'ionic/ionic';
 
diff --git a/ionic/components/app/test/profile/index.ts b/ionic/components/app/test/profile/index.ts
index 8ba91986f0..89c84b2803 100644
--- a/ionic/components/app/test/profile/index.ts
+++ b/ionic/components/app/test/profile/index.ts
@@ -1,6 +1,6 @@
 import {ElementRef} from 'angular2/angular2'
 import {Component, Directive} from 'angular2/angular2';
-import {FormBuilder, Control, ControlGroup, Validators, formDirectives} from 'angular2/forms';
+import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/forms';
 
 import {App, Modal, Animation, Content} from 'ionic/ionic';
 import {NavController, NavParams, IonicView} from 'ionic/ionic';
diff --git a/ionic/components/app/test/sink/pages/form.ts b/ionic/components/app/test/sink/pages/form.ts
index f4c194944f..1c6ef9e4ee 100644
--- a/ionic/components/app/test/sink/pages/form.ts
+++ b/ionic/components/app/test/sink/pages/form.ts
@@ -1,4 +1,4 @@
-import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/angular2';
+import {FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
 
 import {IonicApp, IonicView} from 'ionic/ionic';
 
diff --git a/ionic/components/app/test/sink/pages/search-bar.ts b/ionic/components/app/test/sink/pages/search-bar.ts
index 9dec937e7d..2d545b0054 100644
--- a/ionic/components/app/test/sink/pages/search-bar.ts
+++ b/ionic/components/app/test/sink/pages/search-bar.ts
@@ -1,5 +1,5 @@
 import {Component} from 'angular2/angular2';
-import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
 
 import {IonicApp, IonicView} from 'ionic/ionic';
 
diff --git a/ionic/components/app/test/sink/pages/segment.ts b/ionic/components/app/test/sink/pages/segment.ts
index 8e40630542..3189d7131f 100644
--- a/ionic/components/app/test/sink/pages/segment.ts
+++ b/ionic/components/app/test/sink/pages/segment.ts
@@ -1,4 +1,4 @@
-import {FormBuilder, Validators, formDirectives, Control, ControlGroup} from 'angular2/angular2';
+import {FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
 
 import {IonicView} from 'ionic/ionic';
 
diff --git a/ionic/components/app/test/sink/pages/table-search.ts b/ionic/components/app/test/sink/pages/table-search.ts
index 08da2b6edc..c08aa782a4 100644
--- a/ionic/components/app/test/sink/pages/table-search.ts
+++ b/ionic/components/app/test/sink/pages/table-search.ts
@@ -1,5 +1,5 @@
 import {Component} from 'angular2/angular2';
-import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
 
 import {IonicView} from 'ionic/ionic';
 
diff --git a/ionic/components/app/test/sink/pages/tabs.ts b/ionic/components/app/test/sink/pages/tabs.ts
index f190ec6ea1..650a1933e4 100644
--- a/ionic/components/app/test/sink/pages/tabs.ts
+++ b/ionic/components/app/test/sink/pages/tabs.ts
@@ -1,4 +1,4 @@
-import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
 
 import {IonicApp, IonicView, NavController} from 'ionic/ionic';
 
diff --git a/ionic/components/app/test/snapcat/index.ts b/ionic/components/app/test/snapcat/index.ts
index 1c2d31dd24..c4c53f18f9 100644
--- a/ionic/components/app/test/snapcat/index.ts
+++ b/ionic/components/app/test/snapcat/index.ts
@@ -1,4 +1,4 @@
-import {FormBuilder, Control, ControlGroup, Validators, formDirectives} from 'angular2/forms';
+import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/forms';
 
 import {App, IonicView, Animation, Modal, NavController, NavParams} from 'ionic/ionic';
 
diff --git a/ionic/components/app/test/weather/index.ts b/ionic/components/app/test/weather/index.ts
index cd8ef98df5..3e5586fa4e 100755
--- a/ionic/components/app/test/weather/index.ts
+++ b/ionic/components/app/test/weather/index.ts
@@ -1,6 +1,6 @@
 import {Component, Directive, View} from 'angular2/angular2';
-import {NgIf, NgFor, CSSClass, ElementRef} from 'angular2/angular2';
-import {FormBuilder, Control, ControlGroup, Validators, formDirectives} from 'angular2/forms';
+import {NgIf, NgFor, NgClass, ElementRef} from 'angular2/angular2';
+import {FormBuilder, Control, ControlGroup, Validators, FORM_DIRECTIVES} from 'angular2/forms';
 
 import {App, IonicView, Animation, Content, Scroll, Modal, NavController, NavParams} from 'ionic/ionic';
 
@@ -33,7 +33,7 @@ import {Flickr} from './flickr';
       </form>
     </ion-content>
   </ion-view>`,
-  directives: [formDirectives]
+  directives: [FORM_DIRECTIVES]
 })
 export class SettingsModal {
   constructor(fb: FormBuilder) {
@@ -63,8 +63,8 @@ let WEATHER_ICONS = {
   ]
 })
 @View({
-  template: '<i class="icon" [class]="weatherIcon"></i>',
-  directives: [CSSClass]
+  template: '<i class="icon" [ng-class]="weatherIcon"></i>',
+  directives: [NgClass]
 })
 export class WeatherIcon {
   constructor() {
diff --git a/ionic/components/checkbox/test/basic/index.ts b/ionic/components/checkbox/test/basic/index.ts
index 40e35c35b2..5520a65cfc 100644
--- a/ionic/components/checkbox/test/basic/index.ts
+++ b/ionic/components/checkbox/test/basic/index.ts
@@ -3,7 +3,6 @@ import {
   Control,
   ControlGroup,
   NgForm,
-  formDirectives,
   Validators,
   NgControl,
   ControlValueAccessor,
diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts
index b6711237f5..ca2d8ba573 100644
--- a/ionic/components/icon/icon.ts
+++ b/ionic/components/icon/icon.ts
@@ -1,4 +1,4 @@
-import {Directive, View, CSSClass, ElementRef, Optional, Host, Attribute, Renderer} from 'angular2/angular2';
+import {Directive, View, NgClass, ElementRef, Optional, Host, Attribute, Renderer} from 'angular2/angular2';
 
 import {IonicConfig} from '../../config/config';
 import {IonicComponent} from '../../config/annotations';
@@ -141,8 +141,8 @@ export class IconDirective {
   }
 })
 @View({
-  template: '<i class="icon" [class]="iconClass">',
-  directives: [CSSClass]
+  template: '<i class="icon" [ng-class]="iconClass">',
+  directives: [NgClass]
 })
 export class Icon extends Ion {
   constructor(elementRef: ElementRef, ionicConfig: IonicConfig) {
diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index a7fe4bdf81..fbde17fe47 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -1,5 +1,5 @@
-import {formDirectives, NgControl, NgControlGroup,
-  Component, View, Injectable, CSSClass, NgIf, NgFor} from 'angular2/angular2';
+import {FORM_DIRECTIVES, NgControl, NgControlGroup,
+  Component, View, Injectable, NgClass, NgIf, NgFor} from 'angular2/angular2';
 
 import {Overlay} from '../overlay/overlay';
 import {Animation} from '../../animations/animation';
@@ -139,10 +139,10 @@ const OVERLAY_TYPE = 'popup';
       '<input type="text" *ng-if="showPrompt" placeholder="{{promptPlaceholder}}">' +
     '</div>' +
     '<div class="popup-buttons" *ng-if="buttons.length">' +
-      '<button *ng-for="#button of buttons" (click)="buttonTapped(button, $event)" [class]="button.type || \'button-default\'" [inner-html]="button.text"></button>' +
+      '<button *ng-for="#button of buttons" (click)="buttonTapped(button, $event)" [ng-class]="button.type || \'button-default\'" [inner-html]="button.text"></button>' +
     '</div>' +
   '</popup-wrapper>',
-  directives: [formDirectives, CSSClass, NgIf, NgFor]
+  directives: [FORM_DIRECTIVES, NgClass, NgIf, NgFor]
 })
 
 class StandardPopup {
diff --git a/ionic/components/radio/test/basic/index.ts b/ionic/components/radio/test/basic/index.ts
index edcc2b001b..a54986bc90 100644
--- a/ionic/components/radio/test/basic/index.ts
+++ b/ionic/components/radio/test/basic/index.ts
@@ -3,7 +3,6 @@ import {
   Control,
   ControlGroup,
   NgForm,
-  formDirectives,
   Validators,
   NgControl,
   ControlValueAccessor,
diff --git a/ionic/components/scroll/pull-to-refresh.ts b/ionic/components/scroll/pull-to-refresh.ts
index 5f98adacbb..5c6785dd6d 100644
--- a/ionic/components/scroll/pull-to-refresh.ts
+++ b/ionic/components/scroll/pull-to-refresh.ts
@@ -1,4 +1,4 @@
-import {Component, View, NgIf, CSSClass, ElementRef, EventEmitter, Host} from 'angular2/angular2'
+import {Component, View, NgIf, NgClass, ElementRef, EventEmitter, Host} from 'angular2/angular2'
 
 import {Content} from '../content/content';
 
@@ -25,16 +25,16 @@ import {raf, ready, CSS} from 'ionic/util/dom';
 @View({
   template: `<div class="refresher-content" [class.refresher-with-text]="pullingText || refreshingText">
       <div class="icon-pulling">
-        <i class="icon" [class]="pullingIcon"></i>
+        <i class="icon" [ng-class]="pullingIcon"></i>
       </div>
       <div class="text-pulling" [inner-html]="pullingText" *ng-if="pullingText"></div>
       <div class="icon-refreshing">
         <!--<ion-spinner ng-if="showSpinner" icon="{{spinner}}"></ion-spinner>-->
-        <i class="icon" [class]="refreshingIcon"></i>
+        <i class="icon" [ng-class]="refreshingIcon"></i>
       </div>
       <div class="text-refreshing" [inner-html]="refreshingText" *ng-if="refreshingText"></div>
     </div>`,
-  directives: [NgIf, CSSClass]
+  directives: [NgIf, NgClass]
 })
 export class Refresher {
   constructor(
diff --git a/ionic/components/search-bar/test/basic/index.ts b/ionic/components/search-bar/test/basic/index.ts
index 4d9234dc2e..ca45be710a 100644
--- a/ionic/components/search-bar/test/basic/index.ts
+++ b/ionic/components/search-bar/test/basic/index.ts
@@ -1,4 +1,4 @@
-import {FormBuilder, Validators, formDirectives, Control, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
 
 import {App} from 'ionic/ionic';
 import {SearchPipe} from 'ionic/components/search-bar/search-bar';
diff --git a/ionic/components/segment/test/basic/index.ts b/ionic/components/segment/test/basic/index.ts
index 3b79671565..b1a68eff13 100644
--- a/ionic/components/segment/test/basic/index.ts
+++ b/ionic/components/segment/test/basic/index.ts
@@ -1,4 +1,4 @@
-import {formDirectives, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
+import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
 
 import {App} from 'ionic/ionic';
 
@@ -6,7 +6,7 @@ import {App} from 'ionic/ionic';
 @App({
   templateUrl: 'main.html',
   appInjector: [FormBuilder],
-  directives: [formDirectives]
+  directives: [FORM_DIRECTIVES]
 })
 class IonicApp {
   constructor(fb: FormBuilder) {
diff --git a/ionic/components/show-hide-when/test/basic/index.ts b/ionic/components/show-hide-when/test/basic/index.ts
index 40e35c35b2..5520a65cfc 100644
--- a/ionic/components/show-hide-when/test/basic/index.ts
+++ b/ionic/components/show-hide-when/test/basic/index.ts
@@ -3,7 +3,6 @@ import {
   Control,
   ControlGroup,
   NgForm,
-  formDirectives,
   Validators,
   NgControl,
   ControlValueAccessor,
diff --git a/ionic/components/switch/test/basic/index.ts b/ionic/components/switch/test/basic/index.ts
index 40e35c35b2..5520a65cfc 100644
--- a/ionic/components/switch/test/basic/index.ts
+++ b/ionic/components/switch/test/basic/index.ts
@@ -3,7 +3,6 @@ import {
   Control,
   ControlGroup,
   NgForm,
-  formDirectives,
   Validators,
   NgControl,
   ControlValueAccessor,
diff --git a/ionic/config/annotations.ts b/ionic/config/annotations.ts
index 390e0f24ff..33723f91ce 100644
--- a/ionic/config/annotations.ts
+++ b/ionic/config/annotations.ts
@@ -1,4 +1,4 @@
-import {coreDirectives, formDirectives, Component, Directive, View, forwardRef} from 'angular2/angular2'
+import {CORE_DIRECTIVES, FORM_DIRECTIVES, Component, Directive, View, forwardRef} from 'angular2/angular2'
 
 import * as util from 'ionic/util';
 import {IonicConfig} from './config';
@@ -28,8 +28,8 @@ import {
 // TODO: Why is forwardRef() required when they're already imported above????
 export const IonicDirectives = [
   // Angular
-  coreDirectives,
-  formDirectives,
+  CORE_DIRECTIVES,
+  FORM_DIRECTIVES,
 
   // Content
   forwardRef(() => Aside),