diff --git a/packages/svelte/src/compiler/phases/2-analyze/index.js b/packages/svelte/src/compiler/phases/2-analyze/index.js
index 54967f1e40..303525b74b 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/index.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/index.js
@@ -13,9 +13,9 @@ import { validate_a11y } from './visitors/validate-a11y.js';
 import { validate_legacy } from './visitors/validate-legacy.js';
 import { validate_runes } from './visitors/validate-runes.js';
 import { common_visitors } from './visitors/common.js';
-import { analyze_scope_legacy } from './visitors/analyze-scope-legacy.js';
-import { analyze_scope_runes_component } from './visitors/analyze-scope-runes-component.js';
-import { analyze_scope_runes_module } from './visitors/analyse-scope-runes-module.js';
+import { analyze_component_scope_legacy } from './visitors/analyze-component-scope-legacy.js';
+import { analyze_component_scope_runes } from './visitors/analyze-component-scope-runes.js';
+import { analyze_module_scope_runes } from './visitors/analyze-module-scope-runes.js';
 import { validate_javascript_runes } from './visitors/validate-javascript-runes.js';
 
 /**
@@ -73,7 +73,7 @@ export function analyze_module(ast, options) {
 		/** @type {import('estree').Node} */ (ast),
 		{ scope },
 		// @ts-expect-error TODO clean this mess up
-		merge(set_scope(scopes), validate_javascript_runes, analyze_scope_runes_module)
+		merge(set_scope(scopes), validate_javascript_runes, analyze_module_scope_runes)
 	);
 
 	/** @type {import('../types').RawWarning[]} */
@@ -237,7 +237,7 @@ export function analyze_component(root, options) {
 					validate_template,
 					validate_a11y,
 					validate_runes,
-					analyze_scope_runes_component,
+					analyze_component_scope_runes,
 					common_visitors
 				)
 			);
@@ -282,7 +282,7 @@ export function analyze_component(root, options) {
 					validate_template,
 					validate_a11y,
 					validate_legacy,
-					analyze_scope_legacy,
+					analyze_component_scope_legacy,
 					common_visitors
 				)
 			);
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-scope-legacy.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-component-scope-legacy.js
similarity index 97%
rename from packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-scope-legacy.js
rename to packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-component-scope-legacy.js
index 33c3a754cd..90724572e7 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-scope-legacy.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-component-scope-legacy.js
@@ -1,8 +1,8 @@
 import is_reference from 'is-reference';
 import { extract_identifiers } from '../../../utils/ast.js';
 
-/** @type {import('../types').Visitors<import('../types').LegacyAnalysisState>} */
-export const analyze_scope_legacy = {
+/** @type {import('../types.js').Visitors<import('../types.js').LegacyAnalysisState>} */
+export const analyze_component_scope_legacy = {
 	LabeledStatement(node, { next, path, state }) {
 		if (
 			state.ast_type !== 'instance' ||
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-scope-runes-component.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-component-scope-runes.js
similarity index 96%
rename from packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-scope-runes-component.js
rename to packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-component-scope-runes.js
index 3709229e7c..7464bdbd7b 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-scope-runes-component.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-component-scope-runes.js
@@ -1,8 +1,8 @@
 import { extract_identifiers, extract_paths } from '../../../utils/ast.js';
 import { get_rune } from '../../scope.js';
 
-/** @type {import('../types').Visitors} */
-export const analyze_scope_runes_component = {
+/** @type {import('../types.js').Visitors} */
+export const analyze_component_scope_runes = {
 	VariableDeclarator(node, { state }) {
 		if (node.init?.type !== 'CallExpression') return;
 		if (get_rune(node.init, state.scope) === null) return;
diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/analyse-scope-runes-module.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-module-scope-runes.js
similarity index 88%
rename from packages/svelte/src/compiler/phases/2-analyze/visitors/analyse-scope-runes-module.js
rename to packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-module-scope-runes.js
index 91301c2f79..993fd5df3d 100644
--- a/packages/svelte/src/compiler/phases/2-analyze/visitors/analyse-scope-runes-module.js
+++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/analyze-module-scope-runes.js
@@ -1,8 +1,8 @@
 import { extract_paths } from '../../../utils/ast.js';
 import { get_rune } from '../../scope.js';
 
-/** @type {import('zimmerframe').Visitors<import('#compiler').SvelteNode, { scope: import('../../scope').Scope }>} */
-export const analyze_scope_runes_module = {
+/** @type {import('zimmerframe').Visitors<import('#compiler').SvelteNode, { scope: import('../../scope.js').Scope }>} */
+export const analyze_module_scope_runes = {
 	VariableDeclarator(node, { state }) {
 		if (node.init?.type !== 'CallExpression') return;
 		if (get_rune(node.init, state.scope) === null) return;