diff --git a/core-layout-host.css b/core-layout-host.css
index 50d01ea..aa5f845 100644
--- a/core-layout-host.css
+++ b/core-layout-host.css
@@ -15,7 +15,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   display: flex !important;
 }
   
-:host(.core-row) {
+:host(.core-h) {
   -webkit-box-orient: horizontal;
   -ms-flex-direction: row;
   -moz-flex-direction: row;
@@ -23,7 +23,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   flex-direction: row;
 }
   
-:host(.core-vertical) {
+:host(.core-v) {
   -webkit-box-orient: vertical;
   -ms-flex-direction: column;
   -moz-flex-direction: column;
@@ -31,7 +31,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   flex-direction: column;
 }
 
-:host(.core-row.core-reverse) {
+:host(.core-h.core-reverse) {
   -webkit-box-direction: reverse;
   -ms-flex-direction: row-reverse;
   -moz-flex-direction: row-reverse;
@@ -39,7 +39,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   flex-direction: row-reverse;
 }
   
-:host(.core-vertical.core-reverse) {
+:host(.core-v.core-reverse) {
   -webkit-box-direction: reverse;
   -ms-flex-direction: column-reverse;
   -moz-flex-direction: column-reverse;
diff --git a/core-layout.css b/core-layout.css
index 4dbc2c7..fcf4796 100644
--- a/core-layout.css
+++ b/core-layout.css
@@ -4,7 +4,7 @@ Use of this source code is governed by a BSD-style
 license that can be found in the LICENSE file.
 */
 
-.core-row, .core-column {
+.core-h, .core-v {
   display: -webkit-box !important;
   display: -ms-flexbox !important;
   display: -moz-flex !important;
@@ -12,7 +12,7 @@ license that can be found in the LICENSE file.
   display: flex !important;
 }
 
-.core-row {
+.core-h {
   -webkit-box-orient: horizontal;
   -ms-flex-direction: row;
   -moz-flex-direction: row;
@@ -20,7 +20,7 @@ license that can be found in the LICENSE file.
   flex-direction: row;
 }
 
-.core-row.core-reverse {
+.core-h.core-reverse {
   -webkit-box-direction: reverse;
   -ms-flex-direction: row-reverse;
   -moz-flex-direction: row-reverse;
@@ -28,7 +28,7 @@ license that can be found in the LICENSE file.
   flex-direction: row-reverse;
 }
 
-.core-column {
+.core-v {
   -webkit-box-orient: vertical;
   -ms-flex-direction: column;
   -moz-flex-direction: column;
@@ -36,7 +36,7 @@ license that can be found in the LICENSE file.
   flex-direction: column;
 }
 
-.core-column.core-reverse {
+.core-v.core-reverse {
   -webkit-box-direction: reverse;
   -ms-flex-direction: column-reverse;
   -moz-flex-direction: column-reverse;
diff --git a/core-layout.html b/core-layout.html
index 03154eb..a60c203 100644
--- a/core-layout.html
+++ b/core-layout.html
@@ -266,7 +266,7 @@
 
       verticalChanged: function(old) {
         old = old ? 'column' : 'row';
-        var vertical = this.vertical ? 'column' : 'row';
+        var vertical = this.vertical ? 'v' : 'h';
         this.setLayoutClass('', old, vertical);
       },
 
diff --git a/demo.html b/demo.html
index 8e9cf19..f8fed78 100644
--- a/demo.html
+++ b/demo.html
@@ -52,14 +52,14 @@
       </style>
       <link rel="stylesheet" href="core-layout.css">
       <link rel="stylesheet" href="core-layout-host.css">
-      <div class="core-flex core-row">
+      <div class="core-flex core-h">
         <div>Hi I'm some content</div>
-        <div class="core-flex core-column">
-          <div class="core-row core-align-center">
+        <div class="core-flex core-v">
+          <div class="core-h core-align-center">
             <h3>Title</h3>
             <button>hello</button>
           </div>
-          <div class="core-flex core-row">
+          <div class="core-flex core-h">
             <div class="core-flex core-relative">
               Main content
               <div class="abs">abs pos :)</div>
@@ -67,7 +67,7 @@ <h3>Title</h3>
             <div>Sidebar content</div>
           </div>
           <div>Some more stuffs...</div>
-          <div class="core-row core-justify-end">
+          <div class="core-h core-justify-end">
             <b>Footer</b>
           </div>
         </div>