diff --git a/.betterer.results b/.betterer.results
index 3cc54cfff84..01c46062c5a 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -4229,10 +4229,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "18"]
     ],
-    "public/app/plugins/datasource/influxdb/migrations.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
-    ],
-    "public/app/plugins/datasource/influxdb/query_builder.ts:5381": [
+    "public/app/plugins/datasource/influxdb/influxql_query_builder.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
@@ -4240,6 +4237,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "4"],
       [0, 0, 0, "Do not use any type assertions.", "5"]
     ],
+    "public/app/plugins/datasource/influxdb/migrations.ts:5381": [
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
+    ],
     "public/app/plugins/datasource/influxdb/query_part.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
diff --git a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tags.test.tsx b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tags.test.tsx
index 692ff69fc5f..e3c0c590b5a 100644
--- a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tags.test.tsx
+++ b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tags.test.tsx
@@ -3,12 +3,12 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import InfluxDatasource from '../../datasource';
-import * as mockedMeta from '../../influxQLMetadataQuery';
+import * as mockedMeta from '../../influxql_metadata_query';
 import { InfluxQuery } from '../../types';
 
 import { Editor } from './Editor';
 
-jest.mock('../../influxQLMetadataQuery', () => {
+jest.mock('../../influxql_metadata_query', () => {
   return {
     __esModule: true,
     getAllPolicies: jest.fn().mockReturnValueOnce(Promise.resolve(['default', 'autogen'])),
diff --git a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tsx b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tsx
index 9e69be2ab5a..e085e4d088a 100644
--- a/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/VisualInfluxQLEditor/Editor.tsx
@@ -13,7 +13,7 @@ import {
   getFieldKeysForMeasurement,
   getTagKeysForMeasurementAndTags,
   getTagValues,
-} from '../../influxQLMetadataQuery';
+} from '../../influxql_metadata_query';
 import {
   addNewGroupByPart,
   addNewSelectPart,
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index e5f1f3a1e66..349e1e01d41 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -32,12 +32,12 @@ import { getTemplateSrv, TemplateSrv } from 'app/features/templating/template_sr
 import { AnnotationEditor } from './components/AnnotationEditor';
 import { FluxQueryEditor } from './components/FluxQueryEditor';
 import { BROWSER_MODE_DISABLED_MESSAGE } from './constants';
-import { getAllPolicies } from './influxQLMetadataQuery';
 import InfluxQueryModel from './influx_query_model';
 import InfluxSeries from './influx_series';
+import { getAllPolicies } from './influxql_metadata_query';
+import { InfluxQueryBuilder } from './influxql_query_builder';
 import { prepareAnnotation } from './migrations';
 import { buildRawQuery, replaceHardCodedRetentionPolicy } from './queryUtils';
-import { InfluxQueryBuilder } from './query_builder';
 import ResponseParser from './response_parser';
 import { InfluxOptions, InfluxQuery, InfluxVersion } from './types';
 
diff --git a/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts b/public/app/plugins/datasource/influxdb/influxql_metadata_query.ts
similarity index 97%
rename from public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
rename to public/app/plugins/datasource/influxdb/influxql_metadata_query.ts
index 4f668b619f0..996ead8b308 100644
--- a/public/app/plugins/datasource/influxdb/influxQLMetadataQuery.ts
+++ b/public/app/plugins/datasource/influxdb/influxql_metadata_query.ts
@@ -1,6 +1,6 @@
 import InfluxDatasource from './datasource';
+import { InfluxQueryBuilder } from './influxql_query_builder';
 import { replaceHardCodedRetentionPolicy } from './queryUtils';
-import { InfluxQueryBuilder } from './query_builder';
 import { InfluxQueryTag } from './types';
 
 const runExploreQuery = (
diff --git a/public/app/plugins/datasource/influxdb/specs/query_builder.test.ts b/public/app/plugins/datasource/influxdb/influxql_query_builder.test.ts
similarity index 99%
rename from public/app/plugins/datasource/influxdb/specs/query_builder.test.ts
rename to public/app/plugins/datasource/influxdb/influxql_query_builder.test.ts
index 17569325243..3d99d2a7080 100644
--- a/public/app/plugins/datasource/influxdb/specs/query_builder.test.ts
+++ b/public/app/plugins/datasource/influxdb/influxql_query_builder.test.ts
@@ -1,4 +1,4 @@
-import { InfluxQueryBuilder } from '../query_builder';
+import { InfluxQueryBuilder } from './influxql_query_builder';
 
 describe('InfluxQueryBuilder', () => {
   describe('when building explore queries', () => {
diff --git a/public/app/plugins/datasource/influxdb/query_builder.ts b/public/app/plugins/datasource/influxdb/influxql_query_builder.ts
similarity index 100%
rename from public/app/plugins/datasource/influxdb/query_builder.ts
rename to public/app/plugins/datasource/influxdb/influxql_query_builder.ts