diff --git a/public/app/core/controllers/all.js b/public/app/core/controllers/all.js
index 1a313e6b019..d22010cffdc 100644
--- a/public/app/core/controllers/all.js
+++ b/public/app/core/controllers/all.js
@@ -1,12 +1,12 @@
 define([
-  './grafanaCtrl',
-  './search',
-  './inspectCtrl',
-  './jsonEditorCtrl',
-  './loginCtrl',
-  './invitedCtrl',
-  './signupCtrl',
-  './resetPasswordCtrl',
-  './sidemenuCtrl',
-  './errorCtrl',
+  './grafana_ctrl',
+  './search_ctrl',
+  './inspect_ctrl',
+  './json_editor_ctrl',
+  './login_ctrl',
+  './invited_ctrl',
+  './signup_ctrl',
+  './reset_password_ctrl',
+  './sidemenu_ctrl',
+  './error_ctrl',
 ], function () {});
diff --git a/public/app/core/controllers/errorCtrl.js b/public/app/core/controllers/error_ctrl.js
similarity index 100%
rename from public/app/core/controllers/errorCtrl.js
rename to public/app/core/controllers/error_ctrl.js
diff --git a/public/app/core/controllers/grafanaCtrl.js b/public/app/core/controllers/grafana_ctrl.js
similarity index 100%
rename from public/app/core/controllers/grafanaCtrl.js
rename to public/app/core/controllers/grafana_ctrl.js
diff --git a/public/app/core/controllers/inspectCtrl.js b/public/app/core/controllers/inspect_ctrl.js
similarity index 100%
rename from public/app/core/controllers/inspectCtrl.js
rename to public/app/core/controllers/inspect_ctrl.js
diff --git a/public/app/core/controllers/invitedCtrl.js b/public/app/core/controllers/invited_ctrl.js
similarity index 100%
rename from public/app/core/controllers/invitedCtrl.js
rename to public/app/core/controllers/invited_ctrl.js
diff --git a/public/app/core/controllers/jsonEditorCtrl.js b/public/app/core/controllers/json_editor_ctrl.js
similarity index 100%
rename from public/app/core/controllers/jsonEditorCtrl.js
rename to public/app/core/controllers/json_editor_ctrl.js
diff --git a/public/app/core/controllers/loginCtrl.js b/public/app/core/controllers/login_ctrl.js
similarity index 100%
rename from public/app/core/controllers/loginCtrl.js
rename to public/app/core/controllers/login_ctrl.js
diff --git a/public/app/core/controllers/resetPasswordCtrl.js b/public/app/core/controllers/reset_password_ctrl.js
similarity index 100%
rename from public/app/core/controllers/resetPasswordCtrl.js
rename to public/app/core/controllers/reset_password_ctrl.js
diff --git a/public/app/core/controllers/search.js b/public/app/core/controllers/search_ctrl.js
similarity index 100%
rename from public/app/core/controllers/search.js
rename to public/app/core/controllers/search_ctrl.js
diff --git a/public/app/core/controllers/sidemenuCtrl.js b/public/app/core/controllers/sidemenu_ctrl.js
similarity index 100%
rename from public/app/core/controllers/sidemenuCtrl.js
rename to public/app/core/controllers/sidemenu_ctrl.js
diff --git a/public/app/core/controllers/signupCtrl.ts b/public/app/core/controllers/signup_ctrl.ts
similarity index 100%
rename from public/app/core/controllers/signupCtrl.ts
rename to public/app/core/controllers/signup_ctrl.ts
diff --git a/public/app/core/services/alertSrv.js b/public/app/core/services/alert_srv.js
similarity index 100%
rename from public/app/core/services/alertSrv.js
rename to public/app/core/services/alert_srv.js
diff --git a/public/app/core/services/all.js b/public/app/core/services/all.js
index bbe0e5235d3..2d4415a8fa2 100644
--- a/public/app/core/services/all.js
+++ b/public/app/core/services/all.js
@@ -1,13 +1,13 @@
 define([
-  './alertSrv',
-  './utilSrv',
-  './datasourceSrv',
-  './contextSrv',
+  './alert_srv',
+  './util_srv',
+  './datasource_srv',
+  './context_srv',
   './timer',
-  './keyboardManager',
+  './keyboard_manager',
   './analytics',
-  './popoverSrv',
-  './uiSegmentSrv',
-  './backendSrv',
+  './popover_srv',
+  './segment_srv',
+  './backend_srv',
 ],
 function () {});
diff --git a/public/app/core/services/backendSrv.js b/public/app/core/services/backend_srv.js
similarity index 100%
rename from public/app/core/services/backendSrv.js
rename to public/app/core/services/backend_srv.js
diff --git a/public/app/core/services/contextSrv.js b/public/app/core/services/context_srv.js
similarity index 100%
rename from public/app/core/services/contextSrv.js
rename to public/app/core/services/context_srv.js
diff --git a/public/app/core/services/datasourceSrv.js b/public/app/core/services/datasource_srv.js
similarity index 100%
rename from public/app/core/services/datasourceSrv.js
rename to public/app/core/services/datasource_srv.js
diff --git a/public/app/core/services/keyboardManager.js b/public/app/core/services/keyboard_manager.js
similarity index 100%
rename from public/app/core/services/keyboardManager.js
rename to public/app/core/services/keyboard_manager.js
diff --git a/public/app/core/services/popoverSrv.js b/public/app/core/services/popover_srv.js
similarity index 100%
rename from public/app/core/services/popoverSrv.js
rename to public/app/core/services/popover_srv.js
diff --git a/public/app/core/services/uiSegmentSrv.js b/public/app/core/services/segment_srv.js
similarity index 100%
rename from public/app/core/services/uiSegmentSrv.js
rename to public/app/core/services/segment_srv.js
diff --git a/public/app/core/services/utilSrv.js b/public/app/core/services/util_srv.js
similarity index 100%
rename from public/app/core/services/utilSrv.js
rename to public/app/core/services/util_srv.js
diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts
index bcf111827a6..776b9064a95 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_ctrl_specs.ts
@@ -1,5 +1,5 @@
 ///<amd-dependency path="../query_ctrl" />
-///<amd-dependency path="app/core/services/uiSegmentSrv" />
+///<amd-dependency path="app/core/services/segment_srv" />
 ///<amd-dependency path="test/specs/helpers" name="helpers" />
 
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
diff --git a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
index 03602973f25..364a64f82aa 100644
--- a/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
+++ b/public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
@@ -1,6 +1,6 @@
 ///<amd-dependency path="app/plugins/datasource/graphite/gfunc" name="gfunc"/>
 ///<amd-dependency path="app/plugins/datasource/graphite/query_ctrl" />
-///<amd-dependency path="app/core/services/uiSegmentSrv" />
+///<amd-dependency path="app/core/services/segment_srv" />
 ///<amd-dependency path="test/specs/helpers" name="helpers" />
 
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
diff --git a/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts b/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
index 6da2c78535d..8fb5bea4925 100644
--- a/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
+++ b/public/app/plugins/datasource/influxdb/specs/query_ctrl_specs.ts
@@ -1,5 +1,5 @@
 ///<amd-dependency path="app/plugins/datasource/influxdb/query_ctrl"/>
-///<amd-dependency path="app/core/services/uiSegmentSrv" />
+///<amd-dependency path="app/core/services/segment_srv" />
 ///<amd-dependency path="test/specs/helpers" name="helpers" />
 
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';
diff --git a/public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts b/public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts
index 4d3d2b3817f..a8111776465 100644
--- a/public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts
+++ b/public/app/plugins/datasource/influxdb_08/specs/datasource-specs.ts
@@ -1,6 +1,6 @@
 ///<amd-dependency path="app/plugins/datasource/influxdb_08/datasource"/>
-///<amd-dependency path="app/core/services/backendSrv"/>
-///<amd-dependency path="app/core/services/alertSrv"/>
+///<amd-dependency path="app/core/services/backend_srv"/>
+///<amd-dependency path="app/core/services/alert_srv"/>
 ///<amd-dependency path="test/specs/helpers" name="helpers" />
 
 import {describe, beforeEach, it, sinon, expect, angularMocks} from 'test/lib/common';