diff --git a/.betterer.results b/.betterer.results
index 2345eba8c89..cfb0ebda934 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -2538,10 +2538,10 @@ exports[`better eslint`] = {
     "public/app/features/plugins/loader/sharedDependencies.ts:5381": [
       [0, 0, 0, "* import is invalid because \'Layout,HorizontalGroup,VerticalGroup\' from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
     ],
-    "public/app/features/plugins/sandbox/distortion_map.ts:5381": [
+    "public/app/features/plugins/sandbox/distortions.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
     ],
-    "public/app/features/plugins/sandbox/sandbox_plugin_loader.ts:5381": [
+    "public/app/features/plugins/sandbox/sandboxPluginLoader.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
       [0, 0, 0, "Do not use any type assertions.", "2"]
diff --git a/public/app/core/history/RichHistoryRemoteStorage.test.ts b/public/app/core/history/RichHistoryRemoteStorage.test.ts
index d3d6f48f830..b99967b09b7 100644
--- a/public/app/core/history/RichHistoryRemoteStorage.test.ts
+++ b/public/app/core/history/RichHistoryRemoteStorage.test.ts
@@ -45,7 +45,7 @@ jest.mock('../services/PreferencesService', () => ({
 }));
 
 // FIXME: Tests break unless plugin loader is mocked. This is likely due to a circular dependency
-jest.mock('app/features/plugins/plugin_loader', () => ({}));
+jest.mock('app/features/plugins/pluginLoader', () => ({}));
 
 describe('RichHistoryRemoteStorage', () => {
   let storage: RichHistoryRemoteStorage;
diff --git a/public/app/features/datasources/state/actions.ts b/public/app/features/datasources/state/actions.ts
index 46623ac6112..09835ce72b2 100644
--- a/public/app/features/datasources/state/actions.ts
+++ b/public/app/features/datasources/state/actions.ts
@@ -23,8 +23,8 @@ import { getBackendSrv } from 'app/core/services/backend_srv';
 import { DatasourceAPIVersions } from 'app/features/apiserver/client';
 import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { importDataSourcePlugin } from 'app/features/plugins/pluginLoader';
 import { getPluginSettings } from 'app/features/plugins/pluginSettings';
-import { importDataSourcePlugin } from 'app/features/plugins/plugin_loader';
 import { AccessControlAction } from 'app/types/accessControl';
 import { DataSourcePluginCategory } from 'app/types/datasources';
 import { ThunkDispatch, ThunkResult } from 'app/types/store';
diff --git a/public/app/features/plugins/components/AppRootPage.test.tsx b/public/app/features/plugins/components/AppRootPage.test.tsx
index bef9ed62306..1b054508724 100644
--- a/public/app/features/plugins/components/AppRootPage.test.tsx
+++ b/public/app/features/plugins/components/AppRootPage.test.tsx
@@ -15,15 +15,15 @@ import { AddedComponentsRegistry } from '../extensions/registry/AddedComponentsR
 import { AddedFunctionsRegistry } from '../extensions/registry/AddedFunctionsRegistry';
 import { AddedLinksRegistry } from '../extensions/registry/AddedLinksRegistry';
 import { ExposedComponentsRegistry } from '../extensions/registry/ExposedComponentsRegistry';
+import { importAppPlugin } from '../pluginLoader';
 import { getPluginSettings } from '../pluginSettings';
-import { importAppPlugin } from '../plugin_loader';
 
 import AppRootPage from './AppRootPage';
 
 jest.mock('../pluginSettings', () => ({
   getPluginSettings: jest.fn(),
 }));
-jest.mock('../plugin_loader', () => ({
+jest.mock('../pluginLoader', () => ({
   importAppPlugin: jest.fn(),
 }));
 
diff --git a/public/app/features/plugins/components/AppRootPage.tsx b/public/app/features/plugins/components/AppRootPage.tsx
index c6cdc47e810..7210f0ff471 100644
--- a/public/app/features/plugins/components/AppRootPage.tsx
+++ b/public/app/features/plugins/components/AppRootPage.tsx
@@ -32,8 +32,8 @@ import {
   useExposedComponentsRegistry,
   useAddedFunctionsRegistry,
 } from '../extensions/ExtensionRegistriesContext';
+import { importAppPlugin } from '../pluginLoader';
 import { getPluginSettings } from '../pluginSettings';
-import { importAppPlugin } from '../plugin_loader';
 import { buildPluginSectionNav, pluginsLogger } from '../utils';
 
 import { PluginErrorBoundary } from './PluginErrorBoundary';
diff --git a/public/app/features/plugins/datasource_srv.test.ts b/public/app/features/plugins/datasource_srv.test.ts
index 94e714ce35c..9734aaa9b02 100644
--- a/public/app/features/plugins/datasource_srv.test.ts
+++ b/public/app/features/plugins/datasource_srv.test.ts
@@ -61,7 +61,7 @@ class TestRuntimeDataSource extends RuntimeDataSource {
   }
 }
 
-jest.mock('./plugin_loader', () => ({
+jest.mock('./pluginLoader', () => ({
   importDataSourcePlugin: (meta: DataSourcePluginMeta) => {
     return Promise.resolve(new DataSourcePlugin(TestDataSource as any));
   },
diff --git a/public/app/features/plugins/datasource_srv.ts b/public/app/features/plugins/datasource_srv.ts
index f434681943f..a7d081244c6 100644
--- a/public/app/features/plugins/datasource_srv.ts
+++ b/public/app/features/plugins/datasource_srv.ts
@@ -29,7 +29,7 @@ import {
 } from 'app/features/expressions/ExpressionDatasource';
 import { ExpressionDatasourceUID } from 'app/features/expressions/types';
 
-import { importDataSourcePlugin } from './plugin_loader';
+import { importDataSourcePlugin } from './pluginLoader';
 
 export class DatasourceSrv implements DataSourceService {
   private datasources: Record<string, DataSourceApi> = {}; // UID
diff --git a/public/app/features/plugins/importPanelPlugin.ts b/public/app/features/plugins/importPanelPlugin.ts
index a8f770acdd5..3afee6fa4c3 100644
--- a/public/app/features/plugins/importPanelPlugin.ts
+++ b/public/app/features/plugins/importPanelPlugin.ts
@@ -3,7 +3,7 @@ import config from 'app/core/config';
 
 import { getPanelPluginLoadError } from '../panel/components/PanelPluginError';
 
-import { importPluginModule } from './plugin_loader';
+import { importPluginModule } from './pluginLoader';
 
 const promiseCache: Record<string, Promise<PanelPlugin>> = {};
 const panelPluginCache: Record<string, PanelPlugin> = {};
diff --git a/public/app/features/plugins/loader/utils.ts b/public/app/features/plugins/loader/utils.ts
index 2407852f6ee..b8986e8ade3 100644
--- a/public/app/features/plugins/loader/utils.ts
+++ b/public/app/features/plugins/loader/utils.ts
@@ -1,6 +1,6 @@
 import { config } from '@grafana/runtime';
 
-import { sandboxPluginDependencies } from '../sandbox/plugin_dependencies';
+import { sandboxPluginDependencies } from '../sandbox/pluginDependencies';
 
 import { SHARED_DEPENDENCY_PREFIX } from './constants';
 import { SystemJS } from './systemjs';
diff --git a/public/app/features/plugins/plugin_loader.test.ts b/public/app/features/plugins/pluginLoader.test.ts
similarity index 98%
rename from public/app/features/plugins/plugin_loader.test.ts
rename to public/app/features/plugins/pluginLoader.test.ts
index 8fa6b6901e2..e715f1b9d35 100644
--- a/public/app/features/plugins/plugin_loader.test.ts
+++ b/public/app/features/plugins/pluginLoader.test.ts
@@ -5,9 +5,9 @@ import * as i18nModule from '@grafana/i18n/internal';
 import { server } from './loader/pluginLoader.mock';
 import { SystemJS } from './loader/systemjs';
 import { SystemJSWithLoaderHooks } from './loader/types';
-import { addTranslationsToI18n } from './plugin_loader';
+import { addTranslationsToI18n } from './pluginLoader';
 
-describe('plugin_loader', () => {
+describe('pluginLoader', () => {
   describe('addTranslationsToI18n', () => {
     const systemJSPrototype: SystemJSWithLoaderHooks = SystemJS.constructor.prototype;
     const originalFetch = systemJSPrototype.fetch;
diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/pluginLoader.ts
similarity index 98%
rename from public/app/features/plugins/plugin_loader.ts
rename to public/app/features/plugins/pluginLoader.ts
index a5e642ffe06..15f00ac400f 100644
--- a/public/app/features/plugins/plugin_loader.ts
+++ b/public/app/features/plugins/pluginLoader.ts
@@ -30,8 +30,8 @@ import { sharedDependenciesMap } from './loader/sharedDependencies';
 import { decorateSystemJSFetch, decorateSystemJSResolve, decorateSystemJsOnload } from './loader/systemjsHooks';
 import { SystemJSWithLoaderHooks } from './loader/types';
 import { buildImportMap, resolveModulePath } from './loader/utils';
-import { importPluginModuleInSandbox } from './sandbox/sandbox_plugin_loader';
-import { shouldLoadPluginInFrontendSandbox } from './sandbox/sandbox_plugin_loader_registry';
+import { importPluginModuleInSandbox } from './sandbox/sandboxPluginLoader';
+import { shouldLoadPluginInFrontendSandbox } from './sandbox/sandboxPluginLoaderRegistry';
 import { pluginsLogger } from './utils';
 
 const imports = buildImportMap(sharedDependenciesMap);
diff --git a/public/app/features/plugins/pluginPreloader.test.ts b/public/app/features/plugins/pluginPreloader.test.ts
index 2aab1cd3dc3..4890184a638 100644
--- a/public/app/features/plugins/pluginPreloader.test.ts
+++ b/public/app/features/plugins/pluginPreloader.test.ts
@@ -11,8 +11,8 @@ import {
 import type { AppPluginConfig } from '@grafana/runtime';
 import { getPluginSettings } from 'app/features/plugins/pluginSettings';
 
+import { importAppPlugin } from './pluginLoader';
 import { clearPreloadedPluginsCache, preloadPlugins } from './pluginPreloader';
-import { importAppPlugin } from './plugin_loader';
 
 jest.mock('app/core/services/context_srv', () => ({
   contextSrv: {
@@ -26,7 +26,7 @@ jest.mock('app/features/plugins/pluginSettings', () => ({
   getPluginSettings: jest.fn(),
 }));
 
-jest.mock('./plugin_loader', () => ({
+jest.mock('./pluginLoader', () => ({
   importAppPlugin: jest.fn(),
 }));
 
diff --git a/public/app/features/plugins/pluginPreloader.ts b/public/app/features/plugins/pluginPreloader.ts
index b8284584a5c..f1bec151de1 100644
--- a/public/app/features/plugins/pluginPreloader.ts
+++ b/public/app/features/plugins/pluginPreloader.ts
@@ -7,7 +7,7 @@ import type { AppPluginConfig } from '@grafana/runtime';
 import { contextSrv } from 'app/core/services/context_srv';
 import { getPluginSettings } from 'app/features/plugins/pluginSettings';
 
-import { importAppPlugin } from './plugin_loader';
+import { importAppPlugin } from './pluginLoader';
 
 export type PluginPreloadResult = {
   pluginId: string;
diff --git a/public/app/features/plugins/sandbox/code_loader.ts b/public/app/features/plugins/sandbox/codeLoader.ts
similarity index 100%
rename from public/app/features/plugins/sandbox/code_loader.ts
rename to public/app/features/plugins/sandbox/codeLoader.ts
diff --git a/public/app/features/plugins/sandbox/distortion_map.ts b/public/app/features/plugins/sandbox/distortions.ts
similarity index 99%
rename from public/app/features/plugins/sandbox/distortion_map.ts
rename to public/app/features/plugins/sandbox/distortions.ts
index 902f87afc09..b258f36978e 100644
--- a/public/app/features/plugins/sandbox/distortion_map.ts
+++ b/public/app/features/plugins/sandbox/distortions.ts
@@ -4,9 +4,9 @@ import { cloneDeep, isFunction } from 'lodash';
 
 import { Monaco } from '@grafana/ui';
 
-import { loadScriptIntoSandbox } from './code_loader';
+import { loadScriptIntoSandbox } from './codeLoader';
 import { forbiddenElements } from './constants';
-import { recursivePatchObjectAsLiveTarget } from './document_sandbox';
+import { recursivePatchObjectAsLiveTarget } from './documentSandbox';
 import { SandboxEnvironment, SandboxPluginMeta } from './types';
 import { logWarning, unboxRegexesFromMembraneProxy } from './utils';
 
diff --git a/public/app/features/plugins/sandbox/document_sandbox.ts b/public/app/features/plugins/sandbox/documentSandbox.ts
similarity index 100%
rename from public/app/features/plugins/sandbox/document_sandbox.ts
rename to public/app/features/plugins/sandbox/documentSandbox.ts
diff --git a/public/app/features/plugins/sandbox/plugin_dependencies.ts b/public/app/features/plugins/sandbox/pluginDependencies.ts
similarity index 100%
rename from public/app/features/plugins/sandbox/plugin_dependencies.ts
rename to public/app/features/plugins/sandbox/pluginDependencies.ts
diff --git a/public/app/features/plugins/sandbox/sandbox_components.tsx b/public/app/features/plugins/sandbox/sandboxComponents.tsx
similarity index 100%
rename from public/app/features/plugins/sandbox/sandbox_components.tsx
rename to public/app/features/plugins/sandbox/sandboxComponents.tsx
diff --git a/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts b/public/app/features/plugins/sandbox/sandboxPluginLoader.ts
similarity index 97%
rename from public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
rename to public/app/features/plugins/sandbox/sandboxPluginLoader.ts
index 791e791ec3a..5b62216ff63 100644
--- a/public/app/features/plugins/sandbox/sandbox_plugin_loader.ts
+++ b/public/app/features/plugins/sandbox/sandboxPluginLoader.ts
@@ -5,8 +5,8 @@ import { BootData } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { defaultTrustedTypesPolicy } from 'app/core/trustedTypePolicies';
 
-import { getPluginCode, getPluginLoadData, patchSandboxEnvironmentPrototype } from './code_loader';
-import { getGeneralSandboxDistortionMap, distortLiveApis } from './distortion_map';
+import { getPluginCode, getPluginLoadData, patchSandboxEnvironmentPrototype } from './codeLoader';
+import { getGeneralSandboxDistortionMap, distortLiveApis } from './distortions';
 import {
   getSafeSandboxDomElement,
   isDomElement,
@@ -14,9 +14,9 @@ import {
   markDomElementStyleAsALiveTarget,
   patchObjectAsLiveTarget,
   patchWebAPIs,
-} from './document_sandbox';
-import { sandboxPluginDependencies } from './plugin_dependencies';
-import { sandboxPluginComponents } from './sandbox_components';
+} from './documentSandbox';
+import { sandboxPluginDependencies } from './pluginDependencies';
+import { sandboxPluginComponents } from './sandboxComponents';
 import { CompartmentDependencyModule, PluginFactoryFunction, SandboxEnvironment, SandboxPluginMeta } from './types';
 import { logError, logInfo } from './utils';
 
diff --git a/public/app/features/plugins/sandbox/sandbox_plugin_loader_registry.test.ts b/public/app/features/plugins/sandbox/sandboxPluginLoaderRegistry.test.ts
similarity index 99%
rename from public/app/features/plugins/sandbox/sandbox_plugin_loader_registry.test.ts
rename to public/app/features/plugins/sandbox/sandboxPluginLoaderRegistry.test.ts
index e7164a5a860..a36480579d7 100644
--- a/public/app/features/plugins/sandbox/sandbox_plugin_loader_registry.test.ts
+++ b/public/app/features/plugins/sandbox/sandboxPluginLoaderRegistry.test.ts
@@ -11,7 +11,7 @@ import {
   setSandboxEnabledCheck,
   isPluginFrontendSandboxEnabled,
   isPluginFrontendSandboxEligible,
-} from './sandbox_plugin_loader_registry';
+} from './sandboxPluginLoaderRegistry';
 
 jest.mock('@grafana/runtime', () => ({
   config: {
diff --git a/public/app/features/plugins/sandbox/sandbox_plugin_loader_registry.ts b/public/app/features/plugins/sandbox/sandboxPluginLoaderRegistry.ts
similarity index 100%
rename from public/app/features/plugins/sandbox/sandbox_plugin_loader_registry.ts
rename to public/app/features/plugins/sandbox/sandboxPluginLoaderRegistry.ts
diff --git a/public/app/features/plugins/tests/plugin_loader.test.ts b/public/app/features/plugins/tests/plugin_loader.test.ts
index 9f6c2e3739b..860d509bdcd 100644
--- a/public/app/features/plugins/tests/plugin_loader.test.ts
+++ b/public/app/features/plugins/tests/plugin_loader.test.ts
@@ -11,7 +11,7 @@ import { AppPluginMeta, PluginMetaInfo, PluginType, AppPlugin } from '@grafana/d
 // Loaded after the `unmock` above
 import { addedComponentsRegistry, addedLinksRegistry, exposedComponentsRegistry } from '../extensions/registry/setup';
 import { SystemJS } from '../loader/systemjs';
-import { importAppPlugin } from '../plugin_loader';
+import { importAppPlugin } from '../pluginLoader';
 
 jest.mock('../extensions/registry/setup');
 
diff --git a/public/app/features/plugins/utils.ts b/public/app/features/plugins/utils.ts
index 845785ce876..9961ee71016 100644
--- a/public/app/features/plugins/utils.ts
+++ b/public/app/features/plugins/utils.ts
@@ -2,8 +2,8 @@ import { GrafanaPlugin, NavModel, NavModelItem, PanelPluginMeta, PluginType } fr
 import { createMonitoringLogger } from '@grafana/runtime';
 
 import { importPanelPluginFromMeta } from './importPanelPlugin';
+import { importAppPlugin, importDataSourcePlugin } from './pluginLoader';
 import { getPluginSettings } from './pluginSettings';
-import { importAppPlugin, importDataSourcePlugin } from './plugin_loader';
 
 export async function loadPlugin(pluginId: string): Promise<GrafanaPlugin> {
   const info = await getPluginSettings(pluginId);
diff --git a/public/app/features/variables/editor/getVariableQueryEditor.tsx b/public/app/features/variables/editor/getVariableQueryEditor.tsx
index 2e4177ef10d..ad96e78cca1 100644
--- a/public/app/features/variables/editor/getVariableQueryEditor.tsx
+++ b/public/app/features/variables/editor/getVariableQueryEditor.tsx
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import { DataQuery, DataSourceApi, DataSourceJsonData, QueryEditorProps, StandardVariableQuery } from '@grafana/data';
 import { getTemplateSrv } from '@grafana/runtime';
 
-import { importDataSourcePlugin } from '../../plugins/plugin_loader';
+import { importDataSourcePlugin } from '../../plugins/pluginLoader';
 import {
   hasCustomVariableSupport,
   hasDatasourceVariableSupport,
diff --git a/public/app/features/variables/query/actions.test.tsx b/public/app/features/variables/query/actions.test.tsx
index 72cfc067092..7a203bd4b77 100644
--- a/public/app/features/variables/query/actions.test.tsx
+++ b/public/app/features/variables/query/actions.test.tsx
@@ -69,7 +69,7 @@ const mocks: Record<string, any> = {
 
 setDataSourceSrv(mocks.dataSourceSrv as DataSourceSrv);
 
-jest.mock('../../plugins/plugin_loader', () => ({
+jest.mock('../../plugins/pluginLoader', () => ({
   importDataSourcePlugin: () => mocks.pluginLoader.importDataSourcePlugin(),
 }));