diff --git a/public/app/features/dashboard/dashboard_ctrl.ts b/public/app/features/dashboard/dashboard_ctrl.ts
index 20b98a19380..47c459b0f13 100644
--- a/public/app/features/dashboard/dashboard_ctrl.ts
+++ b/public/app/features/dashboard/dashboard_ctrl.ts
@@ -2,7 +2,7 @@ import config from 'app/core/config';
 
 import coreModule from 'app/core/core_module';
 import {PanelContainer} from './dashgrid/PanelContainer';
-import {DashboardModel} from './DashboardModel';
+import {DashboardModel} from './dashboard_model';
 
 export class DashboardCtrl implements PanelContainer {
   dashboard: DashboardModel;
diff --git a/public/app/features/dashboard/DashboardModel.ts b/public/app/features/dashboard/dashboard_model.ts
similarity index 99%
rename from public/app/features/dashboard/DashboardModel.ts
rename to public/app/features/dashboard/dashboard_model.ts
index a71e33edc68..2cee50fd3a1 100644
--- a/public/app/features/dashboard/DashboardModel.ts
+++ b/public/app/features/dashboard/dashboard_model.ts
@@ -4,7 +4,7 @@ import _ from 'lodash';
 import {DEFAULT_ANNOTATION_COLOR} from 'app/core/utils/colors';
 import {Emitter, contextSrv, appEvents} from 'app/core/core';
 import {DashboardRow} from './row/row_model';
-import {PanelModel} from './PanelModel';
+import {PanelModel} from './panel_model';
 import sortByKeys from 'app/core/utils/sort_by_keys';
 
 export const CELL_HEIGHT = 30;
diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
index 4502d4cdc6e..7c1af20716b 100644
--- a/public/app/features/dashboard/dashboard_srv.ts
+++ b/public/app/features/dashboard/dashboard_srv.ts
@@ -1,5 +1,5 @@
 import coreModule from 'app/core/core_module';
-import {DashboardModel} from './DashboardModel';
+import {DashboardModel} from './dashboard_model';
 
 export class DashboardSrv {
   dash: any;
diff --git a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
index 0e034b509a4..6aecb903479 100644
--- a/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import coreModule from 'app/core/core_module';
 import ReactGridLayout from 'react-grid-layout';
-import {CELL_HEIGHT, CELL_VMARGIN} from '../DashboardModel';
+import {CELL_HEIGHT, CELL_VMARGIN} from '../dashboard_model';
 import {DashboardPanel} from './DashboardPanel';
-import {DashboardModel} from '../DashboardModel';
+import {DashboardModel} from '../dashboard_model';
 import {PanelContainer} from './PanelContainer';
-import {PanelModel} from '../PanelModel';
+import {PanelModel} from '../panel_model';
 import classNames from 'classnames';
 import sizeMe from 'react-sizeme';
 
diff --git a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
index 5c7f2178c96..33f30b7188b 100644
--- a/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
+++ b/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import {PanelModel} from '../PanelModel';
+import {PanelModel} from '../panel_model';
 import {PanelContainer} from './PanelContainer';
 import {AttachedPanel} from './PanelLoader';
 
diff --git a/public/app/features/dashboard/dashgrid/PanelContainer.ts b/public/app/features/dashboard/dashgrid/PanelContainer.ts
index e2e524ed8da..66ec2a7c6f3 100644
--- a/public/app/features/dashboard/dashgrid/PanelContainer.ts
+++ b/public/app/features/dashboard/dashgrid/PanelContainer.ts
@@ -1,4 +1,4 @@
-import {DashboardModel}  from '../DashboardModel';
+import {DashboardModel}  from '../dashboard_model';
 import {PanelLoader} from './PanelLoader';
 
 export interface PanelContainer {
diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts
index 4b2587d8ed3..07b6dde3f0f 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/dashnav/dashnav.ts
@@ -4,7 +4,7 @@ import _ from 'lodash';
 import moment from 'moment';
 import angular from 'angular';
 import {appEvents, NavModel} from 'app/core/core';
-import {DashboardModel} from '../DashboardModel';
+import {DashboardModel} from '../dashboard_model';
 
 export class DashNavCtrl {
   dashboard: DashboardModel;
diff --git a/public/app/features/dashboard/history/history.ts b/public/app/features/dashboard/history/history.ts
index 98c737e53c3..b0dee045a6a 100644
--- a/public/app/features/dashboard/history/history.ts
+++ b/public/app/features/dashboard/history/history.ts
@@ -6,7 +6,7 @@ import _ from 'lodash';
 import angular from 'angular';
 import moment from 'moment';
 
-import {DashboardModel} from '../DashboardModel';
+import {DashboardModel} from '../dashboard_model';
 import {HistoryListOpts, RevisionsModel, CalculateDiffOptions, HistorySrv} from './history_srv';
 
 export class HistoryListCtrl {
diff --git a/public/app/features/dashboard/history/history_srv.ts b/public/app/features/dashboard/history/history_srv.ts
index 7fd4705c823..4a9e85c1b9d 100644
--- a/public/app/features/dashboard/history/history_srv.ts
+++ b/public/app/features/dashboard/history/history_srv.ts
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import coreModule from 'app/core/core_module';
-import {DashboardModel} from '../DashboardModel';
+import {DashboardModel} from '../dashboard_model';
 
 export interface HistoryListOpts {
   limit: number;
diff --git a/public/app/features/dashboard/PanelModel.ts b/public/app/features/dashboard/panel_model.ts
similarity index 100%
rename from public/app/features/dashboard/PanelModel.ts
rename to public/app/features/dashboard/panel_model.ts
diff --git a/public/app/features/dashboard/specs/dashboard_model_specs.ts b/public/app/features/dashboard/specs/dashboard_model_specs.ts
index bc6c27e63aa..0b5971f939e 100644
--- a/public/app/features/dashboard/specs/dashboard_model_specs.ts
+++ b/public/app/features/dashboard/specs/dashboard_model_specs.ts
@@ -1,8 +1,8 @@
 import {describe, beforeEach, it, expect} from 'test/lib/common';
 
 import _ from 'lodash';
-import {DashboardModel} from '../DashboardModel';
-import {PanelModel} from '../PanelModel';
+import {DashboardModel} from '../dashboard_model';
+import {PanelModel} from '../panel_model';
 
 describe('DashboardModel', function() {
 
diff --git a/public/app/features/dashboard/specs/exporter_specs.ts b/public/app/features/dashboard/specs/exporter_specs.ts
index f82accb628b..65fa283b018 100644
--- a/public/app/features/dashboard/specs/exporter_specs.ts
+++ b/public/app/features/dashboard/specs/exporter_specs.ts
@@ -3,7 +3,7 @@ import {describe, beforeEach, it, sinon, expect} from 'test/lib/common';
 import _ from 'lodash';
 import config from 'app/core/config';
 import {DashboardExporter} from '../export/exporter';
-import {DashboardModel} from '../DashboardModel';
+import {DashboardModel} from '../dashboard_model';
 
 describe('given dashboard with repeated panels', function() {
   var dash, exported;
@@ -103,7 +103,6 @@ describe('given dashboard with repeated panels', function() {
     };
 
     dash = new DashboardModel(dash, {});
-    dash.getSaveModelClone();
     var exporter = new DashboardExporter(datasourceSrvStub);
     exporter.makeExportable(dash).then(clean => {
       exported = clean;
diff --git a/public/app/features/panel/metrics_tab.ts b/public/app/features/panel/metrics_tab.ts
index b32e9fc21c1..e80a9a51ec1 100644
--- a/public/app/features/panel/metrics_tab.ts
+++ b/public/app/features/panel/metrics_tab.ts
@@ -1,4 +1,4 @@
-import {DashboardModel} from '../dashboard/DashboardModel';
+import {DashboardModel} from '../dashboard/dashboard_model';
 import Remarkable from 'remarkable';
 
 export class MetricsTabCtrl {
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index ad0af0fbc18..55957d47762 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -3,7 +3,7 @@ import _ from 'lodash';
 import $ from 'jquery';
 import {profiler} from 'app/core/profiler';
 import Remarkable from 'remarkable';
-import {CELL_HEIGHT, CELL_VMARGIN} from '../dashboard/DashboardModel';
+import {CELL_HEIGHT, CELL_VMARGIN} from '../dashboard/dashboard_model';
 
 const TITLE_HEIGHT = 25;
 const EMPTY_TITLE_HEIGHT = 9;
diff --git a/public/test/specs/helpers.ts b/public/test/specs/helpers.ts
index 709617a9465..8e83915362f 100644
--- a/public/test/specs/helpers.ts
+++ b/public/test/specs/helpers.ts
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import config from 'app/core/config';
 import * as dateMath from 'app/core/utils/datemath';
 import {angularMocks, sinon} from '../lib/common';
-import {PanelModel} from 'app/features/dashboard/PanelModel';
+import {PanelModel} from 'app/features/dashboard/panel_model';
 
 export function ControllerTestContext() {
   var self = this;
diff --git a/scripts/webpack/webpack.test.js b/scripts/webpack/webpack.test.js
index f30c7876185..000fd292760 100644
--- a/scripts/webpack/webpack.test.js
+++ b/scripts/webpack/webpack.test.js
@@ -13,10 +13,10 @@ config = merge(common, {
     fs: 'empty'
   },
   plugins: [
-    new webpack.SourceMapDevToolPlugin({
-      filename: null, // if no value is provided the sourcemap is inlined
-      test: /\.(ts|js)($|\?)/i // process .js and .ts files only
-    })
+    // new webpack.SourceMapDevToolPlugin({
+    //   filename: null, // if no value is provided the sourcemap is inlined
+    //   test: /\.(ts|js)($|\?)/i // process .js and .ts files only
+    // })
   ]
 });