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 27c1137c03ae..ae15435c02d9 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,5 +37,6 @@
     <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
index fe9b48c62c47..a13cf352d649 100644
--- 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
@@ -2,18 +2,13 @@
 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
-import org.jetbrains.uast.kotlin.internal.analyzeForUast
 
 abstract class FirKotlinUastCodeGenerationPlugin : KotlinUastBaseCodeGenerationPlugin() {
-  override fun shortenReference(sourcePsi: KtElement): PsiElement {
-    val ktFile = sourcePsi.containingKtFile
-    analyzeForUast(ktFile) {
-        collectPossibleReferenceShortenings(ktFile, sourcePsi.textRange)
+    override fun shortenReference(sourcePsi: KtElement): PsiElement? {
+        shortenReferences(sourcePsi)
+        return sourcePsi
     }
-
-    //todo apply shortening
-    return sourcePsi
-  }
 }
\ No newline at end of file