diff --git a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/printing.kt b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/printing.kt
index 37d7d0455ca..2e592082093 100644
--- a/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/printing.kt
+++ b/nj2k/nj2k-services/src/org/jetbrains/kotlin/nj2k/nullabilityAnalysis/printing.kt
@@ -71,8 +71,10 @@ internal class Printer(private val analysisContext: AnalysisContext) {
 
 private class Namer(analysisContext: AnalysisContext) {
     val names = run {
-        val typeVariables = (analysisContext.typeElementToTypeVariable.values +
-                analysisContext.declarationToTypeVariable.values)
+        val typeVariables =
+            analysisContext.typeVariableOwners.flatMap { owner ->
+                owner.allTypeVariables.flatMap { it.innerTypeVariables() + it }
+            }
         typeVariables.mapIndexed { index, typeVariable ->
             typeVariable to "T$index"
         }.toMap()