diff --git a/.space/CODEOWNERS b/.space/CODEOWNERS
index 1e40cd99c2290..3250ff29ed28c 100644
--- a/.space/CODEOWNERS
+++ b/.space/CODEOWNERS
@@ -119,7 +119,7 @@
 /compiler/testData/classpathOrder/ "Kotlin JVM"
 /compiler/testData/cli/ "Kotlin Frontend"
 /compiler/testData/cli/js/ "Kotlin Common Backend" "Kotlin Frontend"
-/compiler/testData/cli/js-dce/ "Kotlin Common Backend" "Kotlin Compiler Core"
+/compiler/testData/cli/js-dce/ "Kotlin Common Backend" "Kotlin Frontend"
 /compiler/testData/cli/jvm/ "Kotlin JVM" "Kotlin Frontend"
 /compiler/testData/cli/metadata/ "Kotlin Frontend"
 /compiler/testData/codegen/asmLike/ "Kotlin JVM"
@@ -138,7 +138,7 @@
 /compiler/testData/codegen/defaultArguments/reflection/ "Kotlin JVM"
 /compiler/testData/codegen/helpers/ "Kotlin JVM"
 /compiler/testData/codegen/innerClassInfo/ "Kotlin JVM"
-/compiler/testData/codegen/kapt/ "Kotlin Compiler Core"
+/compiler/testData/codegen/kapt/ "Kotlin JVM"
 /compiler/testData/codegen/notNullAssertions/ "Kotlin JVM"
 /compiler/testData/codegen/outerClassInfo/ "Kotlin JVM"
 /compiler/testData/codegen/properties/ "Kotlin JVM"
@@ -386,10 +386,10 @@
 /plugins/fir-plugin-prototype/ "Kotlin Frontend"
 /plugins/imports-dumper/ "Kotlin Frontend"
 /plugins/jvm-abi-gen/ "Kotlin JVM"
-/plugins/kapt3/ "Kotlin Compiler Core"
-/plugins/kapt3/kapt3-compiler/test/ "Kotlin Compiler Core" "Kotlin JVM"
-/plugins/kapt3/kapt3-compiler/testData/ "Kotlin Compiler Core" "Kotlin JVM"
-/plugins/kapt3/kapt3-compiler/tests-gen/ "Kotlin Compiler Core" "Kotlin JVM"
+/plugins/kapt3/ "Kotlin JVM"
+/plugins/kapt3/kapt3-compiler/test/ "Kotlin JVM"
+/plugins/kapt3/kapt3-compiler/testData/ "Kotlin JVM"
+/plugins/kapt3/kapt3-compiler/tests-gen/ "Kotlin JVM"
 /plugins/kapt4/ "Kotlin JVM"
 /plugins/kotlinx-serialization/ Sergey.Shanshin Leonid.Startsev
 /plugins/js-plain-objects/ Artem.Kobzar