diff --git a/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt b/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt
index 0efcd06420a..c7c761fdab6 100644
--- a/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt
+++ b/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt
@@ -29,14 +29,14 @@ UFile (package = )
                     ULocalVariable (name = c)
                         UExpressionList (elvis)
                             UDeclarationsExpression
-                                ULocalVariable (name = varae507364)
+                                ULocalVariable (name = varae5075f4)
                                     USimpleNameReferenceExpression (identifier = a)
                                         UAnnotation (fqName = kotlin.Suppress)
                             UIfExpression
                                 UBinaryExpression (operator = !=)
-                                    USimpleNameReferenceExpression (identifier = varae507364)
+                                    USimpleNameReferenceExpression (identifier = varae5075f4)
                                     ULiteralExpression (value = null)
-                                USimpleNameReferenceExpression (identifier = varae507364)
+                                USimpleNameReferenceExpression (identifier = varae5075f4)
                                 USimpleNameReferenceExpression (identifier = b)
         UMethod (name = annotatedSwitch)
             UParameter (name = str)
diff --git a/plugins/uast-kotlin/testData/AnnotatedExpressions.render.txt b/plugins/uast-kotlin/testData/AnnotatedExpressions.render.txt
index 6ff5390c33f..b9e22540988 100644
--- a/plugins/uast-kotlin/testData/AnnotatedExpressions.render.txt
+++ b/plugins/uast-kotlin/testData/AnnotatedExpressions.render.txt
@@ -6,8 +6,8 @@ public final class AnnotatedExpressionsKt {
         b = a
         if (a > 2) a else b
         var c: int = elvis {
-            var varae507364: int = a
-            if (varae507364 != null) varae507364 else b
+            var varae5075f4: int = a
+            if (varae5075f4 != null) varae5075f4 else b
         }
     }
     public static final fun annotatedSwitch(@org.jetbrains.annotations.NotNull str: java.lang.String) : java.lang.Integer {
diff --git a/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt b/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt
index 288d88dd8e1..f63f59d8c4f 100644
--- a/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt
+++ b/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt
@@ -5,7 +5,7 @@ UFile (package = )
                 UAnnotation (fqName = org.jetbrains.annotations.NotNull)
             UBlockExpression
                 UDeclarationsExpression
-                    ULocalVariable (name = var268d41a5)
+                    ULocalVariable (name = var268d4435)
                         UAnnotation (fqName = null)
                         UBinaryExpression (operator = <other>)
                             ULiteralExpression (value = "foo")
@@ -13,19 +13,19 @@ UFile (package = )
                     ULocalVariable (name = a)
                         UAnnotation (fqName = null)
                         UQualifiedReferenceExpression
-                            USimpleNameReferenceExpression (identifier = var268d41a5)
+                            USimpleNameReferenceExpression (identifier = var268d4435)
                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                 UIdentifier (Identifier (component1))
                                 USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
                     ULocalVariable (name = b)
                         UAnnotation (fqName = null)
                         UQualifiedReferenceExpression
-                            USimpleNameReferenceExpression (identifier = var268d41a5)
+                            USimpleNameReferenceExpression (identifier = var268d4435)
                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                 UIdentifier (Identifier (component2))
                                 USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
                 UDeclarationsExpression
-                    ULocalVariable (name = var465978a0)
+                    ULocalVariable (name = var46597b30)
                         UAnnotation (fqName = null)
                         UAnnotation (fqName = kotlin.Suppress)
                             UNamedExpression (name = names)
@@ -36,14 +36,14 @@ UFile (package = )
                     ULocalVariable (name = k)
                         UAnnotation (fqName = null)
                         UQualifiedReferenceExpression
-                            USimpleNameReferenceExpression (identifier = var465978a0)
+                            USimpleNameReferenceExpression (identifier = var46597b30)
                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                 UIdentifier (Identifier (component1))
                                 USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
                     ULocalVariable (name = v)
                         UAnnotation (fqName = null)
                         UQualifiedReferenceExpression
-                            USimpleNameReferenceExpression (identifier = var465978a0)
+                            USimpleNameReferenceExpression (identifier = var46597b30)
                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                 UIdentifier (Identifier (component2))
                                 USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
diff --git a/plugins/uast-kotlin/testData/DestructuringDeclaration.render.txt b/plugins/uast-kotlin/testData/DestructuringDeclaration.render.txt
index eee3c14de71..0d72cce475f 100644
--- a/plugins/uast-kotlin/testData/DestructuringDeclaration.render.txt
+++ b/plugins/uast-kotlin/testData/DestructuringDeclaration.render.txt
@@ -1,10 +1,10 @@
 public final class DestructuringDeclarationKt {
     public static final fun foo(@org.jetbrains.annotations.NotNull data: java.lang.Object) : void {
-        @null var var268d41a5: <ErrorType> = "foo" <other> 1
-        @null var a: java.lang.String = var268d41a5.<anonymous class>()
-        @null var b: int = var268d41a5.<anonymous class>()
-        @null @kotlin.Suppress(names = "UNCHECKED_CAST") var var465978a0: <ErrorType> = data as kotlin.Pair<? extends java.lang.String,? extends java.lang.String>
-        @null var k: java.lang.String = var465978a0.<anonymous class>()
-        @null var v: java.lang.String = var465978a0.<anonymous class>()
+        @null var var268d4435: <ErrorType> = "foo" <other> 1
+        @null var a: java.lang.String = var268d4435.<anonymous class>()
+        @null var b: int = var268d4435.<anonymous class>()
+        @null @kotlin.Suppress(names = "UNCHECKED_CAST") var var46597b30: <ErrorType> = data as kotlin.Pair<? extends java.lang.String,? extends java.lang.String>
+        @null var k: java.lang.String = var46597b30.<anonymous class>()
+        @null var v: java.lang.String = var46597b30.<anonymous class>()
     }
 }
diff --git a/plugins/uast-kotlin/testData/Elvis.log.txt b/plugins/uast-kotlin/testData/Elvis.log.txt
index 33160a30513..88409aa8899 100644
--- a/plugins/uast-kotlin/testData/Elvis.log.txt
+++ b/plugins/uast-kotlin/testData/Elvis.log.txt
@@ -15,28 +15,28 @@ UFile (package = )
                 UReturnExpression
                     UExpressionList (elvis)
                         UDeclarationsExpression
-                            ULocalVariable (name = var243c51a0)
+                            ULocalVariable (name = var243c5407)
                                 UExpressionList (elvis)
                                     UDeclarationsExpression
-                                        ULocalVariable (name = varc4aef569)
+                                        ULocalVariable (name = varc4aef7d0)
                                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
                                                 UIdentifier (Identifier (foo))
                                                 USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
                                                 ULiteralExpression (value = "Lorem ipsum")
                                     UIfExpression
                                         UBinaryExpression (operator = !=)
-                                            USimpleNameReferenceExpression (identifier = varc4aef569)
+                                            USimpleNameReferenceExpression (identifier = varc4aef7d0)
                                             ULiteralExpression (value = null)
-                                        USimpleNameReferenceExpression (identifier = varc4aef569)
+                                        USimpleNameReferenceExpression (identifier = varc4aef7d0)
                                         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
                                             UIdentifier (Identifier (foo))
                                             USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
                                             ULiteralExpression (value = "dolor sit amet")
                         UIfExpression
                             UBinaryExpression (operator = !=)
-                                USimpleNameReferenceExpression (identifier = var243c51a0)
+                                USimpleNameReferenceExpression (identifier = var243c5407)
                                 ULiteralExpression (value = null)
-                            USimpleNameReferenceExpression (identifier = var243c51a0)
+                            USimpleNameReferenceExpression (identifier = var243c5407)
                             UQualifiedReferenceExpression
                                 UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                     UIdentifier (Identifier (bar))
diff --git a/plugins/uast-kotlin/testData/Elvis.render.txt b/plugins/uast-kotlin/testData/Elvis.render.txt
index 2554f7d42fa..cd0357d5b08 100644
--- a/plugins/uast-kotlin/testData/Elvis.render.txt
+++ b/plugins/uast-kotlin/testData/Elvis.render.txt
@@ -7,11 +7,11 @@ public final class ElvisKt {
     }
     public static final fun baz() : java.lang.String {
         return elvis {
-            var var243c51a0: java.lang.String = elvis {
-                var varc4aef569: java.lang.String = foo("Lorem ipsum")
-                if (varc4aef569 != null) varc4aef569 else foo("dolor sit amet")
+            var var243c5407: java.lang.String = elvis {
+                var varc4aef7d0: java.lang.String = foo("Lorem ipsum")
+                if (varc4aef7d0 != null) varc4aef7d0 else foo("dolor sit amet")
             }
-            if (var243c51a0 != null) var243c51a0 else bar().toString()
+            if (var243c5407 != null) var243c5407 else bar().toString()
         }
     }
 }
diff --git a/plugins/uast-kotlin/testData/LambdaReturn.log.txt b/plugins/uast-kotlin/testData/LambdaReturn.log.txt
index 41227bdcfe3..c7186e63828 100644
--- a/plugins/uast-kotlin/testData/LambdaReturn.log.txt
+++ b/plugins/uast-kotlin/testData/LambdaReturn.log.txt
@@ -102,7 +102,7 @@ UFile (package = org.jetbrains.uast.kotlin)
                         ULambdaExpression
                             UBlockExpression
                                 UDeclarationsExpression
-                                    ULocalVariable (name = vardbcd0724)
+                                    ULocalVariable (name = vardbcd09b4)
                                         UAnnotation (fqName = org.jetbrains.annotations.NotNull)
                                         UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
                                             UIdentifier (Identifier (listOf))
@@ -112,14 +112,14 @@ UFile (package = org.jetbrains.uast.kotlin)
                                     ULocalVariable (name = a)
                                         UAnnotation (fqName = org.jetbrains.annotations.NotNull)
                                         UQualifiedReferenceExpression
-                                            USimpleNameReferenceExpression (identifier = vardbcd0724)
+                                            USimpleNameReferenceExpression (identifier = vardbcd09b4)
                                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                                 UIdentifier (Identifier (component1))
                                                 USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
                                     ULocalVariable (name = b)
                                         UAnnotation (fqName = org.jetbrains.annotations.NotNull)
                                         UQualifiedReferenceExpression
-                                            USimpleNameReferenceExpression (identifier = vardbcd0724)
+                                            USimpleNameReferenceExpression (identifier = vardbcd09b4)
                                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                                 UIdentifier (Identifier (component2))
                                                 USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
diff --git a/plugins/uast-kotlin/testData/LambdaReturn.render.txt b/plugins/uast-kotlin/testData/LambdaReturn.render.txt
index 7bab5caf59b..fdaf0dd3313 100644
--- a/plugins/uast-kotlin/testData/LambdaReturn.render.txt
+++ b/plugins/uast-kotlin/testData/LambdaReturn.render.txt
@@ -31,9 +31,9 @@ public final class LambdaReturnKt {
             return it + b
         })
         var x: kotlin.jvm.functions.Function0<? extends kotlin.Unit> = {
-            @org.jetbrains.annotations.NotNull var vardbcd0724: <ErrorType> = listOf(1, 2)
-            @org.jetbrains.annotations.NotNull var a: int = vardbcd0724.<anonymous class>()
-            @org.jetbrains.annotations.NotNull var b: int = vardbcd0724.<anonymous class>()
+            @org.jetbrains.annotations.NotNull var vardbcd09b4: <ErrorType> = listOf(1, 2)
+            @org.jetbrains.annotations.NotNull var a: int = vardbcd09b4.<anonymous class>()
+            @org.jetbrains.annotations.NotNull var b: int = vardbcd09b4.<anonymous class>()
         }
         var y: kotlin.jvm.functions.Function0<? extends kotlin.Unit> = {
             listOf(1)
diff --git a/plugins/uast-kotlin/testData/TypeReferences.log.txt b/plugins/uast-kotlin/testData/TypeReferences.log.txt
index 13eabf769b3..22bf5afa528 100644
--- a/plugins/uast-kotlin/testData/TypeReferences.log.txt
+++ b/plugins/uast-kotlin/testData/TypeReferences.log.txt
@@ -28,13 +28,13 @@ UFile (package = )
                     ULocalVariable (name = at)
                         UExpressionList (elvis)
                             UDeclarationsExpression
-                                ULocalVariable (name = var708e23eb)
+                                ULocalVariable (name = var708e267b)
                                     USimpleNameReferenceExpression (identifier = arg)
                             UIfExpression
                                 UBinaryExpression (operator = !=)
-                                    USimpleNameReferenceExpression (identifier = var708e23eb)
+                                    USimpleNameReferenceExpression (identifier = var708e267b)
                                     ULiteralExpression (value = null)
-                                USimpleNameReferenceExpression (identifier = var708e23eb)
+                                USimpleNameReferenceExpression (identifier = var708e267b)
                                 UReturnExpression
                 UDeclarationsExpression
                     ULocalVariable (name = tl)
diff --git a/plugins/uast-kotlin/testData/TypeReferences.render.txt b/plugins/uast-kotlin/testData/TypeReferences.render.txt
index 47e646574de..56f39269ff4 100644
--- a/plugins/uast-kotlin/testData/TypeReferences.render.txt
+++ b/plugins/uast-kotlin/testData/TypeReferences.render.txt
@@ -8,8 +8,8 @@ public final class TypeReferencesKt {
     public static final fun parameterizedFoo(@org.jetbrains.annotations.Nullable arg: T) : void {
         var a: T = arg
         var at: T = elvis {
-            var var708e23eb: T = arg
-            if (var708e23eb != null) var708e23eb else return
+            var var708e267b: T = arg
+            if (var708e267b != null) var708e267b else return
         }
         var tl: java.util.List<? extends T> = listOf(at)
         var tsl: java.util.List<? extends java.lang.String> = tl.map({ var it: T ->
diff --git a/plugins/uast-kotlin/testData/TypeReferences.resolved.txt b/plugins/uast-kotlin/testData/TypeReferences.resolved.txt
index a8e10a696ab..a4b52715f89 100644
--- a/plugins/uast-kotlin/testData/TypeReferences.resolved.txt
+++ b/plugins/uast-kotlin/testData/TypeReferences.resolved.txt
@@ -11,7 +11,7 @@ UTypeReferenceExpression (name = <ErrorType>) -> USimpleNameReferenceExpression
 UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
     ULocalVariable (name = a) -> USimpleNameReferenceExpression (identifier = arg) -> Light Parameter: arg
     UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
-    ULocalVariable (name = var708e23eb) -> USimpleNameReferenceExpression (identifier = arg) -> Light Parameter: arg
+    ULocalVariable (name = var708e267b) -> USimpleNameReferenceExpression (identifier = arg) -> Light Parameter: arg
     UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
     UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> PsiClass:List: List
     UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Light PSI class: T: T
diff --git a/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt b/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt
index 542a41e1ccd..b22958107f6 100644
--- a/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt
+++ b/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt
@@ -26,20 +26,20 @@ UFile (package = )
                         USwitchClauseExpressionWithBody
                             UExpressionList (when_entry)
                                 UDeclarationsExpression
-                                    ULocalVariable (name = var837f2350)
+                                    ULocalVariable (name = var837f25e0)
                                         UAnnotation (fqName = null)
                                         USimpleNameReferenceExpression (identifier = arr)
                                     ULocalVariable (name = bindingContext)
                                         UAnnotation (fqName = null)
                                         UQualifiedReferenceExpression
-                                            USimpleNameReferenceExpression (identifier = var837f2350)
+                                            USimpleNameReferenceExpression (identifier = var837f25e0)
                                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                                 UIdentifier (Identifier (component1))
                                                 USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
                                     ULocalVariable (name = statementFilter)
                                         UAnnotation (fqName = null)
                                         UQualifiedReferenceExpression
-                                            USimpleNameReferenceExpression (identifier = var837f2350)
+                                            USimpleNameReferenceExpression (identifier = var837f25e0)
                                             UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
                                                 UIdentifier (Identifier (component2))
                                                 USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
diff --git a/plugins/uast-kotlin/testData/WhenAndDestructing.render.txt b/plugins/uast-kotlin/testData/WhenAndDestructing.render.txt
index d1c48e4dc93..a9f9fce943b 100644
--- a/plugins/uast-kotlin/testData/WhenAndDestructing.render.txt
+++ b/plugins/uast-kotlin/testData/WhenAndDestructing.render.txt
@@ -10,9 +10,9 @@ public final class WhenAndDestructingKt {
             }
 
              -> {
-                @null var var837f2350: <ErrorType> = arr
-                @null var bindingContext: java.lang.String = var837f2350.<anonymous class>()
-                @null var statementFilter: java.lang.String = var837f2350.<anonymous class>()
+                @null var var837f25e0: <ErrorType> = arr
+                @null var bindingContext: java.lang.String = var837f25e0.<anonymous class>()
+                @null var statementFilter: java.lang.String = var837f25e0.<anonymous class>()
                 yield return bindingContext
             }