diff --git a/src/panels/lovelace/cards/hui-row-card.js b/src/panels/lovelace/cards/hui-horizontal-stack-card.js
similarity index 93%
rename from src/panels/lovelace/cards/hui-row-card.js
rename to src/panels/lovelace/cards/hui-horizontal-stack-card.js
index 4e950be970..5140b9792a 100644
--- a/src/panels/lovelace/cards/hui-row-card.js
+++ b/src/panels/lovelace/cards/hui-horizontal-stack-card.js
@@ -4,7 +4,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import computeCardSize from '../common/compute-card-size.js';
 import createCardElement from '../common/create-card-element.js';
 
-class HuiRowCard extends PolymerElement {
+class HuiHorizontalStackCard extends PolymerElement {
   static get template() {
     return html`
       <style>
@@ -84,4 +84,4 @@ class HuiRowCard extends PolymerElement {
   }
 }
 
-customElements.define('hui-row-card', HuiRowCard);
+customElements.define('hui-horizontal-stack-card', HuiHorizontalStackCard);
diff --git a/src/panels/lovelace/cards/hui-column-card.js b/src/panels/lovelace/cards/hui-vertical-stack-card.js
similarity index 93%
rename from src/panels/lovelace/cards/hui-column-card.js
rename to src/panels/lovelace/cards/hui-vertical-stack-card.js
index 247bb34e25..600a4a2ff3 100644
--- a/src/panels/lovelace/cards/hui-column-card.js
+++ b/src/panels/lovelace/cards/hui-vertical-stack-card.js
@@ -4,7 +4,7 @@ import { PolymerElement } from '@polymer/polymer/polymer-element.js';
 import computeCardSize from '../common/compute-card-size.js';
 import createCardElement from '../common/create-card-element.js';
 
-class HuiColumnCard extends PolymerElement {
+class HuiVerticalStackCard extends PolymerElement {
   static get template() {
     return html`
       <style>
@@ -85,4 +85,4 @@ class HuiColumnCard extends PolymerElement {
   }
 }
 
-customElements.define('hui-column-card', HuiColumnCard);
+customElements.define('hui-vertical-stack-card', HuiVerticalStackCard);
diff --git a/src/panels/lovelace/common/create-card-element.js b/src/panels/lovelace/common/create-card-element.js
index 8e8e4bd657..573f1f3074 100644
--- a/src/panels/lovelace/common/create-card-element.js
+++ b/src/panels/lovelace/common/create-card-element.js
@@ -1,12 +1,12 @@
 import fireEvent from '../../../common/dom/fire_event.js';
 
 import '../cards/hui-camera-preview-card.js';
-import '../cards/hui-column-card.js';
 import '../cards/hui-entities-card.js';
 import '../cards/hui-entity-filter-card.js';
 import '../cards/hui-error-card.js';
 import '../cards/hui-glance-card';
 import '../cards/hui-history-graph-card.js';
+import '../cards/hui-horizontal-stack-card.js';
 import '../cards/hui-iframe-card.js';
 import '../cards/hui-markdown-card.js';
 import '../cards/hui-media-control-card.js';
@@ -14,19 +14,19 @@ import '../cards/hui-picture-elements-card';
 import '../cards/hui-picture-entity-card';
 import '../cards/hui-picture-glance-card';
 import '../cards/hui-plant-status-card.js';
-import '../cards/hui-row-card.js';
+import '../cards/hui-vertical-stack-card.js';
 import '../cards/hui-weather-forecast-card';
 
 import createErrorCardConfig from './create-error-card-config.js';
 
 const CARD_TYPES = [
   'camera-preview',
-  'column',
   'entities',
   'entity-filter',
   'error',
   'glance',
   'history-graph',
+  'horizontal-stack',
   'iframe',
   'markdown',
   'media-control',
@@ -34,7 +34,7 @@ const CARD_TYPES = [
   'picture-entity',
   'picture-glance',
   'plant-status',
-  'row',
+  'vertical-stack',
   'weather-forecast'
 ];