diff --git a/compiler/testData/ir/irJsText/dynamic/dynamicCall.kt.txt b/compiler/testData/ir/irJsText/dynamic/dynamicCall.kt.txt
index af23e17284b..c938a630c8e 100644
--- a/compiler/testData/ir/irJsText/dynamic/dynamicCall.kt.txt
+++ b/compiler/testData/ir/irJsText/dynamic/dynamicCall.kt.txt
@@ -7,7 +7,7 @@ fun test2(d: dynamic): dynamic {
     val tmp0_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.member(1, 2, 3)
+      else -> tmp0_safe_receiver.member(1, 2, 3)
     }
   }
 }
diff --git a/compiler/testData/ir/irJsText/dynamic/dynamicElvisOperator.kt.txt b/compiler/testData/ir/irJsText/dynamic/dynamicElvisOperator.kt.txt
index 9be59ac622e..25b1689fa36 100644
--- a/compiler/testData/ir/irJsText/dynamic/dynamicElvisOperator.kt.txt
+++ b/compiler/testData/ir/irJsText/dynamic/dynamicElvisOperator.kt.txt
@@ -3,7 +3,7 @@ fun test(d: dynamic): dynamic {
     val tmp0_elvis_lhs: dynamic = d
     when {
       EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> "other"
-      true -> tmp0_elvis_lhs
+      else -> tmp0_elvis_lhs
     }
   }
 }
diff --git a/compiler/testData/ir/irJsText/dynamic/dynamicMemberAccess.kt.txt b/compiler/testData/ir/irJsText/dynamic/dynamicMemberAccess.kt.txt
index eb76f1c02b9..61b0fd458b7 100644
--- a/compiler/testData/ir/irJsText/dynamic/dynamicMemberAccess.kt.txt
+++ b/compiler/testData/ir/irJsText/dynamic/dynamicMemberAccess.kt.txt
@@ -7,7 +7,7 @@ fun test2(d: dynamic): dynamic {
     val tmp0_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.member
+      else -> tmp0_safe_receiver.member
     }
   }
 }
diff --git a/compiler/testData/ir/irJsText/dynamic/dynamicMemberAssignment.kt.txt b/compiler/testData/ir/irJsText/dynamic/dynamicMemberAssignment.kt.txt
index ff938434c56..2a1cbe408a3 100644
--- a/compiler/testData/ir/irJsText/dynamic/dynamicMemberAssignment.kt.txt
+++ b/compiler/testData/ir/irJsText/dynamic/dynamicMemberAssignment.kt.txt
@@ -7,7 +7,7 @@ fun testSafeMemberAssignment(d: dynamic) {
     val tmp0_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null /*~> Unit */
-      true -> tmp0_safe_receiver.m = 1
+      else -> tmp0_safe_receiver.m = 1
     }
   }
 }
diff --git a/compiler/testData/ir/irJsText/dynamic/dynamicMemberAugmentedAssignment.kt.txt b/compiler/testData/ir/irJsText/dynamic/dynamicMemberAugmentedAssignment.kt.txt
index cc8293f48f6..8fffb5a3160 100644
--- a/compiler/testData/ir/irJsText/dynamic/dynamicMemberAugmentedAssignment.kt.txt
+++ b/compiler/testData/ir/irJsText/dynamic/dynamicMemberAugmentedAssignment.kt.txt
@@ -11,35 +11,35 @@ fun testSafeAugmentedMemberAssignment(d: dynamic) {
     val tmp0_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null /*~> Unit */
-      true -> tmp0_safe_receiver.m += "+="
+      else -> tmp0_safe_receiver.m += "+="
     }
   }
   { // BLOCK
     val tmp1_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null /*~> Unit */
-      true -> tmp1_safe_receiver.m -= "-="
+      else -> tmp1_safe_receiver.m -= "-="
     }
   }
   { // BLOCK
     val tmp2_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp2_safe_receiver, arg1 = null) -> null /*~> Unit */
-      true -> tmp2_safe_receiver.m *= "*="
+      else -> tmp2_safe_receiver.m *= "*="
     }
   }
   { // BLOCK
     val tmp3_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp3_safe_receiver, arg1 = null) -> null /*~> Unit */
-      true -> tmp3_safe_receiver.m /= "/="
+      else -> tmp3_safe_receiver.m /= "/="
     }
   }
   { // BLOCK
     val tmp4_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp4_safe_receiver, arg1 = null) -> null /*~> Unit */
-      true -> tmp4_safe_receiver.m %= "%="
+      else -> tmp4_safe_receiver.m %= "%="
     }
   }
 }
diff --git a/compiler/testData/ir/irJsText/dynamic/dynamicMemberIncrementDecrement.kt.txt b/compiler/testData/ir/irJsText/dynamic/dynamicMemberIncrementDecrement.kt.txt
index 886013fdecd..97815c0b0de 100644
--- a/compiler/testData/ir/irJsText/dynamic/dynamicMemberIncrementDecrement.kt.txt
+++ b/compiler/testData/ir/irJsText/dynamic/dynamicMemberIncrementDecrement.kt.txt
@@ -10,28 +10,28 @@ fun testSafeMemberIncrementDecrement(d: dynamic) {
     val tmp0_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> ++tmp0_safe_receiver.prefixIncr
+      else -> ++tmp0_safe_receiver.prefixIncr
     }
   }
   val t2: dynamic = { // BLOCK
     val tmp1_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null
-      true -> --tmp1_safe_receiver.prefixDecr
+      else -> --tmp1_safe_receiver.prefixDecr
     }
   }
   val t3: dynamic = { // BLOCK
     val tmp2_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp2_safe_receiver, arg1 = null) -> null
-      true -> tmp2_safe_receiver.postfixIncr++
+      else -> tmp2_safe_receiver.postfixIncr++
     }
   }
   val t4: dynamic = { // BLOCK
     val tmp3_safe_receiver: dynamic = d
     when {
       EQEQ(arg0 = tmp3_safe_receiver, arg1 = null) -> null
-      true -> tmp3_safe_receiver.postfixDecr--
+      else -> tmp3_safe_receiver.postfixDecr--
     }
   }
 }
diff --git a/compiler/testData/ir/irJsText/dynamic/dynamicWithSmartCast.kt.txt b/compiler/testData/ir/irJsText/dynamic/dynamicWithSmartCast.kt.txt
index c815813af50..411f0fb7793 100644
--- a/compiler/testData/ir/irJsText/dynamic/dynamicWithSmartCast.kt.txt
+++ b/compiler/testData/ir/irJsText/dynamic/dynamicWithSmartCast.kt.txt
@@ -1,14 +1,14 @@
 fun test1(d: dynamic): Int {
   return when {
     d is String -> d /*~> String */.<get-length>()
-    true -> -1
+    else -> -1
   }
 }
 
 fun test2(d: dynamic): Int {
   return when {
     d is Array<*> -> d /*~> Array<out Any?> */.<get-size>()
-    true -> -1
+    else -> -1
   }
 }
 
diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.kt.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.kt.txt
index 522024adae4..a9cdad2b3e5 100644
--- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.kt.txt
+++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.kt.txt
@@ -207,7 +207,7 @@ data class Test3 {
   override fun hashCode(): Int {
     return when {
       EQEQ(arg0 = <this>.#anyArrayN, arg1 = null) -> 0
-      true -> dataClassArrayMemberHashCode(arg0 = <this>.#anyArrayN)
+      else -> dataClassArrayMemberHashCode(arg0 = <this>.#anyArrayN)
     }
   }
 
diff --git a/compiler/testData/ir/irText/classes/dataClasses.kt.txt b/compiler/testData/ir/irText/classes/dataClasses.kt.txt
index 623d2502672..8633b01ed34 100644
--- a/compiler/testData/ir/irText/classes/dataClasses.kt.txt
+++ b/compiler/testData/ir/irText/classes/dataClasses.kt.txt
@@ -92,7 +92,7 @@ data class Test2 {
   override fun hashCode(): Int {
     return when {
       EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
-      true -> <this>.#x.hashCode()
+      else -> <this>.#x.hashCode()
     }
   }
 
@@ -163,12 +163,12 @@ data class Test3 {
     var result: Int = <this>.#d.hashCode()
     result = result.times(other = 31).plus(other = when {
       EQEQ(arg0 = <this>.#dn, arg1 = null) -> 0
-      true -> <this>.#dn.hashCode()
+      else -> <this>.#dn.hashCode()
     })
     result = result.times(other = 31).plus(other = <this>.#f.hashCode())
     result = result.times(other = 31).plus(other = when {
       EQEQ(arg0 = <this>.#df, arg1 = null) -> 0
-      true -> <this>.#df.hashCode()
+      else -> <this>.#df.hashCode()
     })
     return result
   }
diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.kt.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.kt.txt
index d4f69ebfbc2..97eb2fcc943 100644
--- a/compiler/testData/ir/irText/classes/dataClassesGeneric.kt.txt
+++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.kt.txt
@@ -24,7 +24,7 @@ data class Test1<T : Any?> {
   override fun hashCode(): Int {
     return when {
       EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
-      true -> <this>.#x.hashCode()
+      else -> <this>.#x.hashCode()
     }
   }
 
diff --git a/compiler/testData/ir/irText/classes/kt31649.kt.txt b/compiler/testData/ir/irText/classes/kt31649.kt.txt
index c29091547d3..29ce0bca107 100644
--- a/compiler/testData/ir/irText/classes/kt31649.kt.txt
+++ b/compiler/testData/ir/irText/classes/kt31649.kt.txt
@@ -24,7 +24,7 @@ data class TestData {
   override fun hashCode(): Int {
     return when {
       EQEQ(arg0 = <this>.#nn, arg1 = null) -> 0
-      true -> <this>.#nn.hashCode()
+      else -> <this>.#nn.hashCode()
     }
   }
 
@@ -62,7 +62,7 @@ inline class TestInline {
   override fun hashCode(): Int {
     return when {
       EQEQ(arg0 = <this>.#nn, arg1 = null) -> 0
-      true -> <this>.#nn.hashCode()
+      else -> <this>.#nn.hashCode()
     }
   }
 
diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt
index 48559daab2c..64730bd7ad4 100644
--- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.kt.txt
@@ -32,7 +32,7 @@ data class Test<T : Any?> {
   override fun hashCode(): Int {
     var result: Int = when {
       EQEQ(arg0 = <this>.#x, arg1 = null) -> 0
-      true -> <this>.#x.hashCode()
+      else -> <this>.#x.hashCode()
     }
     result = result.times(other = 31).plus(other = <this>.#y.hashCode())
     return result
diff --git a/compiler/testData/ir/irText/expressions/bangbang.kt.txt b/compiler/testData/ir/irText/expressions/bangbang.kt.txt
index f23cea9dc98..8b1abe30418 100644
--- a/compiler/testData/ir/irText/expressions/bangbang.kt.txt
+++ b/compiler/testData/ir/irText/expressions/bangbang.kt.txt
@@ -7,7 +7,7 @@ fun test2(a: Any?): Int {
     val tmp0_safe_receiver: Any? = a
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.hashCode()
+      else -> tmp0_safe_receiver.hashCode()
     }
   })
 }
diff --git a/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.kt.txt b/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.kt.txt
index 4b1c944a331..864cc27474d 100644
--- a/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.kt.txt
+++ b/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.kt.txt
@@ -1,14 +1,14 @@
 fun test1(b: Boolean) {
   when {
     b -> return Unit
-    true -> false
+    else -> false
   } /*~> Unit */
 }
 
 fun test2(b: Boolean) {
   when {
     b -> true
-    true -> return Unit
+    else -> return Unit
   } /*~> Unit */
 }
 
diff --git a/compiler/testData/ir/irText/expressions/booleanOperators.kt.txt b/compiler/testData/ir/irText/expressions/booleanOperators.kt.txt
index ea168900519..527f5067a88 100644
--- a/compiler/testData/ir/irText/expressions/booleanOperators.kt.txt
+++ b/compiler/testData/ir/irText/expressions/booleanOperators.kt.txt
@@ -1,14 +1,14 @@
 fun test1(a: Boolean, b: Boolean): Boolean {
   return when {
     a -> b
-    true -> false
+    else -> false
   }
 }
 
 fun test2(a: Boolean, b: Boolean): Boolean {
   return when {
     a -> true
-    true -> b
+    else -> b
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.kt.txt b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.kt.txt
index 9d029d555c8..7b8cf112add 100644
--- a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.kt.txt
+++ b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.kt.txt
@@ -4,7 +4,7 @@ fun test1(c: Boolean?) {
       val tmp0_elvis_lhs: Boolean? = c
       when {
         EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> break
-        true -> tmp0_elvis_lhs
+        else -> tmp0_elvis_lhs
       }
     }) 
   }
@@ -16,7 +16,7 @@ fun test2(c: Boolean?) {
       val tmp0_elvis_lhs: Boolean? = c
       when {
         EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> continue
-        true -> tmp0_elvis_lhs
+        else -> tmp0_elvis_lhs
       }
     }) 
   }
@@ -29,7 +29,7 @@ fun test3(ss: List<String>?) {
         val tmp0_elvis_lhs: List<String>? = ss
         when {
           EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> continue
-          true -> tmp0_elvis_lhs
+          else -> tmp0_elvis_lhs
         }
       }.iterator()
       L2@ while (tmp1_iterator.hasNext()) { // BLOCK
@@ -46,7 +46,7 @@ fun test4(ss: List<String>?) {
         val tmp0_elvis_lhs: List<String>? = ss
         when {
           EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> break
-          true -> tmp0_elvis_lhs
+          else -> tmp0_elvis_lhs
         }
       }.iterator()
       L2@ while (tmp1_iterator.hasNext()) { // BLOCK
@@ -72,7 +72,7 @@ fun test5() {
       } /*~> Unit */
       // }      while (when {
         greaterOrEqual(arg0 = j, arg1 = 3) -> false
-        true -> break
+        else -> break
       })
     }
     when {
diff --git a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt.txt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt.txt
index 343cf760287..7a94b51e0c0 100644
--- a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt.txt
+++ b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.kt.txt
@@ -23,22 +23,22 @@ fun test(nc: C?): C? {
           val tmp0_safe_receiver: C? = nc
           when {
             EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-            true -> tmp0_safe_receiver.foo()
+            else -> tmp0_safe_receiver.foo()
           }
         }
         when {
           EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null
-          true -> tmp1_safe_receiver.bar()
+          else -> tmp1_safe_receiver.bar()
         }
       }
       when {
         EQEQ(arg0 = tmp2_safe_receiver, arg1 = null) -> null
-        true -> tmp2_safe_receiver.foo()
+        else -> tmp2_safe_receiver.foo()
       }
     }
     when {
       EQEQ(arg0 = tmp3_safe_receiver, arg1 = null) -> null
-      true -> tmp3_safe_receiver.foo()
+      else -> tmp3_safe_receiver.foo()
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.kt.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.kt.txt
index bdfbeaadb66..503b0636f2a 100644
--- a/compiler/testData/ir/irText/expressions/coercionToUnit.kt.txt
+++ b/compiler/testData/ir/irText/expressions/coercionToUnit.kt.txt
@@ -14,14 +14,14 @@ fun test3() {
     val tmp0_safe_receiver: @FlexibleNullability PrintStream? = super.#out
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver /*!! PrintStream */.println(p0 = "Hello,")
+      else -> tmp0_safe_receiver /*!! PrintStream */.println(p0 = "Hello,")
     }
   } /*~> Unit */
   { // BLOCK
     val tmp1_safe_receiver: @FlexibleNullability PrintStream? = super.#out
     when {
       EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null
-      true -> tmp1_safe_receiver /*!! PrintStream */.println(p0 = "world!")
+      else -> tmp1_safe_receiver /*!! PrintStream */.println(p0 = "world!")
     }
   } /*~> Unit */
 }
diff --git a/compiler/testData/ir/irText/expressions/dotQualified.kt.txt b/compiler/testData/ir/irText/expressions/dotQualified.kt.txt
index a42eda1db63..e155ea3c2ee 100644
--- a/compiler/testData/ir/irText/expressions/dotQualified.kt.txt
+++ b/compiler/testData/ir/irText/expressions/dotQualified.kt.txt
@@ -7,7 +7,7 @@ fun lengthN(s: String?): Int? {
     val tmp0_safe_receiver: String? = s
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.<get-length>()
+      else -> tmp0_safe_receiver.<get-length>()
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/elvis.kt.txt b/compiler/testData/ir/irText/expressions/elvis.kt.txt
index 394c9f17880..1906fcd3efa 100644
--- a/compiler/testData/ir/irText/expressions/elvis.kt.txt
+++ b/compiler/testData/ir/irText/expressions/elvis.kt.txt
@@ -11,7 +11,7 @@ fun test1(a: Any?, b: Any): Any {
     val tmp0_elvis_lhs: Any? = a
     when {
       EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> b
-      true -> tmp0_elvis_lhs
+      else -> tmp0_elvis_lhs
     }
   }
 }
@@ -21,7 +21,7 @@ fun test2(a: String?, b: Any): Any {
     val tmp0_elvis_lhs: String? = a
     when {
       EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> b
-      true -> tmp0_elvis_lhs
+      else -> tmp0_elvis_lhs
     }
   }
 }
@@ -37,7 +37,7 @@ fun test3(a: Any?, b: Any?): String {
     val tmp0_elvis_lhs: Any? = a
     when {
       EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> b /*as String */
-      true -> tmp0_elvis_lhs /*as String */
+      else -> tmp0_elvis_lhs /*as String */
     }
   }
 }
@@ -47,7 +47,7 @@ fun test4(x: Any): Any {
     val tmp0_elvis_lhs: Any? = <get-p>()
     when {
       EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> x
-      true -> tmp0_elvis_lhs
+      else -> tmp0_elvis_lhs
     }
   }
 }
@@ -57,7 +57,7 @@ fun test5(x: Any): Any {
     val tmp0_elvis_lhs: Any? = foo()
     when {
       EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> x
-      true -> tmp0_elvis_lhs
+      else -> tmp0_elvis_lhs
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
index 68b58c83c87..9d82af00296 100644
--- a/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
+++ b/compiler/testData/ir/irText/expressions/exhaustiveWhenElseBranch.kt.txt
@@ -19,7 +19,7 @@ fun testVariableAssignment_throws(a: A) {
     val tmp0_subject: A = a
     when {
       EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> x = 11
-      true -> noWhenBranchMatchedException()
+      else -> noWhenBranchMatchedException()
     }
   }
 }
@@ -56,7 +56,7 @@ fun testExpression_throws(a: A): Int {
     val tmp0_subject: A = a
     when {
       EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1
-      true -> noWhenBranchMatchedException()
+      else -> noWhenBranchMatchedException()
     }
   }
 }
@@ -64,7 +64,7 @@ fun testExpression_throws(a: A): Int {
 fun testIfTheElseStatement_empty(a: A, flag: Boolean) {
   when {
     flag -> 0 /*~> Unit */
-    true -> { // BLOCK
+    else -> { // BLOCK
       { // BLOCK
         val tmp0_subject: A = a
         when {
@@ -78,7 +78,7 @@ fun testIfTheElseStatement_empty(a: A, flag: Boolean) {
 fun testIfTheElseParenthesized_throwsJvm(a: A, flag: Boolean) {
   when {
     flag -> 0 /*~> Unit */
-    true -> { // BLOCK
+    else -> { // BLOCK
       { // BLOCK
         val tmp0_subject: A = a
         when {
@@ -92,7 +92,7 @@ fun testIfTheElseParenthesized_throwsJvm(a: A, flag: Boolean) {
 fun testIfTheElseAnnotated_throwsJvm(a: A, flag: Boolean) {
   when {
     flag -> 0 /*~> Unit */
-    true -> { // BLOCK
+    else -> { // BLOCK
       { // BLOCK
         val tmp0_subject: A = a
         when {
@@ -109,7 +109,7 @@ fun testLambdaResultExpression_throws(a: A) {
       val tmp0_subject: A = a
       when {
         EQEQ(arg0 = tmp0_subject, arg1 = A.V1) -> 1
-        true -> noWhenBranchMatchedException()
+        else -> noWhenBranchMatchedException()
       }
     }
   }
diff --git a/compiler/testData/ir/irText/expressions/extFunSafeInvoke.kt.txt b/compiler/testData/ir/irText/expressions/extFunSafeInvoke.kt.txt
index cde2bea701e..755362b03b3 100644
--- a/compiler/testData/ir/irText/expressions/extFunSafeInvoke.kt.txt
+++ b/compiler/testData/ir/irText/expressions/extFunSafeInvoke.kt.txt
@@ -3,7 +3,7 @@ fun test(receiver: Any?, fn: @ExtensionFunctionType Function3<Any, Int, String,
     val tmp0_safe_receiver: Any? = receiver
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> fn.invoke(p1 = tmp0_safe_receiver, p2 = 42, p3 = "Hello")
+      else -> fn.invoke(p1 = tmp0_safe_receiver, p2 = 42, p3 = "Hello")
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/comparableWithDoubleOrFloat.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/comparableWithDoubleOrFloat.kt.txt
index 8fa59fd4c0e..5c4d4068b75 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/comparableWithDoubleOrFloat.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/comparableWithDoubleOrFloat.kt.txt
@@ -2,9 +2,9 @@ fun testD(x: Comparable<Double>, y: Comparable<Double>): Boolean {
   return when {
     when {
       x is Double -> y is Double
-      true -> false
+      else -> false
     } -> less(arg0 = x /*as Double */, arg1 = y /*as Double */)
-    true -> false
+    else -> false
   }
 }
 
@@ -12,9 +12,9 @@ fun testF(x: Comparable<Float>, y: Comparable<Float>): Boolean {
   return when {
     when {
       x is Float -> y is Float
-      true -> false
+      else -> false
     } -> less(arg0 = x /*as Float */, arg1 = y /*as Float */)
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/eqeqRhsConditionPossiblyAffectingLhs.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/eqeqRhsConditionPossiblyAffectingLhs.kt.txt
index f137776502b..2a7b8ae5df7 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/eqeqRhsConditionPossiblyAffectingLhs.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/eqeqRhsConditionPossiblyAffectingLhs.kt.txt
@@ -1,7 +1,7 @@
 fun test(x: Any): Boolean {
   return EQEQ(arg0 = x, arg1 = when {
     x !is Double -> CHECK_NOT_NULL<Nothing>(arg0 = null)
-    true -> x /*as Double */
+    else -> x /*as Double */
   })
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointCompareTo.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointCompareTo.kt.txt
index 7ae48f901bc..044f844c46b 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointCompareTo.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointCompareTo.kt.txt
@@ -5,7 +5,7 @@ fun test1d(x: Double, y: Double): Int {
 fun test2d(x: Double, y: Any): Boolean {
   return when {
     y is Double -> EQEQ(arg0 = x.compareTo(other = y /*as Double */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
@@ -13,9 +13,9 @@ fun test3d(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Double
-      true -> false
+      else -> false
     } -> EQEQ(arg0 = x /*as Double */.compareTo(other = y /*as Double */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
@@ -26,7 +26,7 @@ fun test1f(x: Float, y: Float): Int {
 fun test2f(x: Float, y: Any): Boolean {
   return when {
     y is Float -> EQEQ(arg0 = x.compareTo(other = y /*as Float */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
@@ -34,9 +34,9 @@ fun test3f(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Float
-      true -> false
+      else -> false
     } -> EQEQ(arg0 = x /*as Float */.compareTo(other = y /*as Float */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
@@ -44,9 +44,9 @@ fun testFD(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Double
-      true -> false
+      else -> false
     } -> EQEQ(arg0 = x /*as Float */.compareTo(other = y /*as Double */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
@@ -54,9 +54,9 @@ fun testDF(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Float
-      true -> false
+      else -> false
     } -> EQEQ(arg0 = x /*as Double */.compareTo(other = y /*as Float */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
@@ -67,14 +67,14 @@ fun Float.test1fr(x: Float): Int {
 fun Float.test2fr(x: Any): Boolean {
   return when {
     x is Float -> EQEQ(arg0 = <this>.compareTo(other = x /*as Float */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
 fun Float.test3fr(x: Any): Boolean {
   return when {
     x is Double -> EQEQ(arg0 = <this>.compareTo(other = x /*as Double */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEqeq.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEqeq.kt.txt
index 492e74a474b..25a1dad4a61 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEqeq.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEqeq.kt.txt
@@ -17,7 +17,7 @@ fun test4d(x: Double, y: Number): Boolean {
 fun test5d(x: Double, y: Any): Boolean {
   return when {
     y is Double -> ieee754equals(arg0 = x, arg1 = y /*as Double */)
-    true -> false
+    else -> false
   }
 }
 
@@ -25,9 +25,9 @@ fun test6d(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Double
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = x /*as Double */, arg1 = y /*as Double */)
-    true -> false
+    else -> false
   }
 }
 
@@ -50,7 +50,7 @@ fun test4f(x: Float, y: Number): Boolean {
 fun test5f(x: Float, y: Any): Boolean {
   return when {
     y is Float -> ieee754equals(arg0 = x, arg1 = y /*as Float */)
-    true -> false
+    else -> false
   }
 }
 
@@ -58,9 +58,9 @@ fun test6f(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Float
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = x /*as Float */, arg1 = y /*as Float */)
-    true -> false
+    else -> false
   }
 }
 
@@ -68,9 +68,9 @@ fun testFD(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Double
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = x /*as Float */.toDouble(), arg1 = y /*as Double */)
-    true -> false
+    else -> false
   }
 }
 
@@ -78,9 +78,9 @@ fun testDF(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Float
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = x /*as Double */, arg1 = y /*as Float */.toDouble())
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEquals.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEquals.kt.txt
index 9564dd41ed4..0368f516c43 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEquals.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEquals.kt.txt
@@ -17,7 +17,7 @@ fun test4d(x: Double, y: Number): Boolean {
 fun test5d(x: Double, y: Any): Boolean {
   return when {
     y is Double -> x.equals(other = y)
-    true -> false
+    else -> false
   }
 }
 
@@ -25,9 +25,9 @@ fun test6d(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Double
-      true -> false
+      else -> false
     } -> x.equals(other = y)
-    true -> false
+    else -> false
   }
 }
 
@@ -50,7 +50,7 @@ fun test4f(x: Float, y: Number): Boolean {
 fun test5f(x: Float, y: Any): Boolean {
   return when {
     y is Float -> x.equals(other = y)
-    true -> false
+    else -> false
   }
 }
 
@@ -58,9 +58,9 @@ fun test6f(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Float
-      true -> false
+      else -> false
     } -> x.equals(other = y)
-    true -> false
+    else -> false
   }
 }
 
@@ -68,9 +68,9 @@ fun testFD(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Double
-      true -> false
+      else -> false
     } -> x.equals(other = y)
-    true -> false
+    else -> false
   }
 }
 
@@ -78,9 +78,9 @@ fun testDF(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Float
-      true -> false
+      else -> false
     } -> x.equals(other = y)
-    true -> false
+    else -> false
   }
 }
 
@@ -103,14 +103,14 @@ fun Float.test4fr(x: Number): Boolean {
 fun Float.test5fr(x: Any): Boolean {
   return when {
     x is Float -> <this>.equals(other = x)
-    true -> false
+    else -> false
   }
 }
 
 fun Float.test6fr(x: Any): Boolean {
   return when {
     x is Double -> <this>.equals(other = x)
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointExcleq.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointExcleq.kt.txt
index 6cda9b7081f..b83dc17a88c 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointExcleq.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointExcleq.kt.txt
@@ -17,7 +17,7 @@ fun test4d(x: Double, y: Number): Boolean {
 fun test5d(x: Double, y: Any): Boolean {
   return when {
     y is Double -> ieee754equals(arg0 = x, arg1 = y /*as Double */).not()
-    true -> false
+    else -> false
   }
 }
 
@@ -25,9 +25,9 @@ fun test6d(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Double
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = x /*as Double */, arg1 = y /*as Double */).not()
-    true -> false
+    else -> false
   }
 }
 
@@ -50,7 +50,7 @@ fun test4f(x: Float, y: Number): Boolean {
 fun test5f(x: Float, y: Any): Boolean {
   return when {
     y is Float -> ieee754equals(arg0 = x, arg1 = y /*as Float */).not()
-    true -> false
+    else -> false
   }
 }
 
@@ -58,9 +58,9 @@ fun test6f(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Float
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = x /*as Float */, arg1 = y /*as Float */).not()
-    true -> false
+    else -> false
   }
 }
 
@@ -68,9 +68,9 @@ fun testFD(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Double
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = x /*as Float */.toDouble(), arg1 = y /*as Double */).not()
-    true -> false
+    else -> false
   }
 }
 
@@ -78,9 +78,9 @@ fun testDF(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Float
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = x /*as Double */, arg1 = y /*as Float */.toDouble()).not()
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointLess.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointLess.kt.txt
index b070fa875d4..6601494a81c 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointLess.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointLess.kt.txt
@@ -5,7 +5,7 @@ fun test1d(x: Double, y: Double): Boolean {
 fun test2d(x: Double, y: Any): Boolean {
   return when {
     y is Double -> less(arg0 = x, arg1 = y /*as Double */)
-    true -> false
+    else -> false
   }
 }
 
@@ -13,9 +13,9 @@ fun test3d(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Double
-      true -> false
+      else -> false
     } -> less(arg0 = x /*as Double */, arg1 = y /*as Double */)
-    true -> false
+    else -> false
   }
 }
 
@@ -26,7 +26,7 @@ fun test1f(x: Float, y: Float): Boolean {
 fun test2f(x: Float, y: Any): Boolean {
   return when {
     y is Float -> less(arg0 = x, arg1 = y /*as Float */)
-    true -> false
+    else -> false
   }
 }
 
@@ -34,9 +34,9 @@ fun test3f(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Float
-      true -> false
+      else -> false
     } -> less(arg0 = x /*as Float */, arg1 = y /*as Float */)
-    true -> false
+    else -> false
   }
 }
 
@@ -44,9 +44,9 @@ fun testFD(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Float -> y is Double
-      true -> false
+      else -> false
     } -> less(arg0 = x /*as Float */.toDouble(), arg1 = y /*as Double */)
-    true -> false
+    else -> false
   }
 }
 
@@ -54,9 +54,9 @@ fun testDF(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Double -> y is Float
-      true -> false
+      else -> false
     } -> less(arg0 = x /*as Double */, arg1 = y /*as Float */.toDouble())
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.kt.txt
index 38196c6f7df..30e1040f2a5 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.kt.txt
@@ -4,10 +4,10 @@ fun test(x: Any?, y: Double): Boolean {
       val tmp0_safe_receiver: Any? = x
       when {
         EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-        true -> tmp0_safe_receiver /*as Int */.toDouble()
+        else -> tmp0_safe_receiver /*as Int */.toDouble()
       }
     }, arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableFloatingPointEqeq.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableFloatingPointEqeq.kt.txt
index 0fc7eaf8fb0..bf159474337 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableFloatingPointEqeq.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableFloatingPointEqeq.kt.txt
@@ -8,10 +8,10 @@ fun testDF(x: Double?, y: Any?): Boolean {
       val tmp0_safe_receiver: Any? = y
       when {
         EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-        true -> tmp0_safe_receiver /*as Float */.toDouble()
+        else -> tmp0_safe_receiver /*as Float */.toDouble()
       }
     })
-    true -> false
+    else -> false
   }
 }
 
@@ -21,10 +21,10 @@ fun testDI(x: Double?, y: Any?): Boolean {
       val tmp0_safe_receiver: Any? = y
       when {
         EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-        true -> tmp0_safe_receiver /*as Int */.toDouble()
+        else -> tmp0_safe_receiver /*as Int */.toDouble()
       }
     })
-    true -> false
+    else -> false
   }
 }
 
@@ -32,15 +32,15 @@ fun testDI2(x: Any?, y: Any?): Boolean {
   return when {
     when {
       x is Int? -> y is Double
-      true -> false
+      else -> false
     } -> ieee754equals(arg0 = { // BLOCK
       val tmp0_safe_receiver: Any? = x
       when {
         EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-        true -> tmp0_safe_receiver /*as Int */.toDouble()
+        else -> tmp0_safe_receiver /*as Int */.toDouble()
       }
     }, arg1 = y /*as Double? */)
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.kt.txt
index c657962dbf4..ddc7d35451a 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.kt.txt
@@ -1,49 +1,49 @@
 fun <T : Any?> test0(x: Any, y: T): Boolean {
   return when {
     x is Int -> EQEQ(arg0 = x, arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
 fun <T : Float> test1(x: Any, y: T): Boolean {
   return when {
     x is Float -> ieee754equals(arg0 = x /*as Float */, arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
 fun <T : Double> test2(x: Any, y: T): Boolean {
   return when {
     x is Float -> ieee754equals(arg0 = x /*as Float */.toDouble(), arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
 fun <T : Float> test3(x: Any, y: T): Boolean {
   return when {
     x is Int -> ieee754equals(arg0 = x /*as Int */.toFloat(), arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
 fun <T : Float?> test4(x: Any, y: T): Boolean {
   return when {
     x is Int -> ieee754equals(arg0 = x /*as Int */.toFloat(), arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
 fun <T : Float?, R : T> test5(x: Any, y: R): Boolean {
   return when {
     x is Int -> ieee754equals(arg0 = x /*as Int */.toFloat(), arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
 fun <T : Number> test6(x: Any, y: T): Boolean {
   return when {
     x is Int -> EQEQ(arg0 = x, arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
@@ -57,7 +57,7 @@ class F<T : Float> {
   fun testCapturedType(x: T, y: Any): Boolean {
     return when {
       y is Double -> ieee754equals(arg0 = x.toDouble(), arg1 = y /*as Double */)
-      true -> false
+      else -> false
     }
   }
 
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.kt.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.kt.txt
index 9d6bff99c73..841c8610186 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.kt.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.kt.txt
@@ -3,7 +3,7 @@ fun testSimple(x: Double): Int {
     val tmp0_subject: Double = x
     when {
       ieee754equals(arg0 = tmp0_subject, arg1 = 0.0D) -> 0
-      true -> 1
+      else -> 1
     }
   }
 }
@@ -16,7 +16,7 @@ fun testSmartCastInWhenSubject(x: Any): Int {
     val tmp0_subject: Any = x
     when {
       ieee754equals(arg0 = tmp0_subject /*as Double */, arg1 = 0.0D) -> 0
-      true -> 1
+      else -> 1
     }
   }
 }
@@ -29,7 +29,7 @@ fun testSmartCastInWhenCondition(x: Double, y: Any): Int {
     val tmp0_subject: Double = x
     when {
       ieee754equals(arg0 = tmp0_subject, arg1 = y /*as Double */) -> 0
-      true -> 1
+      else -> 1
     }
   }
 }
@@ -40,7 +40,7 @@ fun testSmartCastInWhenConditionInBranch(x: Any): Int {
     when {
       tmp0_subject is Double.not() -> -1
       ieee754equals(arg0 = tmp0_subject /*as Double */, arg1 = 0.0D) -> 0
-      true -> 1
+      else -> 1
     }
   }
 }
@@ -56,7 +56,7 @@ fun testSmartCastToDifferentTypes(x: Any, y: Any): Int {
     val tmp0_subject: Any = x
     when {
       ieee754equals(arg0 = tmp0_subject /*as Double */, arg1 = y /*as Float */.toDouble()) -> 0
-      true -> 1
+      else -> 1
     }
   }
 }
@@ -71,9 +71,9 @@ fun testWithPrematureExitInConditionSubexpression(x: Any): Int {
     when {
       EQEQ(arg0 = tmp0_subject, arg1 = foo(x = when {
         x !is Double -> return 42
-        true -> x /*as Double */
+        else -> x /*as Double */
       })) -> 0
-      true -> 1
+      else -> 1
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/ifElseIf.kt.txt b/compiler/testData/ir/irText/expressions/ifElseIf.kt.txt
index 158a5e08ddc..d150b966d3b 100644
--- a/compiler/testData/ir/irText/expressions/ifElseIf.kt.txt
+++ b/compiler/testData/ir/irText/expressions/ifElseIf.kt.txt
@@ -2,7 +2,7 @@ fun test(i: Int): Int {
   return when {
     greater(arg0 = i, arg1 = 0) -> 1
     less(arg0 = i, arg1 = 0) -> -1
-    true -> 0
+    else -> 0
   }
 }
 
@@ -10,7 +10,7 @@ fun testEmptyBranches1(flag: Boolean) {
   when {
     flag -> { // BLOCK
     }
-    true -> true /*~> Unit */
+    else -> true /*~> Unit */
   }
   when {
     flag -> true /*~> Unit */
@@ -21,11 +21,11 @@ fun testEmptyBranches2(flag: Boolean) {
   when {
     flag -> { // BLOCK
     }
-    true -> true /*~> Unit */
+    else -> true /*~> Unit */
   }
   when {
     flag -> true /*~> Unit */
-    true -> { // BLOCK
+    else -> { // BLOCK
     }
   }
 }
@@ -34,7 +34,7 @@ fun testEmptyBranches3(flag: Boolean) {
   when {
     flag -> { // BLOCK
     }
-    true -> true /*~> Unit */
+    else -> true /*~> Unit */
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/implicitCastToNonNull.kt.txt b/compiler/testData/ir/irText/expressions/implicitCastToNonNull.kt.txt
index 157fc95f689..4b880aec3fc 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastToNonNull.kt.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastToNonNull.kt.txt
@@ -1,28 +1,28 @@
 fun test1(x: String?): Int {
   return when {
     EQEQ(arg0 = x, arg1 = null) -> 0
-    true -> x.<get-length>()
+    else -> x.<get-length>()
   }
 }
 
 fun <T : CharSequence?> test2(x: T): Int {
   return when {
     EQEQ(arg0 = x, arg1 = null) -> 0
-    true -> x.<get-length>()
+    else -> x.<get-length>()
   }
 }
 
 inline fun <reified T : CharSequence?> test3(x: Any): Int {
   return when {
     x !is T -> 0
-    true -> x /*as CharSequence */.<get-length>()
+    else -> x /*as CharSequence */.<get-length>()
   }
 }
 
 inline fun <reified T : CharSequence> test4(x: Any?): Int {
   return when {
     x !is T -> 0
-    true -> x /*as CharSequence */.<get-length>()
+    else -> x /*as CharSequence */.<get-length>()
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt
index f6ce5798ce0..f8967c192e4 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.kt.txt
@@ -1,7 +1,7 @@
 inline fun <reified T : Any> Any.test1(): T? {
   return when {
     <this> is T -> <this> /*as T */
-    true -> null
+    else -> null
   }
 }
 
@@ -13,7 +13,7 @@ val <reified T : Any> Foo<T>.asT: T?
   inline get(): T? {
     return when {
       <this> is T -> <this> /*as T */
-      true -> null
+      else -> null
     }
   }
 
diff --git a/compiler/testData/ir/irText/expressions/jvmFieldWithIntersectionTypes.kt.txt b/compiler/testData/ir/irText/expressions/jvmFieldWithIntersectionTypes.kt.txt
index 4a946701b51..24a50cea1e7 100644
--- a/compiler/testData/ir/irText/expressions/jvmFieldWithIntersectionTypes.kt.txt
+++ b/compiler/testData/ir/irText/expressions/jvmFieldWithIntersectionTypes.kt.txt
@@ -52,7 +52,7 @@ fun test(b: Boolean) {
   val d2: Derived2 = Derived2()
   val k: Any = when {
     b -> d1
-    true -> d2
+    else -> d2
   }
   k /*as JFieldOwner */super.#f = 42
   k /*as JFieldOwner */super.#f /*~> Unit */
@@ -60,7 +60,7 @@ fun test(b: Boolean) {
   val md2: DerivedThroughMid2 = DerivedThroughMid2()
   val mk: Any = when {
     b -> md1
-    true -> md2
+    else -> md2
   }
   mk /*as Mid */super.#f = 44
   mk /*as Mid */super.#f /*~> Unit */
diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt
index 81f61c1123d..f628101e5c1 100644
--- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt
+++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.kt.txt
@@ -20,7 +20,7 @@ class TestClass {
 
   val test: Int
     field = when {
-      true -> { // BLOCK
+      else -> { // BLOCK
         super.#out /*!! PrintStream */.println(p0 = "TestClass/test")
         42
       }
diff --git a/compiler/testData/ir/irText/expressions/kt23030.kt.txt b/compiler/testData/ir/irText/expressions/kt23030.kt.txt
index 9ebfac5f270..29bf0a1e8db 100644
--- a/compiler/testData/ir/irText/expressions/kt23030.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt23030.kt.txt
@@ -10,9 +10,9 @@ fun testOverloadedCompareToCallWithSmartCast(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Int -> y is Char
-      true -> false
+      else -> false
     } -> less(arg0 = x /*as Int */.compareTo(c = y /*as Char */), arg1 = 0)
-    true -> false
+    else -> false
   }
 }
 
@@ -20,9 +20,9 @@ fun testEqualsWithSmartCast(x: Any, y: Any): Boolean {
   return when {
     when {
       x is Int -> y is Char
-      true -> false
+      else -> false
     } -> EQEQ(arg0 = x, arg1 = y)
-    true -> false
+    else -> false
   }
 }
 
@@ -45,9 +45,9 @@ class C {
     return when {
       when {
         x is Int -> y is Char
-        true -> false
+        else -> false
       } -> less(arg0 = (<this>, x /*as Int */).compareTo(c = y /*as Char */), arg1 = 0)
-      true -> false
+      else -> false
     }
   }
 
diff --git a/compiler/testData/ir/irText/expressions/kt27933.kt.txt b/compiler/testData/ir/irText/expressions/kt27933.kt.txt
index 204ef061ef7..c18fd59f564 100644
--- a/compiler/testData/ir/irText/expressions/kt27933.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt27933.kt.txt
@@ -3,7 +3,7 @@ fun box(): String {
   when {
     EQEQ(arg0 = r, arg1 = "").not() -> { // BLOCK
     }
-    true -> r = r.plus(other = "O")
+    else -> r = r.plus(other = "O")
   }
   when {
     EQEQ(arg0 = r, arg1 = "O") -> r = r.plus(other = "K")
diff --git a/compiler/testData/ir/irText/expressions/kt30020.kt.txt b/compiler/testData/ir/irText/expressions/kt30020.kt.txt
index 19777dc7bad..45b5022d227 100644
--- a/compiler/testData/ir/irText/expressions/kt30020.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt30020.kt.txt
@@ -18,14 +18,14 @@ fun test(x: X, nx: X?) {
     val tmp1_safe_receiver: X? = nx
     when {
       EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null
-      true -> tmp1_safe_receiver.<get-xs>()
+      else -> tmp1_safe_receiver.<get-xs>()
     }
   }).plusAssign<Int>(element = 5)
   CHECK_NOT_NULL<MutableList<Any>>(arg0 = { // BLOCK
     val tmp2_safe_receiver: X? = nx
     when {
       EQEQ(arg0 = tmp2_safe_receiver, arg1 = null) -> null
-      true -> tmp2_safe_receiver.f()
+      else -> tmp2_safe_receiver.f()
     }
   }).plusAssign<Int>(element = 6)
 }
diff --git a/compiler/testData/ir/irText/expressions/kt30796.kt.txt b/compiler/testData/ir/irText/expressions/kt30796.kt.txt
index 6e9bd7a3268..e809961e7fc 100644
--- a/compiler/testData/ir/irText/expressions/kt30796.kt.txt
+++ b/compiler/testData/ir/irText/expressions/kt30796.kt.txt
@@ -7,7 +7,7 @@ fun <T : Any?> test(value: T, value2: T) {
     val tmp0_elvis_lhs: T = value
     when {
       EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> 42
-      true -> tmp0_elvis_lhs
+      else -> tmp0_elvis_lhs
     }
   }
   val x2: Any = { // BLOCK
@@ -17,10 +17,10 @@ fun <T : Any?> test(value: T, value2: T) {
         val tmp1_elvis_lhs: T = value2
         when {
           EQEQ(arg0 = tmp1_elvis_lhs, arg1 = null) -> 42
-          true -> tmp1_elvis_lhs
+          else -> tmp1_elvis_lhs
         }
       }
-      true -> tmp2_elvis_lhs
+      else -> tmp2_elvis_lhs
     }
   }
   val x3: Any = { // BLOCK
@@ -28,12 +28,12 @@ fun <T : Any?> test(value: T, value2: T) {
       val tmp3_elvis_lhs: T = value
       when {
         EQEQ(arg0 = tmp3_elvis_lhs, arg1 = null) -> value2
-        true -> tmp3_elvis_lhs
+        else -> tmp3_elvis_lhs
       }
     }
     when {
       EQEQ(arg0 = tmp4_elvis_lhs, arg1 = null) -> 42
-      true -> tmp4_elvis_lhs
+      else -> tmp4_elvis_lhs
     }
   }
   val x4: Any = { // BLOCK
@@ -41,19 +41,19 @@ fun <T : Any?> test(value: T, value2: T) {
       val tmp5_elvis_lhs: T = value
       when {
         EQEQ(arg0 = tmp5_elvis_lhs, arg1 = null) -> value2
-        true -> tmp5_elvis_lhs
+        else -> tmp5_elvis_lhs
       }
     }
     when {
       EQEQ(arg0 = tmp6_elvis_lhs, arg1 = null) -> 42
-      true -> tmp6_elvis_lhs
+      else -> tmp6_elvis_lhs
     }
   }
   val x5: Any = { // BLOCK
     val tmp7_elvis_lhs: Any? = magic<Any?>()
     when {
       EQEQ(arg0 = tmp7_elvis_lhs, arg1 = null) -> 42
-      true -> tmp7_elvis_lhs
+      else -> tmp7_elvis_lhs
     }
   }
   val x6: Any = { // BLOCK
@@ -61,12 +61,12 @@ fun <T : Any?> test(value: T, value2: T) {
       val tmp8_elvis_lhs: T = value
       when {
         EQEQ(arg0 = tmp8_elvis_lhs, arg1 = null) -> magic<Any?>()
-        true -> tmp8_elvis_lhs
+        else -> tmp8_elvis_lhs
       }
     }
     when {
       EQEQ(arg0 = tmp9_elvis_lhs, arg1 = null) -> 42
-      true -> tmp9_elvis_lhs
+      else -> tmp9_elvis_lhs
     }
   }
   val x7: Any = { // BLOCK
@@ -74,12 +74,12 @@ fun <T : Any?> test(value: T, value2: T) {
       val tmp10_elvis_lhs: Any? = magic<Any?>()
       when {
         EQEQ(arg0 = tmp10_elvis_lhs, arg1 = null) -> value
-        true -> tmp10_elvis_lhs
+        else -> tmp10_elvis_lhs
       }
     }
     when {
       EQEQ(arg0 = tmp11_elvis_lhs, arg1 = null) -> 42
-      true -> tmp11_elvis_lhs
+      else -> tmp11_elvis_lhs
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.kt.txt b/compiler/testData/ir/irText/expressions/safeAssignment.kt.txt
index 6b3d127ee76..977e01d3e95 100644
--- a/compiler/testData/ir/irText/expressions/safeAssignment.kt.txt
+++ b/compiler/testData/ir/irText/expressions/safeAssignment.kt.txt
@@ -17,7 +17,7 @@ fun test(nc: C?) {
     val tmp0_safe_receiver: C? = nc
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null /*~> Unit */
-      true -> tmp0_safe_receiver.<set-x>(<set-?> = 42)
+      else -> tmp0_safe_receiver.<set-x>(<set-?> = 42)
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt.txt
index 59e8d49b038..f81fdecee93 100644
--- a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt.txt
+++ b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.kt.txt
@@ -21,7 +21,7 @@ operator fun Int?.inc(): Int? {
     val tmp0_safe_receiver: Int? = <this>
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.inc()
+      else -> tmp0_safe_receiver.inc()
     }
   }
 }
@@ -38,7 +38,7 @@ fun testProperty(nc: C?) {
     val tmp0_safe_receiver: C? = nc
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> { // BLOCK
+      else -> { // BLOCK
         val tmp1_receiver: C? = tmp0_safe_receiver
         { // BLOCK
           val tmp2: Int = tmp1_receiver.<get-p>()
@@ -56,7 +56,7 @@ fun testArrayAccess(nc: C?) {
       val tmp0_safe_receiver: C? = nc
       when {
         EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-        true -> tmp0_safe_receiver.<get-p>()
+        else -> tmp0_safe_receiver.<get-p>()
       }
     }
     val tmp2_index0: Int = 0
diff --git a/compiler/testData/ir/irText/expressions/safeCalls.kt.txt b/compiler/testData/ir/irText/expressions/safeCalls.kt.txt
index e67d66ff909..86f5c5056a4 100644
--- a/compiler/testData/ir/irText/expressions/safeCalls.kt.txt
+++ b/compiler/testData/ir/irText/expressions/safeCalls.kt.txt
@@ -24,7 +24,7 @@ fun test1(x: String?): Int? {
     val tmp0_safe_receiver: String? = x
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.<get-length>()
+      else -> tmp0_safe_receiver.<get-length>()
     }
   }
 }
@@ -34,7 +34,7 @@ fun test2(x: String?): Int? {
     val tmp0_safe_receiver: String? = x
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.hashCode()
+      else -> tmp0_safe_receiver.hashCode()
     }
   }
 }
@@ -44,7 +44,7 @@ fun test3(x: String?, y: Any?): Boolean? {
     val tmp0_safe_receiver: String? = x
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.equals(other = y)
+      else -> tmp0_safe_receiver.equals(other = y)
     }
   }
 }
@@ -54,7 +54,7 @@ fun test4(x: Ref?) {
     val tmp0_safe_receiver: Ref? = x
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null /*~> Unit */
-      true -> tmp0_safe_receiver.<set-value>(<set-?> = 0)
+      else -> tmp0_safe_receiver.<set-value>(<set-?> = 0)
     }
   }
 }
@@ -64,7 +64,7 @@ fun IHost.test5(s: String?): Int? {
     val tmp0_safe_receiver: String? = s
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> (<this>, tmp0_safe_receiver).extLength()
+      else -> (<this>, tmp0_safe_receiver).extLength()
     }
   }
 }
@@ -78,7 +78,7 @@ fun box() {
     val tmp0_safe_receiver: Int = 42
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.foo()
+      else -> tmp0_safe_receiver.foo()
     }
   } /*~> Unit */
 }
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversions.kt.txt b/compiler/testData/ir/irText/expressions/sam/samConversions.kt.txt
index 33f0a80faa8..6cb66288544 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversions.kt.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversions.kt.txt
@@ -24,7 +24,7 @@ fun J.test3(a: Function0<Unit>) {
 fun J.test4(a: Function0<Unit>, b: Function0<Unit>, flag: Boolean) {
   <this>.runIt(r = when {
     flag -> a
-    true -> b
+    else -> b
   } /*-> @FlexibleNullability Runnable? */)
 }
 
diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
index fabba3bae2c..42dcdab5985 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.kt.txt
@@ -17,7 +17,7 @@ enum class En : Enum<En> {
     val tmp0_safe_receiver: Any? = <get-n>()
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.toString()
+      else -> tmp0_safe_receiver.toString()
     }
   })
 
diff --git a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.kt.txt b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.kt.txt
index dd324538d32..47ad087b450 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.kt.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.kt.txt
@@ -13,7 +13,7 @@ class C {
       val tmp0_safe_receiver: Any? = x
       when {
         EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-        true -> tmp0_safe_receiver.toString()
+        else -> tmp0_safe_receiver.toString()
       }
     }
   }
diff --git a/compiler/testData/ir/irText/expressions/typeArguments.kt.txt b/compiler/testData/ir/irText/expressions/typeArguments.kt.txt
index 511e07ec7d5..7f0ca45762e 100644
--- a/compiler/testData/ir/irText/expressions/typeArguments.kt.txt
+++ b/compiler/testData/ir/irText/expressions/typeArguments.kt.txt
@@ -1,7 +1,7 @@
 fun test1(x: Any): Boolean {
   return when {
     x is Array<*> -> x /*as Array<*> */.isArrayOf<String>()
-    true -> false
+    else -> false
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.kt.txt b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.kt.txt
index c9ad7813e14..84796b744e3 100644
--- a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.kt.txt
+++ b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.kt.txt
@@ -23,12 +23,12 @@ fun test4(ns: String?): String? {
       val tmp0_safe_receiver: String? = ns
       when {
         EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-        true -> tmp0_safe_receiver.k()
+        else -> tmp0_safe_receiver.k()
       }
     }
     when {
       EQEQ(arg0 = tmp1_safe_receiver, arg1 = null) -> null
-      true -> tmp1_safe_receiver.invoke()
+      else -> tmp1_safe_receiver.invoke()
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/when.kt.txt b/compiler/testData/ir/irText/expressions/when.kt.txt
index 7b15755d586..d3392b1d9a7 100644
--- a/compiler/testData/ir/irText/expressions/when.kt.txt
+++ b/compiler/testData/ir/irText/expressions/when.kt.txt
@@ -16,7 +16,7 @@ fun testWithSubject(x: Any?): String {
       tmp0_subject is String -> "String"
       tmp0_subject is Number.not() -> "!Number"
       setOf<Nothing>().contains<Number>(element = tmp0_subject /*as Number */) -> "nothingness?"
-      true -> "something"
+      else -> "something"
     }
   }
 }
@@ -28,7 +28,7 @@ fun test(x: Any?): String {
     x is String -> "String"
     x !is Number -> "!Number"
     setOf<Nothing>().contains<Number>(element = x /*as Number */) -> "nothingness?"
-    true -> "something"
+    else -> "something"
   }
 }
 
@@ -40,24 +40,24 @@ fun testComma(x: Int): String {
         when {
           when {
             EQEQ(arg0 = tmp0_subject, arg1 = 1) -> true
-            true -> EQEQ(arg0 = tmp0_subject, arg1 = 2)
+            else -> EQEQ(arg0 = tmp0_subject, arg1 = 2)
           } -> true
-          true -> EQEQ(arg0 = tmp0_subject, arg1 = 3)
+          else -> EQEQ(arg0 = tmp0_subject, arg1 = 3)
         } -> true
-        true -> EQEQ(arg0 = tmp0_subject, arg1 = 4)
+        else -> EQEQ(arg0 = tmp0_subject, arg1 = 4)
       } -> "1234"
       when {
         when {
           EQEQ(arg0 = tmp0_subject, arg1 = 5) -> true
-          true -> EQEQ(arg0 = tmp0_subject, arg1 = 6)
+          else -> EQEQ(arg0 = tmp0_subject, arg1 = 6)
         } -> true
-        true -> EQEQ(arg0 = tmp0_subject, arg1 = 7)
+        else -> EQEQ(arg0 = tmp0_subject, arg1 = 7)
       } -> "567"
       when {
         EQEQ(arg0 = tmp0_subject, arg1 = 8) -> true
-        true -> EQEQ(arg0 = tmp0_subject, arg1 = 9)
+        else -> EQEQ(arg0 = tmp0_subject, arg1 = 9)
       } -> "89"
-      true -> "?"
+      else -> "?"
     }
   }
 }
diff --git a/compiler/testData/ir/irText/expressions/whenElse.kt.txt b/compiler/testData/ir/irText/expressions/whenElse.kt.txt
index 75b6657e3a1..2d37664c6e7 100644
--- a/compiler/testData/ir/irText/expressions/whenElse.kt.txt
+++ b/compiler/testData/ir/irText/expressions/whenElse.kt.txt
@@ -1,6 +1,6 @@
 fun test(): Int {
   return when {
-    true -> 42
+    else -> 42
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/whenReturn.kt.txt b/compiler/testData/ir/irText/expressions/whenReturn.kt.txt
index aeb3926d9f1..f3bd619b616 100644
--- a/compiler/testData/ir/irText/expressions/whenReturn.kt.txt
+++ b/compiler/testData/ir/irText/expressions/whenReturn.kt.txt
@@ -6,7 +6,7 @@ fun toString(grade: String): String {
       EQEQ(arg0 = tmp0_subject, arg1 = "B") -> return "Good"
       EQEQ(arg0 = tmp0_subject, arg1 = "C") -> return "Mediocre"
       EQEQ(arg0 = tmp0_subject, arg1 = "D") -> return "Fair"
-      true -> return "Failure"
+      else -> return "Failure"
     }
   }
   return "???"
diff --git a/compiler/testData/ir/irText/expressions/whenUnusedExpression.kt.txt b/compiler/testData/ir/irText/expressions/whenUnusedExpression.kt.txt
index baed6e41583..99c28cbe7b8 100644
--- a/compiler/testData/ir/irText/expressions/whenUnusedExpression.kt.txt
+++ b/compiler/testData/ir/irText/expressions/whenUnusedExpression.kt.txt
@@ -5,11 +5,11 @@ fun test(b: Boolean, i: Int) {
         val tmp0_subject: Int = i
         when {
           EQEQ(arg0 = tmp0_subject, arg1 = 0) -> 1 /*~> Unit */
-          true -> null /*~> Unit */
+          else -> null /*~> Unit */
         }
       }
     }
-    true -> null /*~> Unit */
+    else -> null /*~> Unit */
   }
 }
 
diff --git a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.kt.txt b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.kt.txt
index 5fe9c6b4c04..e90762d567f 100644
--- a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.kt.txt
+++ b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.kt.txt
@@ -11,7 +11,7 @@ fun test(): Int {
       y is Int.not() -> 2
       0.rangeTo(other = 10).contains(value = y /*as Int */) -> 3
       10.rangeTo(other = 20).contains(value = y /*as Int */).not() -> 4
-      true -> -1
+      else -> -1
     }
   }
 }
diff --git a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt
index 4c527857596..e2ca1094cfc 100644
--- a/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/ClashResolutionDescriptor.kt.txt
@@ -54,7 +54,7 @@ fun resolveClashesIfAny(container: ComponentContainer, clashResolvers: List<Plat
           val tmp1_elvis_lhs: Collection<ComponentDescriptor>? = <get-registrationMap>().get(key = resolver.<get-applicableTo>()) as? Collection<ComponentDescriptor>
           when {
             EQEQ(arg0 = tmp1_elvis_lhs, arg1 = null) -> continue
-            true -> tmp1_elvis_lhs
+            else -> tmp1_elvis_lhs
           }
         }
         val substituteDescriptor: ClashResolutionDescriptor<out PlatformSpecificExtension<out PlatformSpecificExtension<out PlatformSpecificExtension<out PlatformSpecificExtension<out PlatformSpecificExtension<out Any?>>>>>> = ClashResolutionDescriptor<PlatformSpecificExtension<out PlatformSpecificExtension<out PlatformSpecificExtension<out PlatformSpecificExtension<out PlatformSpecificExtension<out Any?>>>>>>(container = container, resolver = resolver, clashedComponents = clashedComponents.toList<ComponentDescriptor>())
diff --git a/compiler/testData/ir/irText/firProblems/MultiList.kt.txt b/compiler/testData/ir/irText/firProblems/MultiList.kt.txt
index 8b9a49c5e4a..0995fcd89eb 100644
--- a/compiler/testData/ir/irText/firProblems/MultiList.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/MultiList.kt.txt
@@ -24,7 +24,7 @@ data class Some<T : Any?> {
   override fun hashCode(): Int {
     return when {
       EQEQ(arg0 = <this>.#value, arg1 = null) -> 0
-      true -> <this>.#value.hashCode()
+      else -> <this>.#value.hashCode()
     }
   }
 
diff --git a/compiler/testData/ir/irText/firProblems/candidateSymbol.kt.txt b/compiler/testData/ir/irText/firProblems/candidateSymbol.kt.txt
index 363ca14617e..ac8ba29aefe 100644
--- a/compiler/testData/ir/irText/firProblems/candidateSymbol.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/candidateSymbol.kt.txt
@@ -45,7 +45,7 @@ fun foo(candidate: Candidate) {
   when {
     when {
       me is FirCallableMemberDeclaration<*> -> EQEQ(arg0 = me /*as FirCallableMemberDeclaration<out FirCallableMemberDeclaration<*>> */.<get-symbol>(), arg1 = null).not()
-      true -> false
+      else -> false
     } -> { // BLOCK
     }
   }
diff --git a/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt.txt b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt.txt
index 2fcb66f1e9a..c43634f4f08 100644
--- a/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt.txt
+++ b/compiler/testData/ir/irText/firProblems/coercionToUnitForNestedWhen.kt.txt
@@ -10,7 +10,7 @@ private fun Reader.nextChar(): Char? {
 )
     when {
       EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-      true -> tmp0_safe_receiver.toChar()
+      else -> tmp0_safe_receiver.toChar()
     }
   }
 }
@@ -19,20 +19,20 @@ fun Reader.consumeRestOfQuotedSequence(sb: StringBuilder, quote: Char) {
   var ch: Char? = <this>.nextChar()
   while (when {
     EQEQ(arg0 = ch, arg1 = null).not() -> EQEQ(arg0 = ch, arg1 = quote).not()
-    true -> false
+    else -> false
   }) { // BLOCK
     when {
       EQEQ(arg0 = ch, arg1 = <get-BACKSLASH>()) -> { // BLOCK
         val tmp0_safe_receiver: Char? = <this>.nextChar()
         when {
           EQEQ(arg0 = tmp0_safe_receiver, arg1 = null) -> null
-          true -> tmp0_safe_receiver.let<Char, @FlexibleNullability StringBuilder?>(block = local fun <anonymous>(it: Char): @FlexibleNullability StringBuilder? {
+          else -> tmp0_safe_receiver.let<Char, @FlexibleNullability StringBuilder?>(block = local fun <anonymous>(it: Char): @FlexibleNullability StringBuilder? {
             return sb.append(p0 = it)
           }
 )
         }
       } /*~> Unit */
-      true -> sb.append(p0 = ch) /*~> Unit */
+      else -> sb.append(p0 = ch) /*~> Unit */
     }
     ch = <this>.nextChar()
   }
diff --git a/compiler/testData/ir/irText/regressions/kt24114.kt.txt b/compiler/testData/ir/irText/regressions/kt24114.kt.txt
index 7215c3bba53..5635fdb1e83 100644
--- a/compiler/testData/ir/irText/regressions/kt24114.kt.txt
+++ b/compiler/testData/ir/irText/regressions/kt24114.kt.txt
@@ -19,7 +19,7 @@ fun test1(): Int {
             }
           }
         }
-        true -> return 3
+        else -> return 3
       }
     }
   }
@@ -36,7 +36,7 @@ fun test2(): Int {
             EQEQ(arg0 = tmp1_subject, arg1 = 2) -> return 2
           }
         }
-        true -> return 3
+        else -> return 3
       }
     }
   }
diff --git a/compiler/testData/ir/irText/stubs/builtinMap.kt.txt b/compiler/testData/ir/irText/stubs/builtinMap.kt.txt
index d21232d237c..1d81be4db90 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap.kt.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap.kt.txt
@@ -1,7 +1,7 @@
 fun <K1 : Any?, V1 : Any?> Map<out K1, V1>.plus(pair: Pair<K1, V1>): Map<K1, V1> {
   return when {
     <this>.isEmpty() -> mapOf<K1, V1>(pair = pair)
-    true -> LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>(p0 = <this>).apply<LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>>(block = local fun LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>.<anonymous>() {
+    else -> LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>(p0 = <this>).apply<LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>>(block = local fun LinkedHashMap<@FlexibleNullability K1?, @FlexibleNullability V1?>.<anonymous>() {
       <this>.put(key = pair.<get-first>(), value = pair.<get-second>()) /*~> Unit */
     }
 )
diff --git a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
index 2b7ad916436..c48ec96ef9d 100644
--- a/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
+++ b/compiler/testData/ir/irText/types/castsInsideCoroutineInference.kt.txt
@@ -42,7 +42,7 @@ private fun CoroutineScope.asFairChannel(flow: Flow<*>): ReceiveChannel<Any> {
         val tmp0_elvis_lhs: Any? = value
         when {
           EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> Any()
-          true -> tmp0_elvis_lhs
+          else -> tmp0_elvis_lhs
         }
       })
     }
@@ -58,7 +58,7 @@ private fun CoroutineScope.asChannel(flow: Flow<*>): ReceiveChannel<Any> {
         val tmp0_elvis_lhs: Any? = value
         when {
           EQEQ(arg0 = tmp0_elvis_lhs, arg1 = null) -> Any()
-          true -> tmp0_elvis_lhs
+          else -> tmp0_elvis_lhs
         }
       })
     }
diff --git a/compiler/testData/ir/irText/types/intersectionType2_NI.kt.txt b/compiler/testData/ir/irText/types/intersectionType2_NI.kt.txt
index e44bd275323..ef0b70b239e 100644
--- a/compiler/testData/ir/irText/types/intersectionType2_NI.kt.txt
+++ b/compiler/testData/ir/irText/types/intersectionType2_NI.kt.txt
@@ -34,7 +34,7 @@ fun foo(): Any {
     val nn: C = C()
     val c: Any = when {
       true -> mm
-      true -> nn
+      else -> nn
     }
     return c
   }
diff --git a/compiler/testData/ir/irText/types/intersectionType2_OI.kt.txt b/compiler/testData/ir/irText/types/intersectionType2_OI.kt.txt
index e44bd275323..ef0b70b239e 100644
--- a/compiler/testData/ir/irText/types/intersectionType2_OI.kt.txt
+++ b/compiler/testData/ir/irText/types/intersectionType2_OI.kt.txt
@@ -34,7 +34,7 @@ fun foo(): Any {
     val nn: C = C()
     val c: Any = when {
       true -> mm
-      true -> nn
+      else -> nn
     }
     return c
   }
diff --git a/compiler/testData/ir/irText/types/receiverOfIntersectionType.kt.txt b/compiler/testData/ir/irText/types/receiverOfIntersectionType.kt.txt
index 708f55b2d71..b06d2f8d4d4 100644
--- a/compiler/testData/ir/irText/types/receiverOfIntersectionType.kt.txt
+++ b/compiler/testData/ir/irText/types/receiverOfIntersectionType.kt.txt
@@ -38,7 +38,7 @@ class B : I, J {
 fun testIntersection(a: A, b: B) {
   val v: K = when {
     true -> a
-    true -> b
+    else -> b
   }
   v /*as I */.ff()
 }
@@ -46,7 +46,7 @@ fun testIntersection(a: A, b: B) {
 fun testFlexible1() {
   val v: @FlexibleNullability K? = when {
     true -> a()
-    true -> b()
+    else -> b()
   }
   v /*!! K */ /*as I */.ff()
 }
@@ -54,7 +54,7 @@ fun testFlexible1() {
 fun testFlexible2(a: A, b: B) {
   val v: @FlexibleNullability K? = when {
     true -> id<@FlexibleNullability A?>(x = a)
-    true -> id<@FlexibleNullability B?>(x = b)
+    else -> id<@FlexibleNullability B?>(x = b)
   }
   v /*!! K */ /*as I */.ff()
 }
diff --git a/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt.txt b/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt.txt
index a0a86581088..2d41ef13f73 100644
--- a/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt.txt
+++ b/compiler/testData/ir/irText/types/smartCastOnFakeOverrideReceiver.kt.txt
@@ -16,14 +16,14 @@ open class A {
   fun testA1(x: Any): Int? {
     return when {
       x is B -> x /*as B */.f()
-      true -> null
+      else -> null
     }
   }
 
   fun testA2(x: Any): Int? {
     return when {
       x is B -> x /*as B */.<get-aVal>()
-      true -> null
+      else -> null
     }
   }
 
@@ -39,14 +39,14 @@ class B : A {
   fun testB1(x: Any): Int? {
     return when {
       x is B -> x /*as B */.f()
-      true -> null
+      else -> null
     }
   }
 
   fun testB2(x: Any): Int? {
     return when {
       x is B -> x /*as B */.<get-aVal>()
-      true -> null
+      else -> null
     }
   }