diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt
index bd678386c31..81210ba0751 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/providers/impl/FirTypeResolverImpl.kt
@@ -228,7 +228,7 @@ class FirTypeResolverImpl(private val session: FirSession) : FirTypeResolver() {
             }
         }
 
-        if (symbol is FirRegularClassSymbol) {
+        if (symbol is FirClassLikeSymbol<*>) {
             val isPossibleBareType = areBareTypesAllowed && allTypeArguments.isEmpty()
             if (!isPossibleBareType) {
                 val actualSubstitutor = substitutor ?: ConeSubstitutor.Empty
diff --git a/compiler/testData/diagnostics/tests/typealias/abbreviatedSupertypes.fir.kt b/compiler/testData/diagnostics/tests/typealias/abbreviatedSupertypes.fir.kt
index 50f09db1e87..d7738ebd49b 100644
--- a/compiler/testData/diagnostics/tests/typealias/abbreviatedSupertypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/abbreviatedSupertypes.fir.kt
@@ -13,7 +13,7 @@ object O1 : One<<!UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>>() // compi
 object O2 : Both<<!UPPER_BOUND_VIOLATED!>Any<!>, <!UPPER_BOUND_VIOLATED!>Any<!>>()
 
 class A1<T : One<<!UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>>>
-class A2<T : One<<!UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>, Any>>
+class A2<T : One<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Any, Any><!>>
 
 interface IO1 : OneList<<!UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>> {}
 interface IO2 : BothList<<!UPPER_BOUND_VIOLATED!>Any<!>, <!UPPER_BOUND_VIOLATED!>Any<!>> {}
diff --git a/compiler/testData/diagnostics/tests/typealias/abbreviatedSupertypesErrors.fir.kt b/compiler/testData/diagnostics/tests/typealias/abbreviatedSupertypesErrors.fir.kt
index 1e99963b329..cc0ed68ee2a 100644
--- a/compiler/testData/diagnostics/tests/typealias/abbreviatedSupertypesErrors.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/abbreviatedSupertypesErrors.fir.kt
@@ -13,7 +13,7 @@ object O1 : One<<!UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>>() // compi
 object O2 : Both<<!UPPER_BOUND_VIOLATED!>Any<!>, <!UPPER_BOUND_VIOLATED!>Any<!>>()
 
 class A1<T : One<<!UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>>>
-class A2<T : One<<!UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>, Any>>
+class A2<T : One<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Any, Any><!>>
 
 interface IO1 : OneList<<!UPPER_BOUND_VIOLATED, UPPER_BOUND_VIOLATED!>Any<!>> {}
 interface IO2 : BothList<<!UPPER_BOUND_VIOLATED!>Any<!>, <!UPPER_BOUND_VIOLATED!>Any<!>> {}
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.fir.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.fir.kt
index a7862a63f48..4f3db34f456 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationRecursive.fir.kt
@@ -1,3 +1,3 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
-typealias R<T: <!BOUND_ON_TYPE_ALIAS_PARAMETER_NOT_ALLOWED!>List<R><!>> = List<T>
+typealias R<T: <!BOUND_ON_TYPE_ALIAS_PARAMETER_NOT_ALLOWED!>List<<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!>R<!>><!>> = List<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.fir.kt b/compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.fir.kt
index 4ce55439986..4dc6f51fd27 100644
--- a/compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/inheritedNestedTypeAlias.fir.kt
@@ -16,5 +16,5 @@ class Derived : Base<Int>() {
     val x2: Base<Int>.InnerCell = InnerCell(42)
 
     val test1: <!UNRESOLVED_REFERENCE!>CT<!> = Cell(42)
-    val test2: Base<Int>.CT = <!TYPE_MISMATCH, TYPE_MISMATCH!>Cell(42)<!>
+    val test2: Base<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.CT = Cell(42)
 }
diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.fir.kt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.fir.kt
index 38b340f6a24..37f735df22a 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType.fir.kt
@@ -18,17 +18,17 @@ class Outer<T> {
     fun test5(x: GenericInnerAlias<Int>) = x
     fun <T> test6(x: GenericInnerAlias<T>) = x
 }
-fun test1(x: Outer<Int>.NestedAlias) = x
-fun <T> test2(x: Outer<T>.NestedAlias) = x
+fun test1(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.NestedAlias) = x
+fun <T> test2(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><T><!>.NestedAlias) = x
 fun test3(x: Outer.NestedAlias) = x
-fun test4(x: Outer<Int>.GenericNestedAlias<Int>) = x
-fun <T> test5(x: Outer<T>.GenericNestedAlias<Int>) = x
-fun <T> test6(x: Outer<Int>.GenericNestedAlias<T>) = x
+fun test4(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.GenericNestedAlias<Int>) = x
+fun <T> test5(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><T><!>.GenericNestedAlias<Int>) = x
+fun <T> test6(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.GenericNestedAlias<T>) = x
 fun test7(x: Outer.GenericNestedAlias<Int>) = x
 fun <T> test8(x: Outer.GenericNestedAlias<T>) = x
 fun test9(x: Outer.InnerAlias) = x
-fun test10(x: Outer<Int>.InnerAlias) = x
-fun <T> test11(x: Outer<T>.InnerAlias) = x
+fun test10(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.InnerAlias) = x
+fun <T> test11(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><T><!>.InnerAlias) = x
 fun test12(x: Outer.GenericInnerAlias<Int>) = x
-fun test13(x: Outer<Int>.GenericInnerAlias<Int>) = x
-fun <T> test14(x: Outer<T>.GenericInnerAlias<Int>) = x
+fun test13(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.GenericInnerAlias<Int>) = x
+fun <T> test14(x: Outer<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><T><!>.GenericInnerAlias<Int>) = x
diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType2.fir.kt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType2.fir.kt
new file mode 100644
index 00000000000..c73e9b6048e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType2.fir.kt
@@ -0,0 +1,24 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -TOPLEVEL_TYPEALIASES_ONLY
+
+class C<T> {
+    inner class D
+
+    typealias DA = D
+    typealias SDA = C<Int>.D
+    typealias TSDA = C<T>.D
+    typealias TC = C<T>
+    typealias SSDA = C<*>.D
+    typealias SSC = C<*>
+}
+
+fun test1(x: C<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.DA) = x
+fun test2(x: C.SDA) = x
+fun test3(x: C<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.TSDA) = x
+fun test4(x: C<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><Int><!>.TC) = x
+
+fun test5(x: C<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><*><!>.DA) = x
+fun test6(x: C<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><*><!>.TSDA) = x
+fun test7(x: C<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><*><!>.TC) = x
+
+fun test8(x: C.SSDA) = x
+fun test9(x: C.SSC) = x
diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType2.kt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType2.kt
index b395df6be23..e6d8b770fce 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType2.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasAsType2.kt
@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -TOPLEVEL_TYPEALIASES_ONLY
 
 class C<T> {
@@ -22,4 +21,4 @@ fun test6(x: C<*>.TSDA) = x
 fun test7(x: C<*>.TC) = x
 
 fun test8(x: C.SSDA) = x
-fun test9(x: C.SSC) = x
\ No newline at end of file
+fun test9(x: C.SSC) = x
diff --git a/compiler/testData/diagnostics/tests/typealias/kt14518.fir.kt b/compiler/testData/diagnostics/tests/typealias/kt14518.fir.kt
index dac0393b6ed..5ffed32ceb1 100644
--- a/compiler/testData/diagnostics/tests/typealias/kt14518.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/kt14518.fir.kt
@@ -6,5 +6,5 @@ class OuterClass<T1> {
 }
 
 typealias ON1<T1, T2> = OuterClass<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><T1><!>.NestedClass<T2>
-typealias ON2<T1, T2> = OuterClass<T1>.NestedType<T2>
+typealias ON2<T1, T2> = OuterClass<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><T1><!>.NestedType<T2>
 typealias ON3<T2> = OuterClass.NestedType<T2>
diff --git a/compiler/testData/diagnostics/tests/typealias/nestedSubstituted.fir.kt b/compiler/testData/diagnostics/tests/typealias/nestedSubstituted.fir.kt
index 0d534ec8478..c67cbc55f19 100644
--- a/compiler/testData/diagnostics/tests/typealias/nestedSubstituted.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/nestedSubstituted.fir.kt
@@ -6,4 +6,4 @@ class C<T> {
     typealias P2 = Pair<T, Int>
 }
 
-val p1: C<String>.P2 = <!TYPE_MISMATCH, TYPE_MISMATCH!>Pair("", 1)<!>
+val p1: C<!WRONG_NUMBER_OF_TYPE_ARGUMENTS!><String><!>.P2 = Pair("", 1)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.fir.kt
deleted file mode 100644
index 9633af61203..00000000000
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.fir.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-open class Ref<T>(var x: T)
-
-typealias R<T> = Ref<T>
-
-// Type inference SHOULD NOT work for type alias constructor in supertypes list
-class Test1 : R(0)
-class Test2 : R<Int>(0)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.kt
index 955d07623f5..1f19a670ebf 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorInferenceInSupertypesList.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 open class Ref<T>(var x: T)
 
 typealias R<T> = Ref<T>