diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
index d804f9720e0..3ebd612d69b 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/descriptor/DescriptorMangleComputer.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.common.serialization.mangle.descriptor
 import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComputer
 import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleConstant
 import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode
-import org.jetbrains.kotlin.backend.common.serialization.mangle.collect
+import org.jetbrains.kotlin.backend.common.serialization.mangle.collectForMangler
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.types.typeUtil.isUnit
@@ -115,12 +115,12 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
             mangleExtensionReceiverParameter(builder, it)
         }
 
-        valueParameters.collect(builder, MangleConstant.VALUE_PARAMETERS) {
+        valueParameters.collectForMangler(builder, MangleConstant.VALUE_PARAMETERS) {
             appendSignature(specialValueParamPrefix(it))
             mangleValueParameter(this, it)
         }
         realTypeParameterContainer.typeParameters.filter { it.containingDeclaration == realTypeParameterContainer }
-            .collect(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
+            .collectForMangler(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
 
         returnType?.run {
             if (!isCtor && !isUnit() && addReturnType()) {
@@ -148,7 +148,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
         tpBuilder.appendSignature(param.index)
         tpBuilder.appendSignature(MangleConstant.UPPER_BOUND_SEPARATOR)
 
-        param.upperBounds.collect(tpBuilder, MangleConstant.UPPER_BOUNDS) { mangleType(this, it) }
+        param.upperBounds.collectForMangler(tpBuilder, MangleConstant.UPPER_BOUNDS) { mangleType(this, it) }
     }
 
     private fun mangleType(tBuilder: StringBuilder, wtype: KotlinType) {
@@ -173,7 +173,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
                 }
 
                 type.arguments.ifNotEmpty {
-                    collect(tBuilder, MangleConstant.TYPE_ARGUMENTS) { arg ->
+                    collectForMangler(tBuilder, MangleConstant.TYPE_ARGUMENTS) { arg ->
                         if (arg.isStarProjection) {
                             appendSignature(MangleConstant.STAR_MARK)
                         } else {
@@ -268,7 +268,7 @@ abstract class DescriptorMangleComputer(protected val builder: StringBuilder, pr
             mangleExtensionReceiverParameter(builder, extensionReceiver)
         }
 
-        descriptor.typeParameters.collect(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
+        descriptor.typeParameters.collectForMangler(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
 
         builder.append(descriptor.name.asString())
 
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
index 6a1710febe4..eaf68a0ae90 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/ir/IrMangleComputer.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.backend.common.serialization.mangle.ir
 import org.jetbrains.kotlin.backend.common.serialization.mangle.KotlinMangleComputer
 import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleConstant
 import org.jetbrains.kotlin.backend.common.serialization.mangle.MangleMode
-import org.jetbrains.kotlin.backend.common.serialization.mangle.collect
+import org.jetbrains.kotlin.backend.common.serialization.mangle.collectForMangler
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
@@ -110,11 +110,11 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
             mangleValueParameter(builder, it)
         }
 
-        valueParameters.collect(builder, MangleConstant.VALUE_PARAMETERS) {
+        valueParameters.collectForMangler(builder, MangleConstant.VALUE_PARAMETERS) {
             appendSignature(specialValueParamPrefix(it))
             mangleValueParameter(this, it)
         }
-        typeParameters.collect(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
+        typeParameters.collectForMangler(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
 
         if (!isCtor && !returnType.isUnit() && addReturnType()) {
             mangleType(builder, returnType)
@@ -137,7 +137,7 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
         tpBuilder.appendSignature(param.index)
         tpBuilder.appendSignature(MangleConstant.UPPER_BOUND_SEPARATOR)
 
-        param.superTypes.collect(tpBuilder, MangleConstant.UPPER_BOUNDS) { mangleType(this, it) }
+        param.superTypes.collectForMangler(tpBuilder, MangleConstant.UPPER_BOUNDS) { mangleType(this, it) }
     }
 
     private fun StringBuilder.mangleTypeParameterReference(typeParameter: IrTypeParameter) {
@@ -159,7 +159,7 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
                 }
 
                 type.arguments.ifNotEmpty {
-                    collect(tBuilder, MangleConstant.TYPE_ARGUMENTS) { arg ->
+                    collectForMangler(tBuilder, MangleConstant.TYPE_ARGUMENTS) { arg ->
                         when (arg) {
                             is IrStarProjection -> appendSignature(MangleConstant.STAR_MARK)
                             is IrTypeProjection -> {
@@ -217,7 +217,7 @@ abstract class IrMangleComputer(protected val builder: StringBuilder, private va
 
         val typeParameters = accessor.typeParameters
 
-        typeParameters.collect(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
+        typeParameters.collectForMangler(builder, MangleConstant.TYPE_PARAMETERS) { mangleTypeParameter(this, it) }
 
         builder.append(declaration.name.asString())
     }
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/mangleUtils.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/mangleUtils.kt
index b38b7b00c8d..2ec132b7ebb 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/mangleUtils.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/mangle/mangleUtils.kt
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.backend.common.serialization.mangle
 
 import org.jetbrains.kotlin.name.FqName
 
-internal fun <T> Collection<T>.collect(builder: StringBuilder, params: MangleConstant, collect: StringBuilder.(T) -> Unit) {
+fun <T> Collection<T>.collectForMangler(builder: StringBuilder, params: MangleConstant, collect: StringBuilder.(T) -> Unit) {
     var first = true
 
     builder.append(params.prefix)