diff --git a/src/app/components/settings.js b/src/app/components/settings.js
index 38313aeb198..532b2e2b133 100644
--- a/src/app/components/settings.js
+++ b/src/app/components/settings.js
@@ -17,7 +17,7 @@ function (_, crypto) {
       window_title_prefix           : 'Grafana - ',
       panels                        : {
         'graph': { path: 'panels/graph' },
-        'stats': { path: 'panels/stats' },
+        'singlestat': { path: 'panels/singlestat' },
         'text': { path: 'panels/text' }
       },
       plugins                       : {},
diff --git a/src/app/panels/stats/statsEditor.html b/src/app/panels/singlestat/editor.html
similarity index 100%
rename from src/app/panels/stats/statsEditor.html
rename to src/app/panels/singlestat/editor.html
diff --git a/src/app/panels/stats/module.html b/src/app/panels/singlestat/module.html
similarity index 86%
rename from src/app/panels/stats/module.html
rename to src/app/panels/singlestat/module.html
index 353cdd29c5a..b27d9917353 100644
--- a/src/app/panels/stats/module.html
+++ b/src/app/panels/singlestat/module.html
@@ -1,6 +1,6 @@
-<div ng-controller='StatsCtrl'>
+<div ng-controller='SingleStatCtrl'>
 
-	<div class="stats-panel" stats-panel></div>
+	<div class="singlestat-panel" singlestat-panel></div>
 
   <div class="clearfix"></div>
 
diff --git a/src/app/panels/stats/module.js b/src/app/panels/singlestat/module.js
similarity index 96%
rename from src/app/panels/stats/module.js
rename to src/app/panels/singlestat/module.js
index 778b55b284a..1dba78d1ced 100644
--- a/src/app/panels/stats/module.js
+++ b/src/app/panels/singlestat/module.js
@@ -5,15 +5,15 @@ define([
   'components/timeSeries',
   'kbn',
   'services/panelSrv',
-  './statsDirective',
+  './singleStatPanel',
 ],
 function (angular, app, _, TimeSeries, kbn) {
   'use strict';
 
-  var module = angular.module('grafana.panels.stats');
+  var module = angular.module('grafana.panels.singlestat');
   app.useModule(module);
 
-  module.controller('StatsCtrl', function($scope, panelSrv, timeSrv) {
+  module.controller('SingleStatCtrl', function($scope, panelSrv, timeSrv) {
 
     $scope.panelMeta = {
       titlePos: 'left',
@@ -29,7 +29,7 @@ function (angular, app, _, TimeSeries, kbn) {
         },
         {
           title: 'Options',
-          src:'app/panels/stats/statsEditor.html'
+          src:'app/panels/singlestat/editor.html'
         }
       ],
       fullscreenEdit: true,
diff --git a/src/app/panels/stats/statsDirective.js b/src/app/panels/singlestat/singleStatPanel.js
similarity index 89%
rename from src/app/panels/stats/statsDirective.js
rename to src/app/panels/singlestat/singleStatPanel.js
index 27cc61456b1..74823ae83e5 100644
--- a/src/app/panels/stats/statsDirective.js
+++ b/src/app/panels/singlestat/singleStatPanel.js
@@ -10,10 +10,10 @@ define([
 function (angular, app, _, kbn, $) {
   'use strict';
 
-  var module = angular.module('grafana.panels.stats', []);
+  var module = angular.module('grafana.panels.singlestat', []);
   app.useModule(module);
 
-  module.directive('statsPanel', function() {
+  module.directive('singlestatPanel', function() {
 
     return {
       link: function(scope, elem) {
@@ -69,14 +69,14 @@ function (angular, app, _, kbn, $) {
         }
 
         function getBigValueHtml() {
-          var body = '<div class="stats-panel-value-container">';
+          var body = '<div class="singlestat-panel-value-container">';
 
-          if (panel.prefix) { body += getSpan('stats-panel-prefix', panel.prefixFontSize, scope.panel.prefix); }
+          if (panel.prefix) { body += getSpan('singlestat-panel-prefix', panel.prefixFontSize, scope.panel.prefix); }
 
           var value = applyColoringThresholds(data.mainValue, data.mainValueFormated);
-          body += getSpan('stats-panel-value', panel.valueFontSize, value);
+          body += getSpan('singlestat-panel-value', panel.valueFontSize, value);
 
-          if (panel.postfix) { body += getSpan('stats-panel-postfix', panel.postfixFontSize, panel.postfix); }
+          if (panel.postfix) { body += getSpan('singlestat-panel-postfix', panel.postfixFontSize, panel.postfix); }
 
           body += '</div>';
 
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 7b534bcce40..f24d2e21d87 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -6,7 +6,7 @@
 @import "search.less";
 @import "panel.less";
 @import "forms.less";
-@import "stats-panel.less";
+@import "singlestat.less";
 
 .row-control-inner {
   padding:0px;
diff --git a/src/css/less/stats-panel.less b/src/css/less/singlestat.less
similarity index 85%
rename from src/css/less/stats-panel.less
rename to src/css/less/singlestat.less
index 1028da75e18..368be2b3538 100644
--- a/src/css/less/stats-panel.less
+++ b/src/css/less/singlestat.less
@@ -1,10 +1,10 @@
-.stats-panel {
+.singlestat-panel {
   position: relative;
   display: table;
   width: 100%;
 }
 
-.stats-panel-value-container {
+.singlestat-panel-value-container {
   padding: 20px;
   display: table-cell;
   vertical-align: middle;
@@ -15,11 +15,11 @@
   font-weight: bold;
 }
 
-.stats-panel-prefix {
+.singlestat-panel-prefix {
   padding-right: 20px;
 }
 
-.stats-panel-table {
+.singlestat-panel-table {
   width: 100%;
   td {
     padding: 5px 10px;