diff --git a/public/app/features/plugins/TemplateQueryComponentLoader.tsx b/public/app/features/plugins/TemplateQueryComponentLoader.tsx
index a2b3f8cbaa9..bc2ff323ae6 100644
--- a/public/app/features/plugins/TemplateQueryComponentLoader.tsx
+++ b/public/app/features/plugins/TemplateQueryComponentLoader.tsx
@@ -2,14 +2,14 @@ import coreModule from 'app/core/core_module';
 import { importPluginModule } from './plugin_loader';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import DefaultTemplateQueryCtrl from '../templating/defaultTemplateQueryCtrl';
+import DefaultTemplateQueryComponent from '../templating/DefaultTemplateQueryComponent';
 
 async function loadComponent(module) {
   const component = await importPluginModule(module);
   if (component && component.TemplateQueryComponent) {
     return component.TemplateQueryComponent;
   } else {
-    return DefaultTemplateQueryCtrl;
+    return DefaultTemplateQueryComponent;
   }
 }
 
diff --git a/public/app/features/templating/defaultTemplateQueryCtrl.tsx b/public/app/features/templating/DefaultTemplateQueryComponent.tsx
similarity index 90%
rename from public/app/features/templating/defaultTemplateQueryCtrl.tsx
rename to public/app/features/templating/DefaultTemplateQueryComponent.tsx
index 85f0ac7ee7d..88e2b82c7e7 100644
--- a/public/app/features/templating/defaultTemplateQueryCtrl.tsx
+++ b/public/app/features/templating/DefaultTemplateQueryComponent.tsx
@@ -5,7 +5,7 @@ interface Props {
   onChange: (c: string) => void;
 }
 
-export default class DefaultTemplateQueryCtrl extends PureComponent<Props, any> {
+export default class DefaultTemplateQueryComponent extends PureComponent<Props, any> {
   constructor(props) {
     super(props);
     this.state = { value: props.query };