diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10AnalysisSession.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10AnalysisSession.kt
index 0a889c09898..8afe8cec903 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10AnalysisSession.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10AnalysisSession.kt
@@ -56,7 +56,7 @@ class KtFe10AnalysisSession(
     override val symbolInfoProviderImpl: KtSymbolInfoProvider = KtFe10SymbolInfoProvider(this)
     override val analysisScopeProviderImpl: KtAnalysisScopeProvider = KtAnalysisScopeProviderImpl(this, token)
     override val referenceResolveProviderImpl: KtReferenceResolveProvider = KtFe10ReferenceResolveProvider(this)
-    override val substitutionProviderImpl: KtSignatureSubsitutor = KtFe10SignatureSubsitutor(this)
+    override val signatureSubstitutorImpl: KtSignatureSubstitutor = KtFe10SignatureSubstitutor(this)
     override val scopeSubstitutionImpl: KtScopeSubstitution = KtFe10ScopeSubstitution(this)
     override val substitutorFactoryImpl: KtSubstitutorFactory = KtFe10SubstitutorFactory(this)
 
diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SignatureSubsitutor.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SignatureSubstitutor.kt
similarity index 79%
rename from analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SignatureSubsitutor.kt
rename to analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SignatureSubstitutor.kt
index bbb4532dc40..5aa29770071 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SignatureSubsitutor.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SignatureSubstitutor.kt
@@ -7,8 +7,8 @@ package org.jetbrains.kotlin.analysis.api.descriptors.components
 
 import org.jetbrains.kotlin.analysis.api.descriptors.KtFe10AnalysisSession
 import org.jetbrains.kotlin.analysis.api.descriptors.components.base.Fe10KtAnalysisSessionComponent
-import org.jetbrains.kotlin.analysis.api.impl.base.components.AbstractKtSignatureSubsitutorImpl
+import org.jetbrains.kotlin.analysis.api.impl.base.components.AbstractKtSignatureSubstitutorImpl
 
-internal class KtFe10SignatureSubsitutor(
+internal class KtFe10SignatureSubstitutor(
     override val analysisSession: KtFe10AnalysisSession
-) : AbstractKtSignatureSubsitutorImpl(), Fe10KtAnalysisSessionComponent
\ No newline at end of file
+) : AbstractKtSignatureSubstitutorImpl(), Fe10KtAnalysisSessionComponent
\ No newline at end of file
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt
index 875a5208059..9663fd034bc 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/KtFirAnalysisSession.kt
@@ -103,7 +103,7 @@ private constructor(
 
     override val referenceResolveProviderImpl: KtReferenceResolveProvider = KtFirReferenceResolveProvider(this)
 
-    override val substitutionProviderImpl: KtSignatureSubsitutor = KtFirSignatureSubsitutor(this)
+    override val signatureSubstitutorImpl: KtSignatureSubstitutor = KtFirSignatureSubstitutor(this)
 
     override val scopeSubstitutionImpl: KtScopeSubstitution = KtFirScopeSubstitution(this)
 
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSignatureSubsitutor.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSignatureSubstitutor.kt
similarity index 75%
rename from analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSignatureSubsitutor.kt
rename to analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSignatureSubstitutor.kt
index 44eebec0285..3615ea4ac08 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSignatureSubsitutor.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSignatureSubstitutor.kt
@@ -6,8 +6,8 @@
 package org.jetbrains.kotlin.analysis.api.fir.components
 
 import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession
-import org.jetbrains.kotlin.analysis.api.impl.base.components.AbstractKtSignatureSubsitutorImpl
+import org.jetbrains.kotlin.analysis.api.impl.base.components.AbstractKtSignatureSubstitutorImpl
 
-internal class KtFirSignatureSubsitutor(
+internal class KtFirSignatureSubstitutor(
     override val analysisSession: KtFirAnalysisSession
-) : AbstractKtSignatureSubsitutorImpl(), KtFirAnalysisSessionComponent
\ No newline at end of file
+) : AbstractKtSignatureSubstitutorImpl(), KtFirAnalysisSessionComponent
\ No newline at end of file
diff --git a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubsitutorImpl.kt b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubstitutorImpl.kt
similarity index 97%
rename from analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubsitutorImpl.kt
rename to analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubstitutorImpl.kt
index 1d57b62ad65..b15a199706c 100644
--- a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubsitutorImpl.kt
+++ b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/components/AbstractKtSignatureSubstitutorImpl.kt
@@ -5,7 +5,7 @@
 
 package org.jetbrains.kotlin.analysis.api.impl.base.components
 
-import org.jetbrains.kotlin.analysis.api.components.KtSignatureSubsitutor
+import org.jetbrains.kotlin.analysis.api.components.KtSignatureSubstitutor
 import org.jetbrains.kotlin.analysis.api.signatures.KtCallableSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtFunctionLikeSignature
 import org.jetbrains.kotlin.analysis.api.signatures.KtVariableLikeSignature
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor
 import org.jetbrains.kotlin.analysis.utils.errors.unexpectedElementError
 
-abstract class AbstractKtSignatureSubsitutorImpl : KtSignatureSubsitutor() {
+abstract class AbstractKtSignatureSubstitutorImpl : KtSignatureSubstitutor() {
     @Suppress("UNCHECKED_CAST")
     override fun <S : KtCallableSymbol> substitute(signature: KtCallableSignature<S>, substitutor: KtSubstitutor): KtCallableSignature<S> {
         return when (signature) {
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt
index 4fccd3fd793..2af2293daf0 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/KtAnalysisSession.kt
@@ -58,7 +58,7 @@ public abstract class KtAnalysisSession(final override val token: KtLifetimeToke
     KtInheritorsProviderMixIn,
     KtTypeCreatorMixIn,
     KtAnalysisScopeProviderMixIn,
-    KtSignatureSubsitutorMixIn,
+    KtSignatureSubstitutorMixIn,
     KtScopeSubstitutionMixIn {
 
     public abstract val useSiteModule: KtModule
@@ -145,8 +145,8 @@ public abstract class KtAnalysisSession(final override val token: KtLifetimeToke
     internal val referenceResolveProvider: KtReferenceResolveProvider get() = referenceResolveProviderImpl
     protected abstract val referenceResolveProviderImpl: KtReferenceResolveProvider
 
-    internal val substitutionProvider: KtSignatureSubsitutor get() = substitutionProviderImpl
-    protected abstract val substitutionProviderImpl: KtSignatureSubsitutor
+    internal val signatureSubstitutor: KtSignatureSubstitutor get() = signatureSubstitutorImpl
+    protected abstract val signatureSubstitutorImpl: KtSignatureSubstitutor
 
     internal val scopeSubstitution: KtScopeSubstitution get() = scopeSubstitutionImpl
     protected abstract val scopeSubstitutionImpl: KtScopeSubstitution
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSignatureSubsitutor.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSignatureSubstitutor.kt
similarity index 80%
rename from analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSignatureSubsitutor.kt
rename to analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSignatureSubstitutor.kt
index 466fac51cf6..e714ef0f13d 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSignatureSubsitutor.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtSignatureSubstitutor.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.analysis.api.signatures.KtVariableLikeSignature
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.analysis.api.types.KtSubstitutor
 
-public abstract class KtSignatureSubsitutor : KtAnalysisSessionComponent() {
+public abstract class KtSignatureSubstitutor : KtAnalysisSessionComponent() {
     public abstract fun <S : KtCallableSymbol> substitute(
         signature: KtCallableSignature<S>,
         substitutor: KtSubstitutor
@@ -41,14 +41,14 @@ public abstract class KtSignatureSubsitutor : KtAnalysisSessionComponent() {
     public abstract fun <S : KtVariableLikeSymbol> asSignature(symbol: S): KtVariableLikeSignature<S>
 }
 
-public interface KtSignatureSubsitutorMixIn : KtAnalysisSessionMixIn {
+public interface KtSignatureSubstitutorMixIn : KtAnalysisSessionMixIn {
     /**
      * Applies a [substitutor] to the given signature and return a new signature with substituted types.
      *
      * @see KtSubstitutor.substituteOrSelf
      */
     public fun <S : KtCallableSymbol> KtCallableSignature<S>.substitute(substitutor: KtSubstitutor): KtCallableSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.substitute(this, substitutor) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.substitute(this, substitutor) }
 
     /**
      * Applies a [substitutor]  to the given signature and return a new signature with substituted types.
@@ -56,7 +56,7 @@ public interface KtSignatureSubsitutorMixIn : KtAnalysisSessionMixIn {
      * @see KtSubstitutor.substituteOrSelf
      */
     public fun <S : KtFunctionLikeSymbol> KtFunctionLikeSignature<S>.substitute(substitutor: KtSubstitutor): KtFunctionLikeSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.substitute(this, substitutor) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.substitute(this, substitutor) }
 
     /**
      * Applies a [substitutor]  to the given signature and return a new signature with substituted types.
@@ -64,7 +64,7 @@ public interface KtSignatureSubsitutorMixIn : KtAnalysisSessionMixIn {
      * @see KtSubstitutor.substituteOrSelf
      */
     public fun <S : KtVariableLikeSymbol> KtVariableLikeSignature<S>.substitute(substitutor: KtSubstitutor): KtVariableLikeSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.substitute(this, substitutor) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.substitute(this, substitutor) }
 
     /**
      * Applies a [substitutor] to the given symbols and return a signature with substituted types.
@@ -72,7 +72,7 @@ public interface KtSignatureSubsitutorMixIn : KtAnalysisSessionMixIn {
      * @see KtSubstitutor.substituteOrSelf
      */
     public fun <S : KtCallableSymbol> S.substitute(substitutor: KtSubstitutor): KtCallableSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.substitute(this, substitutor) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.substitute(this, substitutor) }
 
     /**
      * Applies a [substitutor] to the given symbols and return a signature with substituted types.
@@ -80,7 +80,7 @@ public interface KtSignatureSubsitutorMixIn : KtAnalysisSessionMixIn {
      * @see KtSubstitutor.substituteOrSelf
      */
     public fun <S : KtFunctionLikeSymbol> S.substitute(substitutor: KtSubstitutor): KtFunctionLikeSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.substitute(this, substitutor) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.substitute(this, substitutor) }
 
     /**
      * Applies a [substitutor] to the given symbols and return a signature with substituted types.
@@ -88,23 +88,23 @@ public interface KtSignatureSubsitutorMixIn : KtAnalysisSessionMixIn {
      * @see KtSubstitutor.substituteOrSelf
      */
     public fun <S : KtVariableLikeSymbol> S.substitute(substitutor: KtSubstitutor): KtVariableLikeSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.substitute(this, substitutor) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.substitute(this, substitutor) }
 
     /**
      * Creates a new [KtCallableSignature] by given symbol and leave all types intact
      */
     public fun <S : KtCallableSymbol> S.asSignature(): KtCallableSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.asSignature(this) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.asSignature(this) }
 
     /**
      * Creates a new [KtCallableSignature] by given symbol and leave all types intact
      */
     public fun <S : KtFunctionLikeSymbol> S.asSignature(): KtFunctionLikeSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.asSignature(this) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.asSignature(this) }
 
     /**
      * Creates a new [KtCallableSignature] by given symbol and leave all types intact
      */
     public fun <S : KtVariableLikeSymbol> S.asSignature(): KtVariableLikeSignature<S> =
-        withValidityAssertion { analysisSession.substitutionProvider.asSignature(this) }
+        withValidityAssertion { analysisSession.signatureSubstitutor.asSignature(this) }
 }