diff --git a/frontend/src/metabase/query_builder/components/VisualizationSettings.jsx b/frontend/src/metabase/query_builder/components/VisualizationSettings.jsx
index 8ea7b0a136679edff6cb965d3cae992b63aa454f..04224216d2446991741d391f9536383f3ab026ff 100644
--- a/frontend/src/metabase/query_builder/components/VisualizationSettings.jsx
+++ b/frontend/src/metabase/query_builder/components/VisualizationSettings.jsx
@@ -40,7 +40,7 @@ export default class VisualizationSettings extends React.Component {
                     name={CardVisualization.iconName}
                     size={12}
                 />
-                {CardVisualization.displayName}
+                {CardVisualization.uiName}
                 <Icon className="ml1" name="chevrondown" size={8} />
             </span>
         );
@@ -73,7 +73,7 @@ export default class VisualizationSettings extends React.Component {
                                 onClick={this.setDisplay.bind(null, vizType)}
                             >
                                 <Icon name={viz.iconName} size={12} />
-                                <span className="ml1">{viz.displayName}</span>
+                                <span className="ml1">{viz.uiName}</span>
                             </li>
                         )}
                     </ul>
diff --git a/frontend/src/metabase/visualizations/AreaChart.jsx b/frontend/src/metabase/visualizations/AreaChart.jsx
index c9c08e1ebf74eea07f0caaef9cce8bd45062f2f2..2d1d2e4c07c134321e07dd989ba9649094e3bca3 100644
--- a/frontend/src/metabase/visualizations/AreaChart.jsx
+++ b/frontend/src/metabase/visualizations/AreaChart.jsx
@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
 import LineAreaBarChart from "./components/LineAreaBarChart.jsx";
 
 export default class AreaChart extends LineAreaBarChart {
-    static displayName = "Area";
+    static uiName = "Area";
     static identifier = "area";
     static iconName = "area";
     static noun = "area chart";
diff --git a/frontend/src/metabase/visualizations/BarChart.jsx b/frontend/src/metabase/visualizations/BarChart.jsx
index f267dc73b80e60a685e16bce392d9c99ede36a74..c00633c36caf7308b99c6b24e0a97def5a32d8ea 100644
--- a/frontend/src/metabase/visualizations/BarChart.jsx
+++ b/frontend/src/metabase/visualizations/BarChart.jsx
@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
 import LineAreaBarChart from "./components/LineAreaBarChart.jsx";
 
 export default class BarChart extends LineAreaBarChart {
-    static displayName = "Bar";
+    static uiName = "Bar";
     static identifier = "bar";
     static iconName = "bar";
     static noun = "bar chart";
diff --git a/frontend/src/metabase/visualizations/Funnel.jsx b/frontend/src/metabase/visualizations/Funnel.jsx
index 7dcbbd2e1a263a0a838d65446964b1db0fb2437b..16d0c8a00a42a3fbafcc005f627d1b2dabe32caa 100644
--- a/frontend/src/metabase/visualizations/Funnel.jsx
+++ b/frontend/src/metabase/visualizations/Funnel.jsx
@@ -8,7 +8,7 @@ import { getSettings } from "metabase/lib/visualization_settings";
 import i from "icepick";
 
 export default class Funnel extends Component {
-    static displayName = "Funnel";
+    static uiName = "Funnel";
     static identifier = "funnel";
     static iconName = "funnel";
 
diff --git a/frontend/src/metabase/visualizations/LineChart.jsx b/frontend/src/metabase/visualizations/LineChart.jsx
index 45406129e96378c1a65c7b14db0eb5436199d53b..88a0dba4c4178c87bca2205bd13104773edc5729 100644
--- a/frontend/src/metabase/visualizations/LineChart.jsx
+++ b/frontend/src/metabase/visualizations/LineChart.jsx
@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
 import LineAreaBarChart from "./components/LineAreaBarChart.jsx";
 
 export default class LineChart extends LineAreaBarChart {
-    static displayName = "Line";
+    static uiName = "Line";
     static identifier = "line";
     static iconName = "line";
     static noun = "line chart";
diff --git a/frontend/src/metabase/visualizations/Map.jsx b/frontend/src/metabase/visualizations/Map.jsx
index 1fa4d557f498a03856c3435494f7e9e1ae77df32..85d4d4c42595091b898e27e2275d791991668967 100644
--- a/frontend/src/metabase/visualizations/Map.jsx
+++ b/frontend/src/metabase/visualizations/Map.jsx
@@ -6,7 +6,7 @@ import PinMap from "./PinMap.jsx";
 import { ChartSettingsError } from "metabase/visualizations/lib/errors";
 
 export default class Map extends Component {
-    static displayName = "Map";
+    static uiName = "Map";
     static identifier = "map";
     static iconName = "pinmap";
 
diff --git a/frontend/src/metabase/visualizations/PieChart.jsx b/frontend/src/metabase/visualizations/PieChart.jsx
index 4490dc65694a03c06ddea37dc3844e9a04b79974..91b0eff55127c1d43cf14ed9ab0369c4612276a9 100644
--- a/frontend/src/metabase/visualizations/PieChart.jsx
+++ b/frontend/src/metabase/visualizations/PieChart.jsx
@@ -27,7 +27,7 @@ const OTHER_SLICE_MIN_PERCENTAGE = 0.003;
 const PERCENT_REGEX = /percent/i;
 
 export default class PieChart extends Component {
-    static displayName = "Pie";
+    static uiName = "Pie";
     static identifier = "pie";
     static iconName = "pie";
 
diff --git a/frontend/src/metabase/visualizations/PinMap.jsx b/frontend/src/metabase/visualizations/PinMap.jsx
index a43c7025d1d211c2794ba96a2e9db8f8c98ba021..6874ac44beb46c3905cd9d3259bf94697b95ffbe 100644
--- a/frontend/src/metabase/visualizations/PinMap.jsx
+++ b/frontend/src/metabase/visualizations/PinMap.jsx
@@ -17,7 +17,7 @@ const MAP_COMPONENTS_BY_TYPE = {
 }
 
 export default class PinMap extends Component {
-    static displayName = "Pin Map";
+    static uiName = "Pin Map";
     static identifier = "pin_map";
     static iconName = "pinmap";
 
diff --git a/frontend/src/metabase/visualizations/Progress.jsx b/frontend/src/metabase/visualizations/Progress.jsx
index 0377fbc4719f0f49e6a08d51bc833253d106deac..ad1e11cabb0fc466fc6aeb0e7f328e72b3469c75 100644
--- a/frontend/src/metabase/visualizations/Progress.jsx
+++ b/frontend/src/metabase/visualizations/Progress.jsx
@@ -11,7 +11,7 @@ import Color from "color";
 const BORDER_RADIUS = 5;
 
 export default class Progress extends Component {
-    static displayName = "Progress";
+    static uiName = "Progress";
     static identifier = "progress";
     static iconName = "progress";
 
diff --git a/frontend/src/metabase/visualizations/Scalar.jsx b/frontend/src/metabase/visualizations/Scalar.jsx
index 3b08089c20d4eb17c3b59efe753a31cedf55e63b..ff1ffe39c7d3ea886d034bb06ecdee0096b59883 100644
--- a/frontend/src/metabase/visualizations/Scalar.jsx
+++ b/frontend/src/metabase/visualizations/Scalar.jsx
@@ -14,7 +14,7 @@ import i from "icepick";
 import d3 from "d3";
 
 export default class Scalar extends Component {
-    static displayName = "Number";
+    static uiName = "Number";
     static identifier = "scalar";
     static iconName = "number";
 
diff --git a/frontend/src/metabase/visualizations/ScatterPlot.jsx b/frontend/src/metabase/visualizations/ScatterPlot.jsx
index 0f5af3c5857028dcf750249f9dba71e4d689cbdd..0f90ba6ad33bf25a9b4cb2ac168152b4b29033b6 100644
--- a/frontend/src/metabase/visualizations/ScatterPlot.jsx
+++ b/frontend/src/metabase/visualizations/ScatterPlot.jsx
@@ -3,7 +3,7 @@ import React, { Component, PropTypes } from "react";
 import LineAreaBarChart from "./components/LineAreaBarChart.jsx";
 
 export default class ScatterPlot extends LineAreaBarChart {
-    static displayName = "Scatter";
+    static uiName = "Scatter";
     static identifier = "scatter";
     static iconName = "bubble";
     static noun = "scatter plot";
diff --git a/frontend/src/metabase/visualizations/Table.jsx b/frontend/src/metabase/visualizations/Table.jsx
index fa9c2708f758be12725500f054505f4fd2ef691a..51813928bcb11f2240703c4a2164b323afe6f804 100644
--- a/frontend/src/metabase/visualizations/Table.jsx
+++ b/frontend/src/metabase/visualizations/Table.jsx
@@ -7,7 +7,7 @@ import * as DataGrid from "metabase/lib/data_grid";
 import _ from "underscore";
 
 export default class Bar extends Component {
-    static displayName = "Table";
+    static uiName = "Table";
     static identifier = "table";
     static iconName = "table";
 
diff --git a/frontend/src/metabase/visualizations/XKCDChart.jsx b/frontend/src/metabase/visualizations/XKCDChart.jsx
index a8a61456dc9380662155493385fc9623dd242942..58a86f42c71c22de157d1ab72f9484fc4e8dbe4e 100644
--- a/frontend/src/metabase/visualizations/XKCDChart.jsx
+++ b/frontend/src/metabase/visualizations/XKCDChart.jsx
@@ -19,7 +19,7 @@ import "xkcdplot/humor-sans";
 import cx from "classnames";
 
 export default class XKCDChart extends Component {
-    static displayName = "XKCD"
+    static uiName = "XKCD"
     static identifier = "xkcd";
     static iconName = "pinmap";