diff --git a/build.gradle.kts b/build.gradle.kts
index 5100527aab5..577518cd8d5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -265,7 +265,7 @@ extra["compilerModules"] = arrayOf(
     ":kotlin-build-common",
     ":core:metadata",
     ":core:metadata.jvm",
-    ":core:descriptors.common",
+    ":core:compiler.common",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":core:descriptors.runtime",
@@ -295,7 +295,7 @@ extra["compilerModulesForJps"] = listOf(
     ":kotlin-compiler-runner",
     ":daemon-common",
     ":daemon-common-new",
-    ":core:descriptors.common",
+    ":core:compiler.common",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":idea:idea-jps-common",
diff --git a/compiler/config/build.gradle.kts b/compiler/config/build.gradle.kts
index 8bd673eff19..f6d6badc49c 100644
--- a/compiler/config/build.gradle.kts
+++ b/compiler/config/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 
 dependencies {
     api(project(":core:metadata"))
-    api(project(":core:descriptors.common"))
+    api(project(":core:compiler.common"))
     api(project(":compiler:util"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
diff --git a/compiler/fir/cones/build.gradle.kts b/compiler/fir/cones/build.gradle.kts
index 8f0d25186c0..694dbcc4ab0 100644
--- a/compiler/fir/cones/build.gradle.kts
+++ b/compiler/fir/cones/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":core:descriptors.common"))
+    api(project(":core:compiler.common"))
 
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 }
diff --git a/compiler/fir/tree/tree-generator/build.gradle.kts b/compiler/fir/tree/tree-generator/build.gradle.kts
index f6308cad0cd..1a16ad77289 100644
--- a/compiler/fir/tree/tree-generator/build.gradle.kts
+++ b/compiler/fir/tree/tree-generator/build.gradle.kts
@@ -11,7 +11,7 @@ val compileOnly by configurations
 runtimeOnly.extendsFrom(compileOnly)
 
 dependencies {
-    implementation(project(":core:descriptors.common"))
+    implementation(project(":core:compiler.common"))
     implementation(project(":compiler:frontend.common"))
     implementation(project(":compiler:fir:cones"))
 
diff --git a/core/descriptors.common/build.gradle.kts b/core/compiler.common/build.gradle.kts
similarity index 100%
rename from core/descriptors.common/build.gradle.kts
rename to core/compiler.common/build.gradle.kts
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt b/core/compiler.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/builtins/PrimitiveType.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt b/core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/builtins/StandardNames.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/builtins/functions/FunctionClassKind.kt b/core/compiler.common/src/org/jetbrains/kotlin/builtins/functions/FunctionClassKind.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/builtins/functions/FunctionClassKind.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/builtins/functions/FunctionClassKind.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/contracts/description/EventOccurrencesRange.kt b/core/compiler.common/src/org/jetbrains/kotlin/contracts/description/EventOccurrencesRange.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/contracts/description/EventOccurrencesRange.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/contracts/description/EventOccurrencesRange.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/descriptors/ClassKind.java b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/ClassKind.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/descriptors/ClassKind.java
rename to core/compiler.common/src/org/jetbrains/kotlin/descriptors/ClassKind.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/descriptors/Modality.kt b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/Modality.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/descriptors/Modality.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/descriptors/Modality.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/descriptors/ModuleCapability.kt b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/ModuleCapability.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/descriptors/ModuleCapability.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/descriptors/ModuleCapability.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java
rename to core/compiler.common/src/org/jetbrains/kotlin/descriptors/SourceElement.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java
rename to core/compiler.common/src/org/jetbrains/kotlin/descriptors/SourceFile.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationUseSiteTarget.kt b/core/compiler.common/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationUseSiteTarget.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationUseSiteTarget.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationUseSiteTarget.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/ExpectActualTracker.kt b/core/compiler.common/src/org/jetbrains/kotlin/incremental/components/ExpectActualTracker.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/ExpectActualTracker.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/incremental/components/ExpectActualTracker.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt b/core/compiler.common/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/incremental/components/LookupLocation.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt b/core/compiler.common/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/name/ClassId.java b/core/compiler.common/src/org/jetbrains/kotlin/name/ClassId.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/name/ClassId.java
rename to core/compiler.common/src/org/jetbrains/kotlin/name/ClassId.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/name/FqName.java b/core/compiler.common/src/org/jetbrains/kotlin/name/FqName.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/name/FqName.java
rename to core/compiler.common/src/org/jetbrains/kotlin/name/FqName.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/name/FqNameUnsafe.java b/core/compiler.common/src/org/jetbrains/kotlin/name/FqNameUnsafe.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/name/FqNameUnsafe.java
rename to core/compiler.common/src/org/jetbrains/kotlin/name/FqNameUnsafe.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/name/FqNamesUtil.kt b/core/compiler.common/src/org/jetbrains/kotlin/name/FqNamesUtil.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/name/FqNamesUtil.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/name/FqNamesUtil.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/name/Name.java b/core/compiler.common/src/org/jetbrains/kotlin/name/Name.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/name/Name.java
rename to core/compiler.common/src/org/jetbrains/kotlin/name/Name.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/name/NameUtils.kt b/core/compiler.common/src/org/jetbrains/kotlin/name/NameUtils.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/name/NameUtils.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/name/NameUtils.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/name/SpecialNames.java b/core/compiler.common/src/org/jetbrains/kotlin/name/SpecialNames.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/name/SpecialNames.java
rename to core/compiler.common/src/org/jetbrains/kotlin/name/SpecialNames.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/platform/TargetPlatform.kt b/core/compiler.common/src/org/jetbrains/kotlin/platform/TargetPlatform.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/platform/TargetPlatform.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/platform/TargetPlatform.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/platform/platformUtil.kt b/core/compiler.common/src/org/jetbrains/kotlin/platform/platformUtil.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/platform/platformUtil.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/platform/platformUtil.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java b/core/compiler.common/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
rename to core/compiler.common/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt b/core/compiler.common/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/renderer/RenderingUtils.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt b/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/IncompatibleVersionErrorData.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt b/core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedContainerSource.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/types/AbstractStrictEqualityTypeChecker.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/AbstractStrictEqualityTypeChecker.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/types/AbstractStrictEqualityTypeChecker.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/types/AbstractStrictEqualityTypeChecker.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/types/AbstractTypeChecker.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/types/Variance.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/Variance.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/types/Variance.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/types/Variance.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/types/model/MarkerExtensions.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/types/model/TypeSystemContext.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/types/model/typeSystemContextHelpers.kt b/core/compiler.common/src/org/jetbrains/kotlin/types/model/typeSystemContextHelpers.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/types/model/typeSystemContextHelpers.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/types/model/typeSystemContextHelpers.kt
diff --git a/core/descriptors.common/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt b/core/compiler.common/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
similarity index 100%
rename from core/descriptors.common/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
rename to core/compiler.common/src/org/jetbrains/kotlin/util/OperatorNameConventions.kt
diff --git a/core/descriptors/build.gradle.kts b/core/descriptors/build.gradle.kts
index 96b254132fe..b39fa2cd85e 100644
--- a/core/descriptors/build.gradle.kts
+++ b/core/descriptors/build.gradle.kts
@@ -7,7 +7,7 @@ jvmTarget = "1.6"
 javaHome = rootProject.extra["JDK_16"] as String
 
 dependencies {
-    compile(project(":core:descriptors.common"))
+    compile(project(":core:compiler.common"))
     compile(project(":core:util.runtime"))
     compile(kotlinStdlib())
     compile(project(":kotlin-annotations-jvm"))
diff --git a/generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java b/generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
index fe24013a904..e8e2ac26379 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
+++ b/generators/tests/org/jetbrains/kotlin/generators/frontend/GenerateKeywordStrings.java
@@ -31,7 +31,7 @@ import java.util.Iterator;
 import java.util.List;
 
 public class GenerateKeywordStrings {
-    public static final File DEST_FILE = new File("core/descriptors.common/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java");
+    public static final File DEST_FILE = new File("core/compiler.common/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java");
 
     @NotNull
     public static String generate() throws IOException {
diff --git a/idea/idea-frontend-api/build.gradle.kts b/idea/idea-frontend-api/build.gradle.kts
index feb841b5416..5e8fff7146a 100644
--- a/idea/idea-frontend-api/build.gradle.kts
+++ b/idea/idea-frontend-api/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
 
     compileOnly(project(":compiler:psi"))
     compileOnly(project(":compiler:frontend"))
-    compileOnly(project(":core:descriptors.common"))
+    compileOnly(project(":core:compiler.common"))
     compileOnly(project(":idea:idea-frontend-independent"))
     compileOnly(project(":compiler:psi"))
     compileOnly(intellijCoreDep())
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index c8ffde3de54..1cfe2cbb513 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -47,8 +47,8 @@ dependencies {
     embedded(project(":kotlin-reflect-api"))
     embedded(project(":core:metadata"))
     embedded(project(":core:metadata.jvm"))
+    embedded(project(":core:compiler.common"))
     embedded(project(":core:descriptors"))
-    embedded(project(":core:descriptors.common"))
     embedded(project(":core:descriptors.jvm"))
     embedded(project(":core:deserialization"))
     embedded(project(":core:descriptors.runtime"))
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index fec2b2a25a8..f278a69eefb 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -26,8 +26,8 @@ val projectsToShadow by extra(listOf(
         ":daemon-common-new",
         ":core:metadata",
         ":core:metadata.jvm",
+        ":core:compiler.common",
         ":core:descriptors",
-        ":core:descriptors.common",
         ":core:descriptors.jvm",
         ":core:deserialization",
         ":idea:jvm-debugger:eval4j",
diff --git a/settings.gradle b/settings.gradle
index 5e84d03bff3..c2f0324f8b4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -133,7 +133,7 @@ include ":benchmarks",
         ":native:kotlin-klib-commonizer-embeddable",
         ":jps-plugin",
         ":kotlin-jps-plugin",
-        ":core:descriptors.common",
+        ":core:compiler.common",
         ":core:descriptors",
         ":core:descriptors.jvm",
         ":core:deserialization",