diff --git a/ui/src/components/table-new/index.js b/ui/src/components/table-data-table/index.js
similarity index 100%
rename from ui/src/components/table-new/index.js
rename to ui/src/components/table-data-table/index.js
diff --git a/ui/src/components/table-new/readme.md b/ui/src/components/table-data-table/readme.md
similarity index 100%
rename from ui/src/components/table-new/readme.md
rename to ui/src/components/table-data-table/readme.md
diff --git a/ui/src/components/table-new/story.js b/ui/src/components/table-data-table/story.js
similarity index 92%
rename from ui/src/components/table-new/story.js
rename to ui/src/components/table-data-table/story.js
index da8f34ca..7fd33496 100644
--- a/ui/src/components/table-new/story.js
+++ b/ui/src/components/table-data-table/story.js
@@ -41,8 +41,8 @@ const data = [{
   key: 2
 }];
 
-storiesOf('Table New', module)
-  .add('Table New', () => (
+storiesOf('Table - Data Table', module)
+  .add('Default', () => (
     <Base>
       <Table
         columns={columns}
diff --git a/ui/src/components/table-new/table-body.js b/ui/src/components/table-data-table/table-body.js
similarity index 100%
rename from ui/src/components/table-new/table-body.js
rename to ui/src/components/table-data-table/table-body.js
diff --git a/ui/src/components/table-new/table-content.js b/ui/src/components/table-data-table/table-content.js
similarity index 100%
rename from ui/src/components/table-new/table-content.js
rename to ui/src/components/table-data-table/table-content.js
diff --git a/ui/src/components/table-new/table-head.js b/ui/src/components/table-data-table/table-head.js
similarity index 100%
rename from ui/src/components/table-new/table-head.js
rename to ui/src/components/table-data-table/table-head.js
diff --git a/ui/src/components/table-new/table-row.js b/ui/src/components/table-data-table/table-row.js
similarity index 94%
rename from ui/src/components/table-new/table-row.js
rename to ui/src/components/table-data-table/table-row.js
index 226f38c5..34dc65d4 100644
--- a/ui/src/components/table-new/table-row.js
+++ b/ui/src/components/table-data-table/table-row.js
@@ -22,4 +22,4 @@ Row.propTypes = {
   dataItem: React.PropTypes.object
 };
 
-module.export = Row;
\ No newline at end of file
+module.exports = Row;
\ No newline at end of file
diff --git a/ui/src/components/table/index.js b/ui/src/components/table-simple-table/index.js
similarity index 100%
rename from ui/src/components/table/index.js
rename to ui/src/components/table-simple-table/index.js
diff --git a/ui/src/components/table/readme.md b/ui/src/components/table-simple-table/readme.md
similarity index 100%
rename from ui/src/components/table/readme.md
rename to ui/src/components/table-simple-table/readme.md
diff --git a/ui/src/components/table/story.js b/ui/src/components/table-simple-table/story.js
similarity index 94%
rename from ui/src/components/table/story.js
rename to ui/src/components/table-simple-table/story.js
index 3afc85ff..9b3b48ff 100644
--- a/ui/src/components/table/story.js
+++ b/ui/src/components/table-simple-table/story.js
@@ -15,8 +15,8 @@ const {
   TableRow
 } = _table;
 
-storiesOf('Table', module)
-  .add('Table', () => (
+storiesOf('Table - Simple', module)
+  .add('Default', () => (
     <Base>
       <Table>
         <TableHead>
diff --git a/ui/src/components/table/table-body.js b/ui/src/components/table-simple-table/table-body.js
similarity index 100%
rename from ui/src/components/table/table-body.js
rename to ui/src/components/table-simple-table/table-body.js
diff --git a/ui/src/components/table/table-cell.js b/ui/src/components/table-simple-table/table-cell.js
similarity index 100%
rename from ui/src/components/table/table-cell.js
rename to ui/src/components/table-simple-table/table-cell.js
diff --git a/ui/src/components/table/table-head.js b/ui/src/components/table-simple-table/table-head.js
similarity index 100%
rename from ui/src/components/table/table-head.js
rename to ui/src/components/table-simple-table/table-head.js
diff --git a/ui/src/components/table/table-item.js b/ui/src/components/table-simple-table/table-item.js
similarity index 100%
rename from ui/src/components/table/table-item.js
rename to ui/src/components/table-simple-table/table-item.js
diff --git a/ui/src/components/table/table-row.js b/ui/src/components/table-simple-table/table-row.js
similarity index 100%
rename from ui/src/components/table/table-row.js
rename to ui/src/components/table-simple-table/table-row.js
diff --git a/ui/src/components/table/table.js b/ui/src/components/table-simple-table/table.js
similarity index 100%
rename from ui/src/components/table/table.js
rename to ui/src/components/table-simple-table/table.js