diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt
index 568e6ec2714..4f3e5a06bcf 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDataClassConverters.kt
@@ -1237,19 +1237,19 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
         )
     }
     add(FirErrors.VALUE_CLASS_NOT_TOP_LEVEL) { firDiagnostic ->
-        InlineClassNotTopLevelImpl(
+        ValueClassNotTopLevelImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.VALUE_CLASS_NOT_FINAL) { firDiagnostic ->
-        InlineClassNotFinalImpl(
+        ValueClassNotFinalImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.ABSENCE_OF_PRIMARY_CONSTRUCTOR_FOR_VALUE_CLASS) { firDiagnostic ->
-        AbsenceOfPrimaryConstructorForInlineClassImpl(
+        AbsenceOfPrimaryConstructorForValueClassImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
@@ -1261,63 +1261,63 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
         )
     }
     add(FirErrors.VALUE_CLASS_CONSTRUCTOR_NOT_FINAL_READ_ONLY_PARAMETER) { firDiagnostic ->
-        InlineClassConstructorNotFinalReadOnlyParameterImpl(
+        ValueClassConstructorNotFinalReadOnlyParameterImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.PROPERTY_WITH_BACKING_FIELD_INSIDE_VALUE_CLASS) { firDiagnostic ->
-        PropertyWithBackingFieldInsideInlineClassImpl(
+        PropertyWithBackingFieldInsideValueClassImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.DELEGATED_PROPERTY_INSIDE_VALUE_CLASS) { firDiagnostic ->
-        DelegatedPropertyInsideInlineClassImpl(
+        DelegatedPropertyInsideValueClassImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.VALUE_CLASS_HAS_INAPPLICABLE_PARAMETER_TYPE) { firDiagnostic ->
-        InlineClassHasInapplicableParameterTypeImpl(
+        ValueClassHasInapplicableParameterTypeImpl(
             firSymbolBuilder.typeBuilder.buildKtType(firDiagnostic.a),
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.VALUE_CLASS_CANNOT_IMPLEMENT_INTERFACE_BY_DELEGATION) { firDiagnostic ->
-        InlineClassCannotImplementInterfaceByDelegationImpl(
+        ValueClassCannotImplementInterfaceByDelegationImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.VALUE_CLASS_CANNOT_EXTEND_CLASSES) { firDiagnostic ->
-        InlineClassCannotExtendClassesImpl(
+        ValueClassCannotExtendClassesImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.VALUE_CLASS_CANNOT_BE_RECURSIVE) { firDiagnostic ->
-        InlineClassCannotBeRecursiveImpl(
+        ValueClassCannotBeRecursiveImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.RESERVED_MEMBER_INSIDE_VALUE_CLASS) { firDiagnostic ->
-        ReservedMemberInsideInlineClassImpl(
+        ReservedMemberInsideValueClassImpl(
             firDiagnostic.a,
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.SECONDARY_CONSTRUCTOR_WITH_BODY_INSIDE_VALUE_CLASS) { firDiagnostic ->
-        SecondaryConstructorWithBodyInsideInlineClassImpl(
+        SecondaryConstructorWithBodyInsideValueClassImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
     }
     add(FirErrors.INNER_CLASS_INSIDE_VALUE_CLASS) { firDiagnostic ->
-        InnerClassInsideInlineClassImpl(
+        InnerClassInsideValueClassImpl(
             firDiagnostic as KtPsiDiagnostic,
             token,
         )
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt
index 454e0402ecf..25c7f6e93f6 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnostics.kt
@@ -895,62 +895,62 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
         override val diagnosticClass get() = NoExplicitReturnTypeInApiModeWarning::class
     }
 
-    abstract class InlineClassNotTopLevel : KtFirDiagnostic<KtDeclaration>() {
-        override val diagnosticClass get() = InlineClassNotTopLevel::class
+    abstract class ValueClassNotTopLevel : KtFirDiagnostic<KtDeclaration>() {
+        override val diagnosticClass get() = ValueClassNotTopLevel::class
     }
 
-    abstract class InlineClassNotFinal : KtFirDiagnostic<KtDeclaration>() {
-        override val diagnosticClass get() = InlineClassNotFinal::class
+    abstract class ValueClassNotFinal : KtFirDiagnostic<KtDeclaration>() {
+        override val diagnosticClass get() = ValueClassNotFinal::class
     }
 
-    abstract class AbsenceOfPrimaryConstructorForInlineClass : KtFirDiagnostic<KtDeclaration>() {
-        override val diagnosticClass get() = AbsenceOfPrimaryConstructorForInlineClass::class
+    abstract class AbsenceOfPrimaryConstructorForValueClass : KtFirDiagnostic<KtDeclaration>() {
+        override val diagnosticClass get() = AbsenceOfPrimaryConstructorForValueClass::class
     }
 
     abstract class InlineClassConstructorWrongParametersSize : KtFirDiagnostic<KtElement>() {
         override val diagnosticClass get() = InlineClassConstructorWrongParametersSize::class
     }
 
-    abstract class InlineClassConstructorNotFinalReadOnlyParameter : KtFirDiagnostic<KtParameter>() {
-        override val diagnosticClass get() = InlineClassConstructorNotFinalReadOnlyParameter::class
+    abstract class ValueClassConstructorNotFinalReadOnlyParameter : KtFirDiagnostic<KtParameter>() {
+        override val diagnosticClass get() = ValueClassConstructorNotFinalReadOnlyParameter::class
     }
 
-    abstract class PropertyWithBackingFieldInsideInlineClass : KtFirDiagnostic<KtProperty>() {
-        override val diagnosticClass get() = PropertyWithBackingFieldInsideInlineClass::class
+    abstract class PropertyWithBackingFieldInsideValueClass : KtFirDiagnostic<KtProperty>() {
+        override val diagnosticClass get() = PropertyWithBackingFieldInsideValueClass::class
     }
 
-    abstract class DelegatedPropertyInsideInlineClass : KtFirDiagnostic<PsiElement>() {
-        override val diagnosticClass get() = DelegatedPropertyInsideInlineClass::class
+    abstract class DelegatedPropertyInsideValueClass : KtFirDiagnostic<PsiElement>() {
+        override val diagnosticClass get() = DelegatedPropertyInsideValueClass::class
     }
 
-    abstract class InlineClassHasInapplicableParameterType : KtFirDiagnostic<KtTypeReference>() {
-        override val diagnosticClass get() = InlineClassHasInapplicableParameterType::class
+    abstract class ValueClassHasInapplicableParameterType : KtFirDiagnostic<KtTypeReference>() {
+        override val diagnosticClass get() = ValueClassHasInapplicableParameterType::class
         abstract val type: KtType
     }
 
-    abstract class InlineClassCannotImplementInterfaceByDelegation : KtFirDiagnostic<PsiElement>() {
-        override val diagnosticClass get() = InlineClassCannotImplementInterfaceByDelegation::class
+    abstract class ValueClassCannotImplementInterfaceByDelegation : KtFirDiagnostic<PsiElement>() {
+        override val diagnosticClass get() = ValueClassCannotImplementInterfaceByDelegation::class
     }
 
-    abstract class InlineClassCannotExtendClasses : KtFirDiagnostic<KtTypeReference>() {
-        override val diagnosticClass get() = InlineClassCannotExtendClasses::class
+    abstract class ValueClassCannotExtendClasses : KtFirDiagnostic<KtTypeReference>() {
+        override val diagnosticClass get() = ValueClassCannotExtendClasses::class
     }
 
-    abstract class InlineClassCannotBeRecursive : KtFirDiagnostic<KtTypeReference>() {
-        override val diagnosticClass get() = InlineClassCannotBeRecursive::class
+    abstract class ValueClassCannotBeRecursive : KtFirDiagnostic<KtTypeReference>() {
+        override val diagnosticClass get() = ValueClassCannotBeRecursive::class
     }
 
-    abstract class ReservedMemberInsideInlineClass : KtFirDiagnostic<KtFunction>() {
-        override val diagnosticClass get() = ReservedMemberInsideInlineClass::class
+    abstract class ReservedMemberInsideValueClass : KtFirDiagnostic<KtFunction>() {
+        override val diagnosticClass get() = ReservedMemberInsideValueClass::class
         abstract val name: String
     }
 
-    abstract class SecondaryConstructorWithBodyInsideInlineClass : KtFirDiagnostic<PsiElement>() {
-        override val diagnosticClass get() = SecondaryConstructorWithBodyInsideInlineClass::class
+    abstract class SecondaryConstructorWithBodyInsideValueClass : KtFirDiagnostic<PsiElement>() {
+        override val diagnosticClass get() = SecondaryConstructorWithBodyInsideValueClass::class
     }
 
-    abstract class InnerClassInsideInlineClass : KtFirDiagnostic<KtDeclaration>() {
-        override val diagnosticClass get() = InnerClassInsideInlineClass::class
+    abstract class InnerClassInsideValueClass : KtFirDiagnostic<KtDeclaration>() {
+        override val diagnosticClass get() = InnerClassInsideValueClass::class
     }
 
     abstract class ValueClassCannotBeCloneable : KtFirDiagnostic<KtDeclaration>() {
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
index 2ce590e3229..506eaf04d82 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
@@ -1069,77 +1069,77 @@ internal class NoExplicitReturnTypeInApiModeWarningImpl(
     override val token: ValidityToken,
 ) : KtFirDiagnostic.NoExplicitReturnTypeInApiModeWarning(), KtAbstractFirDiagnostic<KtDeclaration>
 
-internal class InlineClassNotTopLevelImpl(
+internal class ValueClassNotTopLevelImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.InlineClassNotTopLevel(), KtAbstractFirDiagnostic<KtDeclaration>
+) : KtFirDiagnostic.ValueClassNotTopLevel(), KtAbstractFirDiagnostic<KtDeclaration>
 
-internal class InlineClassNotFinalImpl(
+internal class ValueClassNotFinalImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.InlineClassNotFinal(), KtAbstractFirDiagnostic<KtDeclaration>
+) : KtFirDiagnostic.ValueClassNotFinal(), KtAbstractFirDiagnostic<KtDeclaration>
 
-internal class AbsenceOfPrimaryConstructorForInlineClassImpl(
+internal class AbsenceOfPrimaryConstructorForValueClassImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.AbsenceOfPrimaryConstructorForInlineClass(), KtAbstractFirDiagnostic<KtDeclaration>
+) : KtFirDiagnostic.AbsenceOfPrimaryConstructorForValueClass(), KtAbstractFirDiagnostic<KtDeclaration>
 
 internal class InlineClassConstructorWrongParametersSizeImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
 ) : KtFirDiagnostic.InlineClassConstructorWrongParametersSize(), KtAbstractFirDiagnostic<KtElement>
 
-internal class InlineClassConstructorNotFinalReadOnlyParameterImpl(
+internal class ValueClassConstructorNotFinalReadOnlyParameterImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.InlineClassConstructorNotFinalReadOnlyParameter(), KtAbstractFirDiagnostic<KtParameter>
+) : KtFirDiagnostic.ValueClassConstructorNotFinalReadOnlyParameter(), KtAbstractFirDiagnostic<KtParameter>
 
-internal class PropertyWithBackingFieldInsideInlineClassImpl(
+internal class PropertyWithBackingFieldInsideValueClassImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.PropertyWithBackingFieldInsideInlineClass(), KtAbstractFirDiagnostic<KtProperty>
+) : KtFirDiagnostic.PropertyWithBackingFieldInsideValueClass(), KtAbstractFirDiagnostic<KtProperty>
 
-internal class DelegatedPropertyInsideInlineClassImpl(
+internal class DelegatedPropertyInsideValueClassImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.DelegatedPropertyInsideInlineClass(), KtAbstractFirDiagnostic<PsiElement>
+) : KtFirDiagnostic.DelegatedPropertyInsideValueClass(), KtAbstractFirDiagnostic<PsiElement>
 
-internal class InlineClassHasInapplicableParameterTypeImpl(
+internal class ValueClassHasInapplicableParameterTypeImpl(
     override val type: KtType,
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.InlineClassHasInapplicableParameterType(), KtAbstractFirDiagnostic<KtTypeReference>
+) : KtFirDiagnostic.ValueClassHasInapplicableParameterType(), KtAbstractFirDiagnostic<KtTypeReference>
 
-internal class InlineClassCannotImplementInterfaceByDelegationImpl(
+internal class ValueClassCannotImplementInterfaceByDelegationImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.InlineClassCannotImplementInterfaceByDelegation(), KtAbstractFirDiagnostic<PsiElement>
+) : KtFirDiagnostic.ValueClassCannotImplementInterfaceByDelegation(), KtAbstractFirDiagnostic<PsiElement>
 
-internal class InlineClassCannotExtendClassesImpl(
+internal class ValueClassCannotExtendClassesImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.InlineClassCannotExtendClasses(), KtAbstractFirDiagnostic<KtTypeReference>
+) : KtFirDiagnostic.ValueClassCannotExtendClasses(), KtAbstractFirDiagnostic<KtTypeReference>
 
-internal class InlineClassCannotBeRecursiveImpl(
+internal class ValueClassCannotBeRecursiveImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.InlineClassCannotBeRecursive(), KtAbstractFirDiagnostic<KtTypeReference>
+) : KtFirDiagnostic.ValueClassCannotBeRecursive(), KtAbstractFirDiagnostic<KtTypeReference>
 
-internal class ReservedMemberInsideInlineClassImpl(
+internal class ReservedMemberInsideValueClassImpl(
     override val name: String,
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.ReservedMemberInsideInlineClass(), KtAbstractFirDiagnostic<KtFunction>
+) : KtFirDiagnostic.ReservedMemberInsideValueClass(), KtAbstractFirDiagnostic<KtFunction>
 
-internal class SecondaryConstructorWithBodyInsideInlineClassImpl(
+internal class SecondaryConstructorWithBodyInsideValueClassImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.SecondaryConstructorWithBodyInsideInlineClass(), KtAbstractFirDiagnostic<PsiElement>
+) : KtFirDiagnostic.SecondaryConstructorWithBodyInsideValueClass(), KtAbstractFirDiagnostic<PsiElement>
 
-internal class InnerClassInsideInlineClassImpl(
+internal class InnerClassInsideValueClassImpl(
     override val firDiagnostic: KtPsiDiagnostic,
     override val token: ValidityToken,
-) : KtFirDiagnostic.InnerClassInsideInlineClass(), KtAbstractFirDiagnostic<KtDeclaration>
+) : KtFirDiagnostic.InnerClassInsideValueClass(), KtAbstractFirDiagnostic<KtDeclaration>
 
 internal class ValueClassCannotBeCloneableImpl(
     override val firDiagnostic: KtPsiDiagnostic,
diff --git a/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassDeclaration.kt b/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassDeclaration.kt
index 90a202cc613..57cd9d018a3 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassDeclaration.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/inlineClasses/inlineClassDeclaration.kt
@@ -14,6 +14,6 @@ class A {
 <!VALUE_CLASS_CANNOT_BE_CLONEABLE!>inline<!> class CloneableClass2(val x: Int): java.lang.Cloneable
 
 open class Test
-inline class ExtendTest(val x: Int): <!VALUE_CLASS_CANNOT_EXTEND_CLASSES, SUPERTYPE_NOT_INITIALIZED!>Test<!>
+inline class ExtendTest(val x: Int): <!SUPERTYPE_NOT_INITIALIZED, VALUE_CLASS_CANNOT_EXTEND_CLASSES!>Test<!>
 
 inline class ImplementByDelegation(val x: Int) : <!VALUE_CLASS_CANNOT_IMPLEMENT_INTERFACE_BY_DELEGATION!>Comparable<Int><!> by x