diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts
index 713bdb7d320..2785ddccadb 100644
--- a/compiler/fir/tree/build.gradle.kts
+++ b/compiler/fir/tree/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":core:descriptors.jvm"))
+    api(project(":core:compiler.common.jvm"))
     api(project(":compiler:frontend.common"))
     api(project(":compiler:fir:cones"))
 
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
similarity index 97%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
index 96d510f4e43..5262126964f 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
+++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
@@ -8,8 +8,6 @@ package org.jetbrains.kotlin.load.java
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.findValueForMostSpecificFqname
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.MemoizedFunctionToNullable
-import org.jetbrains.kotlin.storage.StorageManager
 
 val JSPECIFY_ANNOTATIONS_PACKAGE = FqName("org.jspecify.nullness")
 val CHECKER_FRAMEWORK_COMPATQUAL_ANNOTATIONS_PACKAGE = FqName("org.checkerframework.checker.nullness.compatqual")
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/ReportLevel.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/ReportLevel.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/ReportLevel.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/ReportLevel.kt