diff --git a/demos/component-docs/inputs/radio/template.html b/demos/component-docs/inputs/radio/template.html
index ae216d3e42..65d2f57e91 100644
--- a/demos/component-docs/inputs/radio/template.html
+++ b/demos/component-docs/inputs/radio/template.html
@@ -9,9 +9,9 @@
 <ion-content>
   <ion-radio-group>
 
-    <ion-header>
+    <ion-list-header>
       Language
-    </ion-header>
+    </ion-list-header>
 
     <ion-radio checked="true">
       Go
diff --git a/demos/component-docs/lists/avatar/template.html b/demos/component-docs/lists/avatar/template.html
index 0b6e44fb2e..2b123424cf 100644
--- a/demos/component-docs/lists/avatar/template.html
+++ b/demos/component-docs/lists/avatar/template.html
@@ -6,7 +6,7 @@
 <ion-content class="has-header demo-list-icons">
   <ion-list>
 
-    <ion-header>Today</ion-header>
+    <ion-list-header>Today</ion-list-header>
 
     <ion-item>
       <ion-avatar item-left>
@@ -44,7 +44,7 @@
 
   <ion-list>
 
-    <ion-header>Yesterday</ion-header>
+    <ion-list-header>Yesterday</ion-list-header>
 
     <ion-item>
       <ion-avatar item-left>
diff --git a/demos/component-docs/lists/headers/template.html b/demos/component-docs/lists/headers/template.html
index f06b2e321a..7c45b75720 100644
--- a/demos/component-docs/lists/headers/template.html
+++ b/demos/component-docs/lists/headers/template.html
@@ -6,21 +6,21 @@
 <ion-content class="has-header demo-list-icons">
 
   <ion-list>
-    <ion-header>Comedy</ion-header>
+    <ion-list-header>Comedy</ion-list-header>
     <ion-item>Airplane!</ion-item>
     <ion-item>Caddyshack</ion-item>
     <ion-item>Coming To America</ion-item>
   </ion-list>
 
   <ion-list>
-    <ion-header>Action</ion-header>
+    <ion-list-header>Action</ion-list-header>
     <ion-item>Terminator II</ion-item>
     <ion-item>The Empire Strikes Back</ion-item>
     <ion-item>Blade Runner</ion-item>
   </ion-list>
 
   <ion-list>
-    <ion-header>Horror</ion-header>
+    <ion-list-header>Horror</ion-list-header>
     <ion-item>The Evil Dead</ion-item>
     <ion-item>Poldergeist</ion-item>
     <ion-item>Aliens</ion-item>
diff --git a/demos/component-docs/lists/icon/template.html b/demos/component-docs/lists/icon/template.html
index 88ccf5aebc..b70d4e2045 100644
--- a/demos/component-docs/lists/icon/template.html
+++ b/demos/component-docs/lists/icon/template.html
@@ -6,9 +6,9 @@
 <ion-content class="has-header demo-list-icons">
   <ion-list no-border>
 
-    <ion-header>
+    <ion-list-header>
       Classes
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       <icon planet item-left></icon>
@@ -44,9 +44,9 @@
 
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
       Activities
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       Incantation
@@ -70,9 +70,9 @@
 
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
       Friends
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       <icon flash item-left></icon>
diff --git a/demos/component-docs/lists/multiline/template.html b/demos/component-docs/lists/multiline/template.html
index be1f4834f5..c9e4143f68 100644
--- a/demos/component-docs/lists/multiline/template.html
+++ b/demos/component-docs/lists/multiline/template.html
@@ -6,9 +6,9 @@
 <ion-content class="has-header">
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
     Today
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       <ion-avatar item-left>
@@ -41,9 +41,9 @@
 
 
   <ion-list>
-    <ion-header>
+    <ion-list-header>
     Last Week
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       <ion-avatar item-left>
diff --git a/demos/component-docs/modals/basic/template.html b/demos/component-docs/modals/basic/template.html
index 46a8bb2d95..a6f6b7e071 100644
--- a/demos/component-docs/modals/basic/template.html
+++ b/demos/component-docs/modals/basic/template.html
@@ -6,9 +6,9 @@
 <ion-content class="has-header">
 
   <ion-list>
-    <ion-header>
+    <ion-list-header>
       Hobbits
-    </ion-header>
+    </ion-list-header>
     <a ion-item (click)="openModal({charNum: 0})">
       Gollum
     </a>
diff --git a/demos/icons/main.html b/demos/icons/main.html
index db1d77eaa9..03246be55c 100644
--- a/demos/icons/main.html
+++ b/demos/icons/main.html
@@ -7,9 +7,9 @@
 
 <ion-list>
 
-  <ion-header>
+  <ion-list-header>
     Favorite Icons
-  </ion-header>
+  </ion-list-header>
 
   <ion-switch>
     <icon wifi item-left></icon>
diff --git a/demos/list/main.html b/demos/list/main.html
index 1e3d7f18d6..ee99360090 100644
--- a/demos/list/main.html
+++ b/demos/list/main.html
@@ -4,9 +4,9 @@
 
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
       List Header
-    </ion-header>
+    </ion-list-header>
 
     <ion-switch>
       <icon wifi item-left></icon>
@@ -34,9 +34,9 @@
 
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
       List Header
-    </ion-header>
+    </ion-list-header>
 
     <ion-switch checked="true">
       <icon color-wand item-left></icon>
@@ -56,9 +56,9 @@
 
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
       List Header with text that is too long to fit inside the list header
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       <icon pizza item-left></icon>
diff --git a/ionic/components/card/test/list/main.html b/ionic/components/card/test/list/main.html
index 7e426fdc17..75d7978682 100644
--- a/ionic/components/card/test/list/main.html
+++ b/ionic/components/card/test/list/main.html
@@ -7,9 +7,9 @@
 
     <ion-list>
 
-      <ion-header>
+      <ion-list-header>
         Card List
-      </ion-header>
+      </ion-list-header>
 
       <ion-switch>
         <icon wifi item-left></icon>
@@ -40,9 +40,9 @@
 
     <ion-list no-lines>
 
-      <ion-header>
+      <ion-list-header>
         Card List Without Lines
-      </ion-header>
+      </ion-list-header>
 
       <ion-switch>
         <icon wifi item-left></icon>
diff --git a/ionic/components/list/list.scss b/ionic/components/list/list.scss
index 5bf30e4693..3baddd6091 100644
--- a/ionic/components/list/list.scss
+++ b/ionic/components/list/list.scss
@@ -10,7 +10,7 @@
   padding: 0;
   list-style-type: none;
 
-  ion-header {
+  ion-list-header {
     display: block;
     overflow: hidden;
     white-space: nowrap;
@@ -22,7 +22,7 @@
   overflow: hidden;
   transform: translateZ(0);
 
-  ion-header {
+  ion-list-header {
     background-color: $list-background-color;
   }
 }
diff --git a/ionic/components/list/list.ts b/ionic/components/list/list.ts
index 8066682cd7..887ffe04ae 100644
--- a/ionic/components/list/list.ts
+++ b/ionic/components/list/list.ts
@@ -114,7 +114,7 @@ export class List extends Ion {
 
 
 @Directive({
-  selector: 'ion-header',
+  selector: 'ion-list-header',
   inputs: [
     'id'
   ],
diff --git a/ionic/components/list/modes/ios.scss b/ionic/components/list/modes/ios.scss
index e8dd69c8c2..3839b82db5 100644
--- a/ionic/components/list/modes/ios.scss
+++ b/ionic/components/list/modes/ios.scss
@@ -30,7 +30,7 @@ $list-ios-border-color:               $list-border-color !default;
 .list {
   margin: -1px $list-ios-margin-right $list-ios-margin-bottom $list-ios-margin-left;
 
-  ion-header {
+  ion-list-header {
     position: relative;
     padding: $list-ios-header-padding;
     font-size: $list-ios-header-font-size;
@@ -90,7 +90,7 @@ $list-ios-border-color:               $list-border-color !default;
 .list + .list {
   margin-top: $list-ios-margin-top + $list-ios-margin-bottom;
 
-  ion-header {
+  ion-list-header {
     margin-top: -$list-ios-margin-top;
     padding-top: 0;
   }
@@ -102,7 +102,7 @@ $list-ios-border-color:               $list-border-color !default;
     border-width: 0.55px;
   }
 
-  ion-header {
+  ion-list-header {
     border-bottom-width: 0.55px;
   }
 
@@ -167,7 +167,7 @@ $list-ios-border-color:               $list-border-color !default;
 
 .list[no-lines],
 &.hairlines .list[no-lines] {
-  ion-header,
+  ion-list-header,
   .item,
   .item .item-inner {
     border-width: 0;
diff --git a/ionic/components/list/modes/md.scss b/ionic/components/list/modes/md.scss
index 709739c499..3053540c59 100644
--- a/ionic/components/list/modes/md.scss
+++ b/ionic/components/list/modes/md.scss
@@ -28,7 +28,7 @@ $list-md-border-color:          $item-md-border-color !default;
 .list {
   margin: 0 $list-md-margin-right $list-md-margin-bottom $list-md-margin-left;
 
-  ion-header,
+  ion-list-header,
   ion-item-divider {
     border-bottom: 1px solid $list-md-border-color;
     margin-left: 0;
@@ -85,7 +85,7 @@ $list-md-border-color:          $item-md-border-color !default;
   + .list {
     margin-top: $list-md-margin-top + $list-md-margin-bottom;
 
-    ion-header {
+    ion-list-header {
       margin-top: -$list-md-margin-top;
       padding-top: 0;
     }
diff --git a/ionic/components/list/test/headers/main.html b/ionic/components/list/test/headers/main.html
index 1e3d7f18d6..ee99360090 100644
--- a/ionic/components/list/test/headers/main.html
+++ b/ionic/components/list/test/headers/main.html
@@ -4,9 +4,9 @@
 
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
       List Header
-    </ion-header>
+    </ion-list-header>
 
     <ion-switch>
       <icon wifi item-left></icon>
@@ -34,9 +34,9 @@
 
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
       List Header
-    </ion-header>
+    </ion-list-header>
 
     <ion-switch checked="true">
       <icon color-wand item-left></icon>
@@ -56,9 +56,9 @@
 
   <ion-list>
 
-    <ion-header>
+    <ion-list-header>
       List Header with text that is too long to fit inside the list header
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       <icon pizza item-left></icon>
diff --git a/ionic/components/list/test/inset/main.html b/ionic/components/list/test/inset/main.html
index ee32b5df3e..7c8e6735ee 100644
--- a/ionic/components/list/test/inset/main.html
+++ b/ionic/components/list/test/inset/main.html
@@ -6,9 +6,9 @@
 
   <ion-list inset>
 
-    <ion-header>
+    <ion-list-header>
       Inset List Header
-    </ion-header>
+    </ion-list-header>
 
     <a ion-item href="#">
       <icon alarm item-left></icon>
diff --git a/ionic/components/list/test/no-lines/main.html b/ionic/components/list/test/no-lines/main.html
index 96b718ba80..6c78172f03 100644
--- a/ionic/components/list/test/no-lines/main.html
+++ b/ionic/components/list/test/no-lines/main.html
@@ -2,9 +2,9 @@
 
 <ion-content class="outer-content">
   <ion-list no-lines>
-    <ion-header>
+    <ion-list-header>
       List With No Lines
-    </ion-header>
+    </ion-list-header>
 
     <ion-switch>
       <icon wifi item-left></icon>
@@ -29,9 +29,9 @@
   </ion-list>
 
   <ion-list>
-    <ion-header>
+    <ion-list-header>
       List With No Lines First Item
-    </ion-header>
+    </ion-list-header>
 
     <ion-item no-lines>
       <icon pizza item-left></icon>
@@ -59,9 +59,9 @@
   </ion-list>
 
   <ion-list>
-    <ion-header>
+    <ion-list-header>
       List With No Lines Middle Item
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       <icon pizza item-left></icon>
@@ -89,9 +89,9 @@
   </ion-list>
 
   <ion-list>
-    <ion-header>
+    <ion-list-header>
       List With No Lines Last Item
-    </ion-header>
+    </ion-list-header>
 
     <ion-item>
       <icon pizza item-left></icon>
diff --git a/ionic/components/list/test/repeat-headers/main.html b/ionic/components/list/test/repeat-headers/main.html
index a1b8088a8d..6eb76913d2 100644
--- a/ionic/components/list/test/repeat-headers/main.html
+++ b/ionic/components/list/test/repeat-headers/main.html
@@ -3,9 +3,9 @@
 <ion-content class="outer-content">
   
   <ion-list class="outer-content" *ng-for="#person of people">
-    <ion-header>
+    <ion-list-header>
       {{person.name}}
-    </ion-header>
+    </ion-list-header>
     <ion-item *ng-for="#component of person.components">
       {{component}}
       <div item-right>
diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts
index 70dce48428..61c3a58042 100644
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -25,9 +25,9 @@ class MyCmpTest{}
     </ion-navbar>
     <ion-content>
       <ion-list>
-        <ion-header>
+        <ion-list-header>
           {{title}}
-        </ion-header>
+        </ion-list-header>
 
         <button ion-item class="e2eFrom1To2" (click)="pushFullPage()">Push to FullPage</button>
         <button ion-item (click)="pushPrimaryHeaderPage()">Push to PrimaryHeaderPage</button>
diff --git a/ionic/components/radio/radio.ts b/ionic/components/radio/radio.ts
index 34c2a28f5f..7de459c3eb 100644
--- a/ionic/components/radio/radio.ts
+++ b/ionic/components/radio/radio.ts
@@ -18,9 +18,9 @@ import {ListHeader} from '../list/list';
  * ```html
  * <ion-radio-group ng-control="clientside">
  *
- *   <ion-header>
+ *   <ion-list-header>
  *     Clientside
- *   </ion-header>
+ *   </ion-list-header>
  *
  *   <ion-radio value="ember">
  *     Ember
diff --git a/ionic/components/radio/test/basic/main.html b/ionic/components/radio/test/basic/main.html
index 13bbf16b7d..f4b09f1064 100644
--- a/ionic/components/radio/test/basic/main.html
+++ b/ionic/components/radio/test/basic/main.html
@@ -8,9 +8,9 @@
 
     <ion-radio-group ng-control="fruits">
 
-      <ion-header>
+      <ion-list-header>
         Fruits
-      </ion-header>
+      </ion-list-header>
 
       <ion-radio value="apple" checked="true">
         Apple
diff --git a/ionic/components/tabs/test/basic/index.ts b/ionic/components/tabs/test/basic/index.ts
index ba372eacaa..c8f261c2d7 100644
--- a/ionic/components/tabs/test/basic/index.ts
+++ b/ionic/components/tabs/test/basic/index.ts
@@ -10,9 +10,9 @@
     </ion-navbar>
     <ion-content>
       <ion-list>
-        <ion-header>
+        <ion-list-header>
           Tab 1
-        </ion-header>
+        </ion-list-header>
         <ion-item *ng-for="#i of items">Item {{i}} {{i}} {{i}} {{i}}</ion-item>
       </ion-list>
     </ion-content>