diff --git a/platform/platform-impl/resources/settings/ide-settings-model.json b/platform/platform-impl/resources/settings/ide-settings-model.json
index 85a325668498..04dd859cf1e4 100644
--- a/platform/platform-impl/resources/settings/ide-settings-model.json
+++ b/platform/platform-impl/resources/settings/ide-settings-model.json
@@ -4463,7 +4463,7 @@
       "name": "WebTypesNpmLoader",
       "scope": "app",
       "pluginId": "JavaScript",
-      "classFqn": "com.intellij.javascript.webSymbols.nodejs.WebTypesNpmLoader",
+      "classFqn": "com.intellij.javascript.polySymbols.nodejs.WebTypesNpmLoader",
       "storage": "web-types-npm-loader.xml",
       "properties": [
         {
diff --git a/platform/util/src/com/intellij/concurrency/threadContext.kt b/platform/util/src/com/intellij/concurrency/threadContext.kt
index 59c76e44200e..0d0a6859dc10 100644
--- a/platform/util/src/com/intellij/concurrency/threadContext.kt
+++ b/platform/util/src/com/intellij/concurrency/threadContext.kt
@@ -152,7 +152,7 @@ private val VIOLATORS : List<String> = listOf(
   "com.intellij.ide.ui.popup",
   "com.intellij.ui",
   "org.jetbrains.io",
-  "com.intellij.javascript.webSymbols.nodejs.WebTypesNpmLoader",
+  "com.intellij.javascript.polySymbols.nodejs.WebTypesNpmLoader",
   "com.intellij.tasks",
   "com.intellij.util.concurrency.Invoker",
   /**
diff --git a/platform/webSymbols/src/com/intellij/polySymbols/query/impl/PolySymbolMatchImpl.kt b/platform/webSymbols/src/com/intellij/polySymbols/query/impl/PolySymbolMatchImpl.kt
index 294b45197dce..312979a641bd 100644
--- a/platform/webSymbols/src/com/intellij/polySymbols/query/impl/PolySymbolMatchImpl.kt
+++ b/platform/webSymbols/src/com/intellij/polySymbols/query/impl/PolySymbolMatchImpl.kt
@@ -302,7 +302,7 @@ internal open class PolySymbolMatchImpl private constructor(
   }
 
   private class PolySymbolMatchPointer<T : PolySymbolMatch>(
-    webSymbolMatch: PolySymbolMatchImpl,
+    polySymbolMatch: PolySymbolMatchImpl,
     private val newInstanceProvider: (
       matchedName: String,
       nameSegments: List<PolySymbolNameSegment>,
@@ -315,15 +315,15 @@ internal open class PolySymbolMatchImpl private constructor(
     ) -> T,
   ) : Pointer<T> {
 
-    private val matchedName = webSymbolMatch.matchedName
-    private val nameSegments = webSymbolMatch.nameSegments
+    private val matchedName = polySymbolMatch.matchedName
+    private val nameSegments = polySymbolMatch.nameSegments
       .map { it.createPointer() }
-    private val namespace = webSymbolMatch.namespace
-    private val kind = webSymbolMatch.kind
-    private val origin = webSymbolMatch.origin
-    private val explicitPriority = webSymbolMatch.explicitPriority
-    private val explicitProximity = webSymbolMatch.explicitProximity
-    private val additionalProperties = webSymbolMatch.additionalProperties
+    private val namespace = polySymbolMatch.namespace
+    private val kind = polySymbolMatch.kind
+    private val origin = polySymbolMatch.origin
+    private val explicitPriority = polySymbolMatch.explicitPriority
+    private val explicitProximity = polySymbolMatch.explicitProximity
+    private val additionalProperties = polySymbolMatch.additionalProperties
       .createPointers()
 
     override fun dereference(): T? =
diff --git a/platform/webSymbols/testFramework/com/intellij/polySymbols/testFramework/WebTestUtil.kt b/platform/webSymbols/testFramework/com/intellij/polySymbols/testFramework/WebTestUtil.kt
index c15cd86ccd90..570a738340a7 100644
--- a/platform/webSymbols/testFramework/com/intellij/polySymbols/testFramework/WebTestUtil.kt
+++ b/platform/webSymbols/testFramework/com/intellij/polySymbols/testFramework/WebTestUtil.kt
@@ -334,8 +334,8 @@ fun PsiFile.findOffsetBySignature(signature: String): Int {
 
 fun CodeInsightTestFixture.polySymbolAtCaret(): PolySymbol? =
   injectionThenHost(file, caretOffset) { file, offset ->
-    file.webSymbolDeclarationsAt(offset).takeIf { it.isNotEmpty() }
-    ?: if (offset > 0) file.webSymbolDeclarationsAt(offset - 1).takeIf { it.isNotEmpty() } else null
+    file.polySymbolDeclarationsAt(offset).takeIf { it.isNotEmpty() }
+    ?: if (offset > 0) file.polySymbolDeclarationsAt(offset - 1).takeIf { it.isNotEmpty() } else null
   }
     ?.takeIf { it.isNotEmpty() }
     ?.also { if (it.size > 1) throw AssertionError("Multiple PolySymbolDeclarations found at caret position: $it") }
@@ -402,7 +402,7 @@ private fun Collection<PsiSymbolReference>.resolveToPolySymbols(): List<PolySymb
     }
     .toList()
 
-private fun PsiFile.webSymbolDeclarationsAt(offset: Int): Collection<PolySymbolDeclaration> {
+private fun PsiFile.polySymbolDeclarationsAt(offset: Int): Collection<PolySymbolDeclaration> {
   for ((element, offsetInElement) in elementsAtOffsetUp(offset)) {
     val declarations = PolySymbolDeclarationProvider.getAllDeclarations(element, offsetInElement)
     if (declarations.isNotEmpty()) {
@@ -426,9 +426,9 @@ private fun <T> injectionThenHost(file: PsiFile, offset: Int, computation: (PsiF
 }
 
 fun CodeInsightTestFixture.resolveToPolySymbolSource(signature: String): PsiElement {
-  val webSymbol = resolvePolySymbolReference(signature)
-  val result = assertInstanceOf<PsiSourcedPolySymbol>(webSymbol).source
-  assertNotNull("PolySymbol $webSymbol source is null", result)
+  val polySymbol = resolvePolySymbolReference(signature)
+  val result = assertInstanceOf<PsiSourcedPolySymbol>(polySymbol).source
+  assertNotNull("PolySymbol $polySymbol source is null", result)
   return result!!
 }
 
diff --git a/tools/intellij.tools.ide.metrics.collector/testResources/opentelemetry/opentelemetry_with_max_mean_attributes.json b/tools/intellij.tools.ide.metrics.collector/testResources/opentelemetry/opentelemetry_with_max_mean_attributes.json
index ae7d3bab30ab..46caf8d4c763 100644
--- a/tools/intellij.tools.ide.metrics.collector/testResources/opentelemetry/opentelemetry_with_max_mean_attributes.json
+++ b/tools/intellij.tools.ide.metrics.collector/testResources/opentelemetry/opentelemetry_with_max_mean_attributes.json
@@ -1176,7 +1176,7 @@
             {
               "key": "class",
               "type": "string",
-              "value": "com.intellij.javascript.webSymbols.nodejs.PackageJsonPolySymbolsRegistryManagerStartup"
+              "value": "com.intellij.javascript.polySymbols.nodejs.PackageJsonPolySymbolsRegistryManagerStartup"
             }
           ]
         },
diff --git a/tools/intellij.tools.ide.metrics.collector/testResources/opentelemetry/startup.json b/tools/intellij.tools.ide.metrics.collector/testResources/opentelemetry/startup.json
index 8a8a67fc0007..6051d8d878c8 100644
--- a/tools/intellij.tools.ide.metrics.collector/testResources/opentelemetry/startup.json
+++ b/tools/intellij.tools.ide.metrics.collector/testResources/opentelemetry/startup.json
@@ -2982,7 +2982,7 @@
             {
               "key": "class",
               "type": "string",
-              "value": "com.intellij.javascript.webSymbols.nodejs.PackageJsonPolySymbolsRegistryManagerStartup"
+              "value": "com.intellij.javascript.polySymbols.nodejs.PackageJsonPolySymbolsRegistryManagerStartup"
             },
             {
               "key": "plugin",