diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
index 4baac78a3d4..3c0f8c33ff5 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
@@ -444,8 +444,8 @@ object ArrayOps : TemplateGroupBase() {
     }
 
     val f_toPrimitiveArray = fn("toPrimitiveArray()") {
-        include(ArraysOfObjects, PrimitiveType.values().toSet())
-        include(Collections, PrimitiveType.values().toSet())
+        include(ArraysOfObjects, PrimitiveType.entries.toSet())
+        include(Collections, PrimitiveType.entries.toSet())
     } builder {
         val primitive = checkNotNull(primitive)
         val arrayType = primitive.name + "Array"
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt
index 36b7b80a0c3..a720a88cc5d 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/CommonTypes.kt
@@ -59,7 +59,7 @@ enum class PrimitiveType {
 
     companion object {
         val unsignedPrimitives = setOf(UInt, ULong, UByte, UShort)
-        val defaultPrimitives = PrimitiveType.values().toSet() - unsignedPrimitives
+        val defaultPrimitives = PrimitiveType.entries.toSet() - unsignedPrimitives
         val numericPrimitives = setOf(Int, Long, Byte, Short, Double, Float)
         val integralPrimitives = setOf(Int, Long, Byte, Short, Char)
         val floatingPointPrimitives = setOf(Double, Float)
@@ -124,10 +124,6 @@ enum class KotlinTarget(val platform: Platform, val backend: Backend) {
     Native(Platform.Native, Backend.IR);
 
     val fullName get() = "Kotlin/$name"
-
-    companion object {
-        val values = KotlinTarget.values().toList()
-    }
 }
 
 enum class SequenceClass {
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt
index 1e5467911b6..bfd7e3eca8e 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Templates.kt
@@ -53,7 +53,7 @@ interface MemberTemplate {
     /** Specifies which platforms this member template should be generated for */
     fun platforms(vararg platforms: Platform)
 
-    fun instantiate(targets: Collection<KotlinTarget> = KotlinTarget.values): Sequence<MemberBuilder>
+    fun instantiate(targets: Collection<KotlinTarget> = KotlinTarget.entries): Sequence<MemberBuilder>
 
     /** Registers parameterless member builder function */
     fun builder(b: MemberBuildAction)
@@ -78,7 +78,7 @@ abstract class MemberTemplateDefinition<TParam> : MemberTemplate {
 
     private val buildActions = mutableListOf<BuildAction>()
 
-    private var allowedPlatforms = setOf(*Platform.values())
+    private var allowedPlatforms = Platform.entries.toSet()
     override fun platforms(vararg platforms: Platform) {
         allowedPlatforms = setOf(*platforms)
     }