diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ClassOrTypeAliasTypeCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ClassOrTypeAliasTypeCommonizer.kt
index f9563f81a71..a76f542cb1a 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ClassOrTypeAliasTypeCommonizer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/core/ClassOrTypeAliasTypeCommonizer.kt
@@ -197,7 +197,7 @@ internal class ClassOrTypeAliasTypeCommonizer(
         }
 
         val commonId = types.singleDistinctValueOrNull {
-            classifiers.commonClassifierIdResolver.findCommonId(it.classifierId)
+            classifiers.commonClassifierIdResolver.resolveId(it.classifierId)
         } ?: return null
 
         val typeSubstitutionCandidates = resolveTypeSubstitutionCandidates(classifiers, commonId, types)
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirCommonClassifierIdResolver.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirCommonClassifierIdResolver.kt
index 81477c41a28..365ec9a262b 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirCommonClassifierIdResolver.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirCommonClassifierIdResolver.kt
@@ -23,7 +23,7 @@ internal fun CirCommonClassifierIdResolver(
 }
 
 interface CirCommonClassifierIdResolver {
-    fun findCommonId(id: CirEntityId): CirCommonClassifierId?
+    fun resolveId(id: CirEntityId): CirCommonClassifierId?
 }
 
 internal interface CirCommonClassifierIdResolverCache {
@@ -63,12 +63,9 @@ private class CirCommonClassifierIdResolverImpl(
     private val cache: CirCommonClassifierIdResolverCache
 ) : CirCommonClassifierIdResolver {
 
-    override fun findCommonId(id: CirEntityId): CirCommonClassifierId? {
+    override fun resolveId(id: CirEntityId): CirCommonClassifierId? {
         cache[id]?.let { return it }
-        return doFindCommonId(id)
-    }
 
-    private fun doFindCommonId(id: CirEntityId): CirCommonClassifierId? {
         val results = ArrayList<CirEntityId>()
 
         /* Set of every classifier id that once was enqueued already */
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeSignature.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeSignature.kt
index 747a8775a83..53cac2b8542 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeSignature.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeSignature.kt
@@ -62,9 +62,9 @@ internal sealed interface ClassifierSignatureBuildingContext {
         override fun appendSignature(signature: CirTypeSignature, classifierId: CirEntityId) = signature.add(classifierId)
     }
 
-    class TypeAliasInvariant(private val commonIdResolver: CirCommonClassifierIdResolver) : ClassifierSignatureBuildingContext {
+    class TypeAliasInvariant(private val commonClassifierIdResolver: CirCommonClassifierIdResolver) : ClassifierSignatureBuildingContext {
         override fun appendSignature(signature: CirTypeSignature, classifierId: CirEntityId) {
-            return signature.add(commonIdResolver.findCommonId(classifierId) ?: classifierId)
+            return signature.add(commonClassifierIdResolver.resolveId(classifierId) ?: classifierId)
         }
     }
 }
@@ -99,7 +99,7 @@ internal sealed interface ArgumentsSignatureBuildingContext {
     /**
      * Won't render any type arguments
      */
-    object Skip : ArgumentsSignatureBuildingContext {
+    object SkipArguments : ArgumentsSignatureBuildingContext {
         override fun appendSignature(
             signature: CirTypeSignature, context: SignatureBuildingContext, arguments: List<CirTypeProjection>
         ) = Unit
@@ -124,7 +124,6 @@ private enum class TypeSignatureElements(val stringRepresentation: String) {
     }
 }
 
-
 internal fun buildApproximationSignature(context: SignatureBuildingContext, type: CirType): CirTypeSignature {
     val signature = CirTypeSignature()
     signature.appendTypeApproximationSignature(context, type)
diff --git a/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/ReApproximationCirNodeTransformer.kt b/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/ReApproximationCirNodeTransformer.kt
index 54524912133..0021534e4a3 100644
--- a/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/ReApproximationCirNodeTransformer.kt
+++ b/native/commonizer/src/org/jetbrains/kotlin/commonizer/transformer/ReApproximationCirNodeTransformer.kt
@@ -28,7 +28,7 @@ internal class ReApproximationCirNodeTransformer(
                 memberContext = member, functionOrPropertyOrConstructor = functionOrPropertyOrConstructor,
                 classifierSignatureBuildingContext = if (typeAliasInvariant) TypeAliasInvariant(classifiers.commonClassifierIdResolver)
                 else ClassifierSignatureBuildingContext.Default,
-                argumentsSignatureBuildingContext = if (skipArguments) ArgumentsSignatureBuildingContext.Skip
+                argumentsSignatureBuildingContext = if (skipArguments) ArgumentsSignatureBuildingContext.SkipArguments
                 else ArgumentsSignatureBuildingContext.Default
             )
         }
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CirCommonClassifierIdResolverTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CirCommonClassifierIdResolverTest.kt
index 0e063e12f6c..5e24aea70af 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CirCommonClassifierIdResolverTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/CirCommonClassifierIdResolverTest.kt
@@ -360,5 +360,5 @@ private fun createCommonClassifierIdResolver(
 }
 
 private fun CirCommonClassifierIdResolver.findCommonId(id: String): Set<String> =
-    findCommonId(CirEntityId.create(id))?.aliases.orEmpty().map { it.toQualifiedNameString() }.toSet()
+    resolveId(CirEntityId.create(id))?.aliases.orEmpty().map { it.toQualifiedNameString() }.toSet()