diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js
index 2abb8e77054..4072f719ba1 100644
--- a/src/app/controllers/dash.js
+++ b/src/app/controllers/dash.js
@@ -11,7 +11,7 @@ function (angular, $, config, _) {
   var module = angular.module('grafana.controllers');
 
   module.controller('DashCtrl', function(
-    $scope, $rootScope, dashboardKeybindings, filterSrv, dashboard, panelMoveSrv, timer) {
+    $scope, $rootScope, dashboardKeybindings, filterSrv, dashboardSrv, panelMoveSrv, timer) {
 
     $scope.editor = { index: 0 };
     $scope.panelNames = config.panels;
@@ -26,7 +26,7 @@ function (angular, $, config, _) {
 
       $rootScope.fullscreen = false;
 
-      $scope.dashboard = dashboard.create(dashboardData);
+      $scope.dashboard = dashboardSrv.create(dashboardData);
       $scope.grafana.style = $scope.dashboard.style;
 
       $scope.filter = filterSrv;
diff --git a/src/app/services/all.js b/src/app/services/all.js
index a9462629f5d..a1479355def 100644
--- a/src/app/services/all.js
+++ b/src/app/services/all.js
@@ -10,6 +10,6 @@ define([
   './playlistSrv',
   './unsavedChangesSrv',
   './dashboard/dashboardKeyBindings',
-  './dashboard/dashboardModel',
+  './dashboard/dashboardSrv',
 ],
 function () {});
diff --git a/src/app/services/dashboard/dashboardModel.js b/src/app/services/dashboard/dashboardSrv.js
similarity index 97%
rename from src/app/services/dashboard/dashboardModel.js
rename to src/app/services/dashboard/dashboardSrv.js
index ba8d24d097c..002f19cca15 100644
--- a/src/app/services/dashboard/dashboardModel.js
+++ b/src/app/services/dashboard/dashboardSrv.js
@@ -10,7 +10,7 @@ function (angular, $, kbn, _) {
 
   var module = angular.module('grafana.services');
 
-  module.service('dashboard', function(timer, $rootScope, $timeout) {
+  module.service('dashboardSrv', function(timer, $rootScope, $timeout) {
 
     function DashboardModel (data) {
 
diff --git a/src/test/specs/dashboardModel-specs.js b/src/test/specs/dashboardSrv-specs.js
similarity index 89%
rename from src/test/specs/dashboardModel-specs.js
rename to src/test/specs/dashboardSrv-specs.js
index 5b92caafe46..6a43845a7d7 100644
--- a/src/test/specs/dashboardModel-specs.js
+++ b/src/test/specs/dashboardSrv-specs.js
@@ -1,5 +1,5 @@
 define([
-  'services/dashboard/dashboardModel'
+  'services/dashboard/dashboardSrv'
 ], function() {
   'use strict';
 
@@ -8,8 +8,8 @@ define([
 
     beforeEach(module('grafana.services'));
 
-    beforeEach(inject(function(dashboard) {
-      model = dashboard.create({});
+    beforeEach(inject(function(dashboardSrv) {
+      model = dashboardSrv.create({});
     }));
 
     it('should have title', function() {
@@ -30,8 +30,8 @@ define([
 
     beforeEach(module('grafana.services'));
 
-    beforeEach(inject(function(dashboard) {
-      model = dashboard.create({
+    beforeEach(inject(function(dashboardSrv) {
+      model = dashboardSrv.create({
         services: { filter: { time: { from: 'now-1d', to: 'now'}, list: [1] }},
         rows: [
           {
diff --git a/src/test/test-main.js b/src/test/test-main.js
index dcfb7ac5b19..be403d19a72 100644
--- a/src/test/test-main.js
+++ b/src/test/test-main.js
@@ -121,7 +121,7 @@ require([
     'specs/graph-ctrl-specs',
     'specs/filterSrv-specs',
     'specs/kbn-format-specs',
-    'specs/dashboardModel-specs',
+    'specs/dashboardSrv-specs',
     'specs/influxSeries-specs'
   ], function () {
     window.__karma__.start();