diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt b/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt
index 2687007c3b3..4ab9cffccb8 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt
@@ -409,7 +409,7 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
 
         if (old.hasTypeAliasName() != new.hasTypeAliasName()) return false
         if (old.hasTypeAliasName()) {
-            if (!checkStringEquals(old.typeAliasName, new.typeAliasName)) return false
+            if (!checkClassIdEquals(old.typeAliasName, new.typeAliasName)) return false
         }
 
         if (old.hasOuterType() != new.hasOuterType()) return false
@@ -1194,7 +1194,7 @@ fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) ->
     }
 
     if (hasTypeAliasName()) {
-        hashCode = 31 * hashCode + stringIndexes(typeAliasName)
+        hashCode = 31 * hashCode + fqNameIndexes(typeAliasName)
     }
 
     if (hasOuterType()) {
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
index ba24382fd60..8a63b18e80f 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
@@ -24149,7 +24149,7 @@ public final class DebugProtoBuf {
       "Type\022\037\n\027flexible_upper_bound_id\030\010 \001(\005\022\030\n" +
       "\nclass_name\030\006 \001(\005B\004\220\265\030\001\022\026\n\016type_paramete" +
       "r\030\007 \001(\005\022!\n\023type_parameter_name\030\t \001(\005B\004\210\265",
-      "\030\001\022\035\n\017type_alias_name\030\014 \001(\005B\004\210\265\030\001\022<\n\nout" +
+      "\030\001\022\035\n\017type_alias_name\030\014 \001(\005B\004\220\265\030\001\022<\n\nout" +
       "er_type\030\n \001(\0132(.org.jetbrains.kotlin.ser" +
       "ialization.Type\022\025\n\router_type_id\030\013 \001(\005\022B" +
       "\n\020abbreviated_type\030\r \001(\0132(.org.jetbrains" +
@@ -24378,7 +24378,7 @@ public final class DebugProtoBuf {
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
     registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto
index 61cd5e70129..8d29a6b4b44 100644
--- a/core/deserialization/src/descriptors.proto
+++ b/core/deserialization/src/descriptors.proto
@@ -127,7 +127,7 @@ message Type {
   optional int32 type_parameter = 7; // id of the type parameter
   // Name of the type parameter in the immediate owner
   optional int32 type_parameter_name = 9 [(name_id_in_table) = true];
-  optional int32 type_alias_name = 12 [(name_id_in_table) = true];
+  optional int32 type_alias_name = 12 [(fq_name_id_in_table) = true];
 
   optional Type outer_type = 10;
   optional int32 outer_type_id = 11;