diff --git a/src/components/ha-zone-cards.html b/src/components/ha-cards.html
similarity index 98%
rename from src/components/ha-zone-cards.html
rename to src/components/ha-cards.html
index 1d364ba63e..04d2cddbc4 100644
--- a/src/components/ha-zone-cards.html
+++ b/src/components/ha-cards.html
@@ -5,7 +5,7 @@
 <link rel="import" href="../cards/ha-domain-card.html">
 <link rel="import" href="../cards/ha-introduction-card.html">
 
-<dom-module id="ha-zone-cards">
+<dom-module id="ha-cards">
   <style>
     :host {
       display: block;
diff --git a/src/components/ha-zone-cards.js b/src/components/ha-cards.js
similarity index 99%
rename from src/components/ha-zone-cards.js
rename to src/components/ha-cards.js
index 21eda4f370..327dc07919 100644
--- a/src/components/ha-zone-cards.js
+++ b/src/components/ha-cards.js
@@ -32,7 +32,7 @@ function entitySortBy(entity) {
 }
 
 export default new Polymer({
-  is: 'ha-zone-cards',
+  is: 'ha-cards',
 
   properties: {
     showIntroduction: {
diff --git a/src/layouts/partial-zone.html b/src/layouts/partial-zone.html
index 35aaab335f..5f034468f3 100644
--- a/src/layouts/partial-zone.html
+++ b/src/layouts/partial-zone.html
@@ -4,7 +4,7 @@
 <link rel="import" href="../../bower_components/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="../../bower_components/paper-tabs/paper-tabs.html">
 
-<link rel="import" href="../components/ha-zone-cards.html">
+<link rel="import" href="../components/ha-cards.html">
 
 <dom-module id="partial-zone">
   <style>
@@ -60,9 +60,9 @@
       </paper-toolbar>
 
       <div class='fit'>
-        <ha-zone-cards
+        <ha-cards
           show-introduction='[[computeShowIntroduction(currentView, introductionLoaded, states)]]'
-          states='[[states]]' columns='[[columns]]'></ha-zone-cards>
+          states='[[states]]' columns='[[columns]]'></ha-cards>
       </div>
     </paper-header-panel>
   </template>
diff --git a/src/layouts/partial-zone.js b/src/layouts/partial-zone.js
index 8fb6a07870..1fb42472fd 100644
--- a/src/layouts/partial-zone.js
+++ b/src/layouts/partial-zone.js
@@ -4,7 +4,7 @@ import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
 require('./partial-base');
-require('../components/ha-zone-cards');
+require('../components/ha-cards');
 
 const {
   configGetters,