diff --git a/docs/app/partials/demo.tmpl.html b/docs/app/partials/demo.tmpl.html
index 3e433f77027..b4ac1fd415d 100644
--- a/docs/app/partials/demo.tmpl.html
+++ b/docs/app/partials/demo.tmpl.html
@@ -24,7 +24,7 @@
                       md-active="file === demo.$selectedFile"
                       ng-click="demo.$selectedFile = file"
                       label="{{file.name}}">
-            <md-content scroll-y class="demo-source-container">
+            <md-content md-scroll-y class="demo-source-container">
                     <hljs code="file.contents"
                           lang="{{file.fileType}}" >
                     </hljs>
diff --git a/docs/app/partials/view-source.tmpl.html b/docs/app/partials/view-source.tmpl.html
index 236f8543fcf..e6d73c98700 100644
--- a/docs/app/partials/view-source.tmpl.html
+++ b/docs/app/partials/view-source.tmpl.html
@@ -8,7 +8,7 @@
     </md-tab>
   </md-tabs>
 
-  <div class="md-content" scroll-y flex>
+  <div class="md-content" md-scroll-y flex>
     <div ng-repeat="file in files">
       <hljs code="file.content"
         lang="{{file.fileType}}"
diff --git a/docs/config/template/index.template.html b/docs/config/template/index.template.html
index 5ff7235e605..4c9ea30ce28 100644
--- a/docs/config/template/index.template.html
+++ b/docs/config/template/index.template.html
@@ -97,7 +97,7 @@ <h2 ng-bind="(menu.currentPage | humanizeDoc) || 'Angular Material'" flex>
 
     </md-toolbar>
 
-    <md-content ng-view scroll-y flex class="md-padding"></md-content>
+    <md-content ng-view md-scroll-y flex class="md-padding"></md-content>
 
   </div>
 
diff --git a/docs/config/template/readme.template.html b/docs/config/template/readme.template.html
index 6b33127c98c..751308c1a6f 100644
--- a/docs/config/template/readme.template.html
+++ b/docs/config/template/readme.template.html
@@ -26,7 +26,7 @@
                       active="file === demo.$selectedFile"
                       ng-click="demo.$selectedFile = file"
                       label="{{file.basePath}}">
-            <md-content scroll-y class="demo-source-container">
+            <md-content md-scroll-y class="demo-source-container">
                     <hljs code="file.content"
                           lang="{{file.fileType}}" >
                     </hljs>
diff --git a/src/components/content/_content.scss b/src/components/content/_content.scss
index 8c4eb548486..621feb4b5b5 100644
--- a/src/components/content/_content.scss
+++ b/src/components/content/_content.scss
@@ -5,15 +5,15 @@ md-content {
   overflow: auto;
   -webkit-overflow-scrolling: touch;
 
-  &[scroll-y] {
+  &[md-scroll-y] {
     overflow-y: auto;
     overflow-x: hidden;
   }
-  &[scroll-x] {
+  &[md-scroll-x] {
     overflow-x: auto;
     overflow-y: hidden;
   }
-  &[scroll-xy] {
+  &[md-scroll-xy] {
   }
 
   &.md-padding {