diff --git a/public/app/plugins/datasource/kairosdb/partials/query.editor.html b/public/app/plugins/datasource/kairosdb/partials/query.editor.html
index 23ddecabc4e..dc272ebbf4c 100644
--- a/public/app/plugins/datasource/kairosdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/kairosdb/partials/query.editor.html
@@ -2,7 +2,7 @@
 	<div ng-repeat="target in panel.targets"
 		class="tight-form-container"
 		ng-class="{'tight-form-disabled': target.hide}"
-		ng-controller="KairosDBTargetCtrl"
+		ng-controller="KairosDBQueryCtrl"
 		ng-init="init()">
 
 		<div class="tight-form">
@@ -345,7 +345,7 @@
 	</div>
 </div>
 
-<section class="grafana-metric-options" ng-controller="KairosDBTargetCtrl">
+<section class="grafana-metric-options" ng-controller="KairosDBQueryCtrl">
 	<div class="tight-form">
 		<ul class="tight-form-list">
 			<li class="tight-form-item tight-form-item-icon">
diff --git a/public/app/plugins/datasource/kairosdb/queryCtrl.js b/public/app/plugins/datasource/kairosdb/queryCtrl.js
index 30c658629b9..9aad7c41fc9 100644
--- a/public/app/plugins/datasource/kairosdb/queryCtrl.js
+++ b/public/app/plugins/datasource/kairosdb/queryCtrl.js
@@ -9,7 +9,7 @@ function (angular, _) {
   var metricList = null;
   var targetLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O'];
 
-  module.controller('KairosDBTargetCtrl', function($scope) {
+  module.controller('KairosDBQueryCtrl', function($scope) {
 
     $scope.init = function() {
       $scope.metric = {