diff --git a/internal/ls/findallreferences.go b/internal/ls/findallreferences.go
index 259e091bbd..7e31e181e0 100644
--- a/internal/ls/findallreferences.go
+++ b/internal/ls/findallreferences.go
@@ -1192,7 +1192,10 @@ func getReferencedSymbolsForSymbol(originalSymbol *ast.Symbol, node *ast.Node, s
 	symbol := core.Coalesce(skipPastExportOrImportSpecifierOrUnion(originalSymbol, node, checker /*useLocalSymbolForExportSpecifier*/, !isForRenameWithPrefixAndSuffixText(options)), originalSymbol)
 
 	// Compute the meaning from the location and the symbol it references
-	searchMeaning := getIntersectingMeaningFromDeclarations(node, symbol, ast.SemanticMeaningAll)
+	searchMeaning := ast.SemanticMeaningAll
+	if options.use != referenceUseRename {
+		searchMeaning = getIntersectingMeaningFromDeclarations(node, symbol, ast.SemanticMeaningAll)
+	}
 	state := newState(sourceFiles, sourceFilesSet, node, checker /*, cancellationToken*/, searchMeaning, options)
 
 	var exportSpecifier *ast.Node
diff --git a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAlias3.baseline.jsonc b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAlias3.baseline.jsonc
index af74bffd51..ca8a01e4ff 100644
--- a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAlias3.baseline.jsonc
+++ b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAlias3.baseline.jsonc
@@ -2,12 +2,12 @@
 // === /renameAlias3.ts ===
 // module SomeModule { export class /*RENAME*/[|SomeClassRENAME|] { } }
 // import M = SomeModule;
-// import C = M.SomeClass;
+// import C = M.[|SomeClassRENAME|];
 
 
 
 // === findRenameLocations ===
 // === /renameAlias3.ts ===
-// module SomeModule { export class SomeClass { } }
+// module SomeModule { export class [|SomeClassRENAME|] { } }
 // import M = SomeModule;
 // import C = M./*RENAME*/[|SomeClassRENAME|];
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAlias3.baseline.jsonc.diff b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAlias3.baseline.jsonc.diff
deleted file mode 100644
index 24d0d63d58..0000000000
--- a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAlias3.baseline.jsonc.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- old.renameAlias3.baseline.jsonc
-+++ new.renameAlias3.baseline.jsonc
-@@= skipped -1, +1 lines =@@
- // === /renameAlias3.ts ===
- // module SomeModule { export class /*RENAME*/[|SomeClassRENAME|] { } }
- // import M = SomeModule;
--// import C = M.[|SomeClassRENAME|];
-+// import C = M.SomeClass;
-
-
-
- // === findRenameLocations ===
- // === /renameAlias3.ts ===
--// module SomeModule { export class [|SomeClassRENAME|] { } }
-+// module SomeModule { export class SomeClass { } }
- // import M = SomeModule;
- // import C = M./*RENAME*/[|SomeClassRENAME|];
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAliasExternalModule3.baseline.jsonc b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAliasExternalModule3.baseline.jsonc
index c9f18c5c49..8b0ec2b3ce 100644
--- a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAliasExternalModule3.baseline.jsonc
+++ b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAliasExternalModule3.baseline.jsonc
@@ -3,9 +3,17 @@
 // module SomeModule { export class /*RENAME*/[|SomeClassRENAME|] { } }
 // export = SomeModule;
 
+// === /b.ts ===
+// import M = require("./a");
+// import C = M.[|SomeClassRENAME|];
+
 
 
 // === findRenameLocations ===
+// === /a.ts ===
+// module SomeModule { export class [|SomeClassRENAME|] { } }
+// export = SomeModule;
+
 // === /b.ts ===
 // import M = require("./a");
 // import C = M./*RENAME*/[|SomeClassRENAME|];
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAliasExternalModule3.baseline.jsonc.diff b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAliasExternalModule3.baseline.jsonc.diff
deleted file mode 100644
index b3dc143222..0000000000
--- a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameAliasExternalModule3.baseline.jsonc.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- old.renameAliasExternalModule3.baseline.jsonc
-+++ new.renameAliasExternalModule3.baseline.jsonc
-@@= skipped -2, +2 lines =@@
- // module SomeModule { export class /*RENAME*/[|SomeClassRENAME|] { } }
- // export = SomeModule;
-
--// === /b.ts ===
--// import M = require("./a");
--// import C = M.[|SomeClassRENAME|];
--
-
-
- // === findRenameLocations ===
--// === /a.ts ===
--// module SomeModule { export class [|SomeClassRENAME|] { } }
--// export = SomeModule;
--
- // === /b.ts ===
- // import M = require("./a");
- // import C = M./*RENAME*/[|SomeClassRENAME|];
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameImportSpecifierPropertyName.baseline.jsonc b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameImportSpecifierPropertyName.baseline.jsonc
index 0f25847ed6..91bfb125b4 100644
--- a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameImportSpecifierPropertyName.baseline.jsonc
+++ b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameImportSpecifierPropertyName.baseline.jsonc
@@ -1,3 +1,6 @@
 // === findRenameLocations ===
 // === /canada.ts ===
-// export interface /*RENAME*/[|GingerRENAME|] {}
\ No newline at end of file
+// export interface /*RENAME*/[|GingerRENAME|] {}
+
+// === /dry.ts ===
+// import { [|GingerRENAME|] as Ale } from './canada';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameImportSpecifierPropertyName.baseline.jsonc.diff b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameImportSpecifierPropertyName.baseline.jsonc.diff
deleted file mode 100644
index 8cd0cedcf3..0000000000
--- a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameImportSpecifierPropertyName.baseline.jsonc.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- old.renameImportSpecifierPropertyName.baseline.jsonc
-+++ new.renameImportSpecifierPropertyName.baseline.jsonc
-@@= skipped -0, +0 lines =@@
- // === findRenameLocations ===
- // === /canada.ts ===
- // export interface /*RENAME*/[|GingerRENAME|] {}
--
--// === /dry.ts ===
--// import { [|GingerRENAME|] as Ale } from './canada';
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameNamespace.baseline.jsonc b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameNamespace.baseline.jsonc
index 1a1735ba7a..0ccb3ca35f 100644
--- a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameNamespace.baseline.jsonc
+++ b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameNamespace.baseline.jsonc
@@ -6,4 +6,4 @@
 //     }
 // }
 // 
-// const a: [|NSRENAME|].E = NS.E.A;
\ No newline at end of file
+// const a: [|NSRENAME|].E = [|NSRENAME|].E.A;
\ No newline at end of file
diff --git a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameNamespace.baseline.jsonc.diff b/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameNamespace.baseline.jsonc.diff
deleted file mode 100644
index 220774abf8..0000000000
--- a/testdata/baselines/reference/submodule/fourslash/findRenameLocations/renameNamespace.baseline.jsonc.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- old.renameNamespace.baseline.jsonc
-+++ new.renameNamespace.baseline.jsonc
-@@= skipped -5, +5 lines =@@
- //     }
- // }
- // 
--// const a: [|NSRENAME|].E = [|NSRENAME|].E.A;
-+// const a: [|NSRENAME|].E = NS.E.A;
\ No newline at end of file