diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fc1c8f27..111e93f5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 0.2.7 (Aug 04, 2015)
 - [#132](https://github.com/miguelcobain/ember-paper/pull/132) Added autocomplete component.
 - [#144](https://github.com/miguelcobain/ember-paper/pull/144) Fixed paper-icon sizes and added new size md-sm (size="sm").
+- [#146](https://github.com/miguelcobain/ember-paper/pull/146) Upgrade to ember 1.13.7 and ember-cli 1.13.7.
 
 ### 0.2.6 (Jul 20, 2015)
 
diff --git a/addon/components/paper-autocomplete.js b/addon/components/paper-autocomplete.js
index 5b43c36ea..f7282db09 100644
--- a/addon/components/paper-autocomplete.js
+++ b/addon/components/paper-autocomplete.js
@@ -155,7 +155,7 @@ export default Ember.Component.extend(HasBlockMixin, {
     }
   }).readOnly(),
 
-  suggestions: Ember.computed('debouncedSearchText', 'sourcePromiseArray.@each', function() {
+  suggestions: Ember.computed('debouncedSearchText', 'sourcePromiseArray.[]', function() {
     var source = this.get('sourcePromiseArray');
     var lookupKey = this.get('lookupKey');
     var searchText = (this.get('debouncedSearchText') || '').toLowerCase();
diff --git a/addon/components/paper-item.js b/addon/components/paper-item.js
index 61d1e9bf3..1c3f4b349 100644
--- a/addon/components/paper-item.js
+++ b/addon/components/paper-item.js
@@ -27,7 +27,7 @@ export default Ember.Component.extend(RippleMixin, ProxyMixin, {
     return secondaryItem && (secondaryItem.action || (this.get('action') && this.isProxiedComponent(secondaryItem)));
   }),
 
-  secondaryItem: Ember.computed('proxiedComponents.@each', function() {
+  secondaryItem: Ember.computed('proxiedComponents.[]', function() {
     var proxiedComponents = this.get('proxiedComponents');
     return proxiedComponents.find(function(component) {
       return component.classNames.indexOf('md-secondary') !== -1;
diff --git a/app/templates/components/paper-item.hbs b/app/templates/components/paper-item.hbs
index 8cb2d45a3..328bad11b 100644
--- a/app/templates/components/paper-item.hbs
+++ b/app/templates/components/paper-item.hbs
@@ -1,5 +1,5 @@
 {{#if action}}
-  {{#paper-button classNames="md-no-style" noink=true action="buttonAction" skipProxy=true}}
+  {{#paper-button class="md-no-style" noink=true action="buttonAction" skipProxy=true}}
     <div class="md-list-item-inner">
       {{yield}}
     </div>
diff --git a/bower.json b/bower.json
index a5acd57e9..d9b4487ba 100644
--- a/bower.json
+++ b/bower.json
@@ -1,20 +1,17 @@
 {
   "name": "ember-paper",
   "dependencies": {
-    "ember": "release",
+    "ember": "1.13.7",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.2",
+    "ember-qunit": "0.4.9",
     "ember-qunit-notifications": "0.0.7",
     "ember-resolver": "~0.1.18",
     "hammerjs": "~2.0.4",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1",
+    "qunit": "~1.18.0",
     "prism": "*"
-  },
-  "resolutions": {
-    "ember": "release"
   }
 }
diff --git a/package.json b/package.json
index aad5f472b..3b9da012b 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "broccoli-asset-rev": "^2.0.2",
     "broccoli-merge-trees": "~0.2.1",
     "broccoli-static-compiler": "~0.2.1",
-    "ember-cli": "1.13.1",
+    "ember-cli": "1.13.7",
     "ember-cli-app-version": "0.4.0",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
@@ -33,7 +33,7 @@
     "ember-cli-htmlbars-inline-precompile": "^0.1.1",
     "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.15",
+    "ember-cli-qunit": "0.3.20",
     "ember-cli-release": "0.2.3",
     "ember-cli-sass": "4.0.0-beta.5",
     "ember-cli-uglify": "^1.0.1",
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
index 2db43285b..197d67127 100644
--- a/tests/dummy/app/templates/application.hbs
+++ b/tests/dummy/app/templates/application.hbs
@@ -1,6 +1,6 @@
-{{#paper-nav-container open=drawerOpen classNames="ember-app"}}
+{{#paper-nav-container open=drawerOpen class="ember-app"}}
 
-  {{#paper-sidenav classNames="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}}
+  {{#paper-sidenav class="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}}
 
     {{#paper-toolbar}}
       <div class="md-toolbar-tools">
diff --git a/tests/dummy/app/templates/autocomplete.hbs b/tests/dummy/app/templates/autocomplete.hbs
index 905e2fd5b..baed7ee91 100644
--- a/tests/dummy/app/templates/autocomplete.hbs
+++ b/tests/dummy/app/templates/autocomplete.hbs
@@ -7,7 +7,7 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
   <div class="doc-content">
 
 {{#paper-card}}
diff --git a/tests/dummy/app/templates/button.hbs b/tests/dummy/app/templates/button.hbs
index f8055f739..0f4736404 100644
--- a/tests/dummy/app/templates/button.hbs
+++ b/tests/dummy/app/templates/button.hbs
@@ -6,7 +6,7 @@
     <span>Buttons</span>
   </h2>
 {{/paper-toolbar}}
-{{#paper-content classNames="md-padding demo-buttons"}}
+{{#paper-content class="md-padding demo-buttons"}}
 <div class="doc-content">
   <p>
     {{#paper-button action="flatButton"}}Button with action{{/paper-button}}
diff --git a/tests/dummy/app/templates/card.hbs b/tests/dummy/app/templates/card.hbs
index 8739aef6f..792929cf9 100644
--- a/tests/dummy/app/templates/card.hbs
+++ b/tests/dummy/app/templates/card.hbs
@@ -7,9 +7,9 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
-  {{#paper-content classNames="md-whiteframe-z1 list-demo"}}
+  {{#paper-content class="md-whiteframe-z1 list-demo"}}
     {{#paper-card}}
       <img src="washedout.png" alt="Washed Out">
       {{#paper-card-content}}
diff --git a/tests/dummy/app/templates/checkbox.hbs b/tests/dummy/app/templates/checkbox.hbs
index 8ae944a0d..4a9a0f460 100644
--- a/tests/dummy/app/templates/checkbox.hbs
+++ b/tests/dummy/app/templates/checkbox.hbs
@@ -6,7 +6,7 @@
     <span>Checkboxes</span>
   </h2>
 {{/paper-toolbar}}
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   {{#paper-checkbox checked=value1}}A checkbox: {{value1}}{{/paper-checkbox}}
   {{#paper-checkbox checked=value2}}A checkbox: {{#if value2}}yep{{else}}nope{{/if}}{{/paper-checkbox}}
diff --git a/tests/dummy/app/templates/divider.hbs b/tests/dummy/app/templates/divider.hbs
index f8f86f459..c078ee35a 100644
--- a/tests/dummy/app/templates/divider.hbs
+++ b/tests/dummy/app/templates/divider.hbs
@@ -7,10 +7,10 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <h4>Full width dividers</h4>
-  {{#paper-content classNames="md-whiteframe-z1 list-demo"}}
+  {{#paper-content class="md-whiteframe-z1 list-demo"}}
     {{#paper-list}}
       {{#each listData as |item|}}
         {{#paper-item class="md-3-line"}}
@@ -29,7 +29,7 @@
   {{/paper-content}}
 
   <h4>Inset dividers</h4>
-  {{#paper-content classNames="md-whiteframe-z1 list-demo"}}
+  {{#paper-content class="md-whiteframe-z1 list-demo"}}
     {{#paper-list}}
       {{#each listData as |item|}}
         {{#paper-item class="md-3-line"}}
@@ -49,7 +49,7 @@
 
   <h3>Template</h3>
 {{#code-block language='handlebars'}}
-\{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
+\{{#paper-content class="md-whiteframe-z1 list-demo"}}
   \{{#paper-list}}
     \{{#each listData as |item|}}
       \{{#paper-item}}
diff --git a/tests/dummy/app/templates/icons.hbs b/tests/dummy/app/templates/icons.hbs
index 34e832737..39184f9a8 100644
--- a/tests/dummy/app/templates/icons.hbs
+++ b/tests/dummy/app/templates/icons.hbs
@@ -7,7 +7,7 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding icon-demo"}}
+{{#paper-content class="md-padding icon-demo"}}
 
   <h3>Template</h3>
   <h4>Basic Icons</h4>
diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs
index c8e5a39ef..8c6c1f8bc 100644
--- a/tests/dummy/app/templates/index.hbs
+++ b/tests/dummy/app/templates/index.hbs
@@ -7,7 +7,7 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <h2 class="md-headline" style="margin-top: 0;">Welcome to Ember Paper.</h2>
   <p>This project aims to bring Google's new <a href="https://www.google.com/design/spec/material-design/introduction.html">Material Design</a> to Ember. The goal is to encapsulate everything possible in Ember components. This project is packaged as an <a href="http://www.ember-cli.com/">Ember-cli</a> addon.</p>
diff --git a/tests/dummy/app/templates/input.hbs b/tests/dummy/app/templates/input.hbs
index 6aeb4b75a..f4743447c 100644
--- a/tests/dummy/app/templates/input.hbs
+++ b/tests/dummy/app/templates/input.hbs
@@ -7,7 +7,7 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <ul class="paper-list-inline">
     <li>{{paper-input label="Name" value=name}}</li>
diff --git a/tests/dummy/app/templates/list-controls.hbs b/tests/dummy/app/templates/list-controls.hbs
index 9f5d0f2d6..c2d94af47 100644
--- a/tests/dummy/app/templates/list-controls.hbs
+++ b/tests/dummy/app/templates/list-controls.hbs
@@ -7,37 +7,37 @@
     </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
   <div class="doc-content">
     <h3>Basic Usage</h3>
-    {{#paper-content classNames="md-whiteframe-z1 list-demo list-controls-demo"}}
+    {{#paper-content class="md-whiteframe-z1 list-demo list-controls-demo"}}
       {{#paper-list}}
-        {{#paper-subheader classNames="md-no-sticky"}}Single Action Checkboxes{{/paper-subheader}}
+        {{#paper-subheader class="md-no-sticky"}}Single Action Checkboxes{{/paper-subheader}}
 
         {{#paper-item}}
           <p>Checkbox 1</p>
-          {{paper-checkbox classNames="md-secondary" checked=checkboxEnabled1}}
+          {{paper-checkbox class="md-secondary" checked=checkboxEnabled1}}
         {{/paper-item}}
 
         {{#paper-item}}
           <p>Checkbox 2</p>
-          {{paper-checkbox classNames="md-secondary" checked=checkboxEnabled2}}
+          {{paper-checkbox class="md-secondary" checked=checkboxEnabled2}}
         {{/paper-item}}
 
         {{paper-divider}}
 
-        {{#paper-subheader classNames="md-no-sticky"}}Clickable Items with Secondary Controls{{/paper-subheader}}
+        {{#paper-subheader class="md-no-sticky"}}Clickable Items with Secondary Controls{{/paper-subheader}}
 
         {{#paper-item action="transitionToWifiMenu"}}
           {{paper-icon icon="network-wifi"}}
           <p>Wi-Fi</p>
-          {{paper-switch classNames="md-secondary" checked=wifiEnabled}}
+          {{paper-switch class="md-secondary" checked=wifiEnabled}}
         {{/paper-item}}
 
         {{#paper-item action="transitionToBluetoothMenu"}}
           {{paper-icon icon="bluetooth"}}
           <p>Bluetooth</p>
-          {{paper-switch classNames="md-secondary" checked=bluetoothEnabled}}
+          {{paper-switch class="md-secondary" checked=bluetoothEnabled}}
         {{/paper-item}}
 
         {{#paper-item action="transitionToDataUsage"}}
@@ -47,7 +47,7 @@
 
         {{paper-divider}}
 
-        {{#paper-subheader classNames="md-no-sticky"}}Checkbox with Secondary Action{{/paper-subheader}}
+        {{#paper-subheader class="md-no-sticky"}}Checkbox with Secondary Action{{/paper-subheader}}
 
         {{#each messageData as |item|}}
           {{#paper-item}}
@@ -61,7 +61,7 @@
 
         {{#paper-divider}}{{/paper-divider}}
 
-        {{#paper-subheader classNames="md-no-sticky"}}Clickable Avatars{{/paper-subheader}}
+        {{#paper-subheader class="md-no-sticky"}}Clickable Avatars{{/paper-subheader}}
 
         {{#each listData as |item|}}
           {{#paper-item class="md-3-line" param=item action="goToPerson"}}
@@ -76,7 +76,7 @@
 
         {{paper-divider}}
 
-        {{#paper-subheader classNames="md-no-sticky"}}Avatar with Secondary Action Icon{{/paper-subheader}}
+        {{#paper-subheader class="md-no-sticky"}}Avatar with Secondary Action Icon{{/paper-subheader}}
 
         {{#each listData as |item|}}
           {{#paper-item class="md-3-line" param=item action="goToPerson"}}
@@ -100,32 +100,32 @@
 {{#code-block language='handlebars'}}
 
   \{{#paper-list}}
-    \{{#paper-subheader classNames="md-no-sticky"}}Single Action Checkboxes\{{/paper-subheader}}
+    \{{#paper-subheader class="md-no-sticky"}}Single Action Checkboxes\{{/paper-subheader}}
 
     \{{#paper-item}}
       &lt;p&gt;Checkbox 1&lt;/p&gt;
-      \{{paper-checkbox classNames="md-secondary" checked=checkboxEnabled1}}
+      \{{paper-checkbox class="md-secondary" checked=checkboxEnabled1}}
     \{{/paper-item}}
 
     \{{#paper-item}}
       &lt;p&gt;Checkbox 2&lt;/p&gt;
-      \{{paper-checkbox classNames="md-secondary" checked=checkboxEnabled2}}
+      \{{paper-checkbox class="md-secondary" checked=checkboxEnabled2}}
     \{{/paper-item}}
 
     \{{paper-divider}}
 
-    \{{#paper-subheader classNames="md-no-sticky"}}Clickable Items with Secondary Controls\{{/paper-subheader}}
+    \{{#paper-subheader class="md-no-sticky"}}Clickable Items with Secondary Controls\{{/paper-subheader}}
 
     \{{#paper-item action="transitionToWifiMenu"}}
       \{{paper-icon icon="network-wifi"}}
       &lt;p&gt;Wi-Fi&lt;/p&gt;
-      \{{paper-switch classNames="md-secondary" checked=wifiEnabled}}
+      \{{paper-switch class="md-secondary" checked=wifiEnabled}}
     \{{/paper-item}}
 
     \{{#paper-item action="transitionToBluetoothMenu"}}
       \{{paper-icon icon="bluetooth"}}
       &lt;p&gt;Bluetooth&lt;/p&gt;
-      \{{paper-switch classNames="md-secondary" checked=bluetoothEnabled}}
+      \{{paper-switch class="md-secondary" checked=bluetoothEnabled}}
     \{{/paper-item}}
 
     \{{#paper-item action="transitionToDataUsage"}}
@@ -135,7 +135,7 @@
 
     \{{paper-divider}}
 
-    \{{#paper-subheader classNames="md-no-sticky"}}Checkbox with Secondary Action\{{/paper-subheader}}
+    \{{#paper-subheader class="md-no-sticky"}}Checkbox with Secondary Action\{{/paper-subheader}}
 
     \{{#each messageData as |item|}}
       \{{#paper-item}}
@@ -149,7 +149,7 @@
 
     \{{#paper-divider}}\{{/paper-divider}}
 
-    \{{#paper-subheader classNames="md-no-sticky"}}Clickable Avatars\{{/paper-subheader}}
+    \{{#paper-subheader class="md-no-sticky"}}Clickable Avatars\{{/paper-subheader}}
 
     \{{#each listData as |item|}}
       \{{#paper-item class="md-3-line" param=item action="goToPerson"}}
@@ -164,7 +164,7 @@
 
     \{{paper-divider}}
 
-    \{{#paper-subheader classNames="md-no-sticky"}}Avatar with Secondary Action Icon\{{/paper-subheader}}
+    \{{#paper-subheader class="md-no-sticky"}}Avatar with Secondary Action Icon\{{/paper-subheader}}
 
     \{{#each listData as |item|}}
       \{{#paper-item class="md-3-line" param=item action="goToPerson"}}
diff --git a/tests/dummy/app/templates/list.hbs b/tests/dummy/app/templates/list.hbs
index c600bbba8..3214763b1 100644
--- a/tests/dummy/app/templates/list.hbs
+++ b/tests/dummy/app/templates/list.hbs
@@ -7,10 +7,10 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <h3>Basic Usage</h3>
-  {{#paper-content classNames="md-whiteframe-z1 list-demo"}}
+  {{#paper-content class="md-whiteframe-z1 list-demo"}}
     {{#paper-list}}
       {{#each listData as |item|}}
         {{#paper-item class="md-3-line"}}
@@ -30,7 +30,7 @@
 
   <h4>Template</h4>
 {{#code-block language='handlebars'}}
-\{{#paper-content classNames="md-whiteframe-z1 list-demo"}}
+\{{#paper-content class="md-whiteframe-z1 list-demo"}}
   \{{#paper-list}}
     \{{#each listData as |item|}}
       \{{#paper-item class="md-3-line"}}
diff --git a/tests/dummy/app/templates/progress-circular.hbs b/tests/dummy/app/templates/progress-circular.hbs
index bfcb40f67..0fee825b4 100644
--- a/tests/dummy/app/templates/progress-circular.hbs
+++ b/tests/dummy/app/templates/progress-circular.hbs
@@ -7,7 +7,7 @@
     </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
     <div class="doc-content">
         <h3>Basic Usage</h3>
         <h4>Determinate</h4>
@@ -25,10 +25,10 @@
         <h4>Theming</h4>
 
         <div layout="row" layout-sm="column" layout-align="space-around">
-          {{paper-progress-circular classNames="md-hue-2"}}
+          {{paper-progress-circular class="md-hue-2"}}
           {{paper-progress-circular accent=true}}
-          {{paper-progress-circular accent=true classNames="md-hue-1"}}
-          {{paper-progress-circular warn=true classNames="md-hue-3"}}
+          {{paper-progress-circular accent=true class="md-hue-1"}}
+          {{paper-progress-circular warn=true class="md-hue-3"}}
           {{paper-progress-circular warn=true}}
         </div>
 
diff --git a/tests/dummy/app/templates/progress-linear.hbs b/tests/dummy/app/templates/progress-linear.hbs
index 4b390f5be..1c984ab13 100644
--- a/tests/dummy/app/templates/progress-linear.hbs
+++ b/tests/dummy/app/templates/progress-linear.hbs
@@ -7,7 +7,7 @@
     </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
   <div class="doc-content">
     <h3>Basic Usage</h3>
 
diff --git a/tests/dummy/app/templates/radio.hbs b/tests/dummy/app/templates/radio.hbs
index abaf553a6..9fd5b1ace 100644
--- a/tests/dummy/app/templates/radio.hbs
+++ b/tests/dummy/app/templates/radio.hbs
@@ -7,7 +7,7 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <ul class="paper-list-inline">
     <li>{{#paper-radio}}A radio button{{/paper-radio}}</li>
diff --git a/tests/dummy/app/templates/sidenav.hbs b/tests/dummy/app/templates/sidenav.hbs
index a7551c599..a3a4e605c 100644
--- a/tests/dummy/app/templates/sidenav.hbs
+++ b/tests/dummy/app/templates/sidenav.hbs
@@ -7,13 +7,13 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <p>Try to resize this webpage.</p>
   <h3>Template</h3>
-{{#code-block language='handlebars'}}\{{#paper-nav-container open=drawerOpen classNames="ember-app"}}
+{{#code-block language='handlebars'}}\{{#paper-nav-container open=drawerOpen class="ember-app"}}
 
-  \{{#paper-sidenav classNames="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}}
+  \{{#paper-sidenav class="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true}}
 
     \{{#paper-toolbar}}
       &lt;div class="md-toolbar-tools"&gt;
diff --git a/tests/dummy/app/templates/slider.hbs b/tests/dummy/app/templates/slider.hbs
index 1505425dc..c7a61a530 100644
--- a/tests/dummy/app/templates/slider.hbs
+++ b/tests/dummy/app/templates/slider.hbs
@@ -7,7 +7,7 @@
     </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <h3>
     RGB <span style={{colorStyle}}>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
@@ -27,7 +27,7 @@
     <div flex="10" layout layout-align="center center">
       <span>G</span>
     </div>
-    {{paper-slider flex=true min='0' max='255' value=color.green classNames='md-accent'}}
+    {{paper-slider flex=true min='0' max='255' value=color.green class='md-accent'}}
     <div flex="20" layout layout-align="center center">
       {{input type="number" value=color.green}}
     </div>
@@ -37,7 +37,7 @@
     <div flex="10" layout layout-align="center center">
       <span>B</span>
     </div>
-    {{paper-slider flex=true min='0' max='255' value=color.blue classNames='md-primary'}}
+    {{paper-slider flex=true min='0' max='255' value=color.blue class='md-primary'}}
     <div flex="20" layout layout-align="center center">
       {{input type="number" value=color.blue}}
     </div>
@@ -91,7 +91,7 @@
       &lt;div flex="10" layout layout-align="center center"&gt;
         &lt;span&gt;G&lt;/span&gt;
       &lt;/div&gt;
-      \{{paper-slider flex=true min='0' max='255' value=color.green classNames='md-accent'}}
+      \{{paper-slider flex=true min='0' max='255' value=color.green class='md-accent'}}
       &lt;div flex="20" layout layout-align="center center"&gt;
         \{{input type="number" value=color.green}}
       &lt;/div&gt;
@@ -101,7 +101,7 @@
       &lt;div flex="10" layout layout-align="center center"&gt;
         &lt;span&gt;B&lt;/span&gt;
       &lt;/div&gt;
-      \{{paper-slider flex=true min='0' max='255' value=color.blue classNames='md-primary'}}
+      \{{paper-slider flex=true min='0' max='255' value=color.blue class='md-primary'}}
       &lt;div flex="20" layout layout-align="center center"&gt;
         \{{input type="number" value=color.blue}}
       &lt;/div&gt;
diff --git a/tests/dummy/app/templates/switch.hbs b/tests/dummy/app/templates/switch.hbs
index 2131ee103..3b9d5f999 100644
--- a/tests/dummy/app/templates/switch.hbs
+++ b/tests/dummy/app/templates/switch.hbs
@@ -7,7 +7,7 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <p>
     {{#paper-switch checked=booleanProp1}} {{booleanProp1}} {{/paper-switch}}
diff --git a/tests/dummy/app/templates/toolbar.hbs b/tests/dummy/app/templates/toolbar.hbs
index 03fd2968d..36625b898 100644
--- a/tests/dummy/app/templates/toolbar.hbs
+++ b/tests/dummy/app/templates/toolbar.hbs
@@ -6,7 +6,7 @@
     <span>Toolbars</span>
   </h2>
 {{/paper-toolbar}}
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   {{#paper-toolbar}}
     <div class="md-toolbar-tools">
diff --git a/tests/dummy/app/templates/typography.hbs b/tests/dummy/app/templates/typography.hbs
index 5e7a52ee4..72f4a6a0e 100644
--- a/tests/dummy/app/templates/typography.hbs
+++ b/tests/dummy/app/templates/typography.hbs
@@ -7,7 +7,7 @@
   </h2>
 {{/paper-toolbar}}
 
-{{#paper-content classNames="md-padding"}}
+{{#paper-content class="md-padding"}}
 <div class="doc-content">
   <h3>Headings</h3>
   <div class="preview-block">