diff --git a/src/testRunner/unittests/tsserver/projectReferences.ts b/src/testRunner/unittests/tsserver/projectReferences.ts
index e56e0f85eced3..65e11ee56cc01 100644
--- a/src/testRunner/unittests/tsserver/projectReferences.ts
+++ b/src/testRunner/unittests/tsserver/projectReferences.ts
@@ -1354,7 +1354,7 @@ bar;`
             baselineTsserverLogs("projectReferences", `when files from two projects are open and one project references`, session);
         });
 
-        describe("find refs to symbol from other project", () => {
+        describe("find refs to decl in other proj", () => {
             const indexA: File = {
                 path: `${tscWatch.projectRoot}/a/index.ts`,
                 content: `import { B } from "../b/lib";
@@ -1408,7 +1408,7 @@ const b: B = new B();`
 
                 // Mangled to stay under windows path length limit
                 const subScenario =
-                    `when proj ${projectAlreadyLoaded ? "is" : "is not"} loaded ` +
+                    `when proj ${projectAlreadyLoaded ? "is" : "is not"} loaded` +
                     ` and refd proj loading is ${disableReferencedProjectLoad ? "disabled" : "enabled"}` +
                     ` and proj ref redirects are ${disableSourceOfProjectReferenceRedirect ? "disabled" : "enabled"}` +
                     ` and a decl map is ${dtsMapPresent ? "present" : "missing"}`;
@@ -1435,7 +1435,7 @@ const b: B = new B();`
                         command: protocol.CommandTypes.References,
                         arguments: protocolFileLocationFromSubstring(indexA, `B`, { index: 1 })
                     });
-                    baselineTsserverLogs("projectReferences", `find all references to a symbol declared in another project ${subScenario}`, session);
+                    baselineTsserverLogs("projectReferences", `find refs to decl in other proj ${subScenario}`, session);
                 });
             }
 
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-disabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-missing.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-disabled-and-a-decl-map-is-present.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-missing.js
diff --git a/tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js b/tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
similarity index 100%
rename from tests/baselines/reference/tsserver/projectReferences/find-all-references-to-a-symbol-declared-in-another-project-when-proj-is-not-loaded--and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js
rename to tests/baselines/reference/tsserver/projectReferences/find-refs-to-decl-in-other-proj-when-proj-is-not-loaded-and-refd-proj-loading-is-enabled-and-proj-ref-redirects-are-enabled-and-a-decl-map-is-present.js