diff --git a/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml b/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml
index ae15435c02d9..27c1137c03ae 100644
--- a/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml
+++ b/plugins/kotlin/uast/uast-kotlin-fir/kotlin.uast.uast-kotlin.k2.iml
@@ -37,6 +37,5 @@
     <orderEntry type="library" name="kotlinc.low-level-api-fir" level="project" />
     <orderEntry type="library" name="kotlinc.analysis-api-platform-interface" level="project" />
     <orderEntry type="library" name="kotlinc.symbol-light-classes" level="project" />
-    <orderEntry type="module" module-name="kotlin.base.analysis-api.utils" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastCodeGenerationPlugin.kt b/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastCodeGenerationPlugin.kt
deleted file mode 100644
index a13cf352d649..000000000000
--- a/plugins/kotlin/uast/uast-kotlin-fir/src/org/jetbrains/uast/kotlin/FirKotlinUastCodeGenerationPlugin.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package org.jetbrains.uast.kotlin
-
-import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferences
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.uast.kotlin.generate.KotlinUastBaseCodeGenerationPlugin
-
-abstract class FirKotlinUastCodeGenerationPlugin : KotlinUastBaseCodeGenerationPlugin() {
-    override fun shortenReference(sourcePsi: KtElement): PsiElement? {
-        shortenReferences(sourcePsi)
-        return sourcePsi
-    }
-}
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-idea-fir/kotlin.uast.uast-kotlin-idea.k2.iml b/plugins/kotlin/uast/uast-kotlin-idea-fir/kotlin.uast.uast-kotlin-idea.k2.iml
index eb0b2e9c96e7..841a891ef431 100644
--- a/plugins/kotlin/uast/uast-kotlin-idea-fir/kotlin.uast.uast-kotlin-idea.k2.iml
+++ b/plugins/kotlin/uast/uast-kotlin-idea-fir/kotlin.uast.uast-kotlin-idea.k2.iml
@@ -25,5 +25,6 @@
     <orderEntry type="module" module-name="kotlin.test-framework" scope="TEST" />
     <orderEntry type="module" module-name="kotlin.base.util" />
     <orderEntry type="module" module-name="kotlin.refactorings.common" />
+    <orderEntry type="module" module-name="kotlin.base.analysis-api.utils" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/kotlin/uast/uast-kotlin-idea-fir/src/org/jetbrains/uast/kotlin/IdeaFirKotlinUastCodeGenerationPlugin.kt b/plugins/kotlin/uast/uast-kotlin-idea-fir/src/org/jetbrains/uast/kotlin/IdeaFirKotlinUastCodeGenerationPlugin.kt
index d12c8527f863..8626a783ad84 100644
--- a/plugins/kotlin/uast/uast-kotlin-idea-fir/src/org/jetbrains/uast/kotlin/IdeaFirKotlinUastCodeGenerationPlugin.kt
+++ b/plugins/kotlin/uast/uast-kotlin-idea-fir/src/org/jetbrains/uast/kotlin/IdeaFirKotlinUastCodeGenerationPlugin.kt
@@ -3,20 +3,29 @@ package org.jetbrains.uast.kotlin
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisOnEdt
 import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisOnEdt
+import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferences
 import org.jetbrains.kotlin.idea.refactoring.moveFunctionLiteralOutsideParentheses
 import org.jetbrains.kotlin.idea.refactoring.rename.KtReferenceMutateServiceBase
 import org.jetbrains.kotlin.idea.references.KtReferenceMutateService
 import org.jetbrains.kotlin.psi.KtCallExpression
+import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.uast.UElement
 import org.jetbrains.uast.generate.UastCommentSaver
 import org.jetbrains.uast.generate.UastElementFactory
+import org.jetbrains.uast.kotlin.generate.KotlinUastBaseCodeGenerationPlugin
 import org.jetbrains.uast.kotlin.generate.KotlinUastElementFactory
 import org.jetbrains.uast.kotlin.generate.createUastCommentSaver
 
 
-class IdeaFirKotlinUastCodeGenerationPlugin : FirKotlinUastCodeGenerationPlugin(){
+class IdeaFirKotlinUastCodeGenerationPlugin : KotlinUastBaseCodeGenerationPlugin(){
+    override fun shortenReference(sourcePsi: KtElement): PsiElement {
+        shortenReferences(sourcePsi)
+        return sourcePsi
+    }
+
     @OptIn(KaAllowAnalysisOnEdt::class)
     override fun getElementFactory(project: Project): UastElementFactory {
         return object : KotlinUastElementFactory(project) {