From ee7660065b8af940afbbbf8f48e8939cb538aebd Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Thu, 14 Mar 2019 20:17:23 +0300
Subject: [PATCH] Changes after code review

---
 build.gradle.kts                              |   2 +-
 compiler/ir/backend.common/src/KotlinIr.proto |  23 +-
 .../common/library/CombinedIrFileAccessor.kt  |   4 +-
 .../common/serialization/AdditionalIrUtils.kt |   2 +-
 .../common/serialization/DeclarationTable.kt  |   9 +-
 .../DeserializeDescriptorReference.kt         |   2 +-
 .../serialization/IrModuleDeserializer.kt     |   9 +-
 .../serialization/IrModuleSerializer.kt       |   7 +-
 .../common/serialization/KotlinIr.java        | 940 +++++-------------
 .../common/serialization/KotlinIrLinker.kt    |  17 +-
 .../common/serialization/KotlinMangler.kt     |   2 +-
 .../serialization/LegacyDescriptorUtils.kt    |   2 +-
 .../common/serialization/UniqSymbolName.kt    |  10 -
 .../kotlin/ir/backend/js/compiler.kt          |   6 +-
 .../serialization/ir/JsDeclarationTable.kt    |   6 +-
 ...rIrUtils.kt => JsDeclarationTableUtils.kt} |   0
 .../js/lower/serialization/ir/JsIrLinker.kt   |  18 +-
 .../generators/protobuf/GenerateProtoBuf.kt   |   1 -
 18 files changed, 268 insertions(+), 792 deletions(-)
 delete mode 100644 compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/UniqSymbolName.kt
 rename compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/{AnotherIrUtils.kt => JsDeclarationTableUtils.kt} (100%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 32e0f87c80f..43743c7a317 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -732,4 +732,4 @@ allprojects {
             repositories.redirect()
         }
     }
-}
+}
\ No newline at end of file
diff --git a/compiler/ir/backend.common/src/KotlinIr.proto b/compiler/ir/backend.common/src/KotlinIr.proto
index b30fedf3091..1d6772bbae8 100644
--- a/compiler/ir/backend.common/src/KotlinIr.proto
+++ b/compiler/ir/backend.common/src/KotlinIr.proto
@@ -74,11 +74,6 @@ message IrDeclarationOrigin {
   }
 }
 
-message Name {
-    required String name = 1;
-    required bool is_special = 2;
-}
-
 /* ------ Top Level---------------------------------------------- */
 
 message IrDeclarationContainer {
@@ -99,7 +94,7 @@ message IrFile {
 }
 
 message IrModule {
-  required Name name = 1;
+  required String name = 1;
   repeated IrFile file = 2;
   required IrSymbolTable symbol_table = 3;
   required IrTypeTable type_table = 4;
@@ -526,7 +521,7 @@ message IrFunction {
 }
 
 message IrFunctionBase {
-  required Name name = 1;
+  required String name = 1;
   required Visibility visibility = 2;
   required bool is_inline = 3;
   required bool is_external = 4;
@@ -548,7 +543,7 @@ message IrConstructor {
 message IrField {
   required IrSymbol symbol = 1;
   optional IrExpression initializer = 2;
-  required Name name = 3;
+  required String name = 3;
   required Visibility visibility = 4;
   required bool is_final = 5;
   required bool is_external = 6;
@@ -558,7 +553,7 @@ message IrField {
 
 message IrProperty {
   optional DescriptorReference descriptor_reference = 1; // IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
-  required Name name = 2;
+  required String name = 2;
   required Visibility visibility = 3;
   required ModalityKind modality = 4;
   required bool is_var = 5;
@@ -572,7 +567,7 @@ message IrProperty {
 }
 
 message IrVariable {
-  required Name name = 1;
+  required String name = 1;
   required IrSymbol symbol = 2;
   required IrTypeIndex type = 3;
   required bool is_var = 4;
@@ -599,7 +594,7 @@ enum ModalityKind { // It is ModalityKind to not clash with Modality in descript
 
 message IrValueParameter {
   required IrSymbol symbol = 1;
-  required Name name = 2;
+  required String name = 2;
   required int32 index = 3;
   required IrTypeIndex type = 4;
   optional IrTypeIndex vararg_element_type = 5;
@@ -610,7 +605,7 @@ message IrValueParameter {
 
 message IrTypeParameter {
   required IrSymbol symbol = 1;
-  required Name name = 2;
+  required String name = 2;
   required int32 index = 3;
   required IrTypeVariance variance = 4;
   repeated IrTypeIndex super_type = 5;
@@ -623,7 +618,7 @@ message IrTypeParameterContainer {
 
 message IrClass {
   required IrSymbol symbol = 1;
-  required Name name = 2;
+  required String name = 2;
   required ClassKind kind = 3;
   required Visibility visibility = 4;
   required ModalityKind modality = 5;
@@ -643,7 +638,7 @@ message IrEnumEntry {
   required IrSymbol symbol = 1;
   optional IrExpression initializer = 2;
   optional IrDeclaration corresponding_class = 3;
-  required Name name = 4;
+  required String name = 4;
 }
 
 message IrAnonymousInit {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/library/CombinedIrFileAccessor.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/library/CombinedIrFileAccessor.kt
index 4de5f724e9c..ddc81402056 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/library/CombinedIrFileAccessor.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/library/CombinedIrFileAccessor.kt
@@ -64,9 +64,7 @@ private const val INDEX_HEADER_SIZE = 4  // sizeof(Int).
 class CombinedIrFileWriter(val declarationCount: Int) {
     private var currentDeclaration = 0
     private var currentPosition = 0
-    private val file =  Files.createTempFile("ir", "").toFile().also {
-        it.deleteOnExit()
-    }
+    private val file =  Files.createTempFile("ir", "").toFile()
     private val randomAccessFile = RandomAccessFile(file.path, "rw")
 
     init {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/AdditionalIrUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/AdditionalIrUtils.kt
index 76d74d87aa7..90092bb7eb2 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/AdditionalIrUtils.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/AdditionalIrUtils.kt
@@ -178,7 +178,7 @@ class NaiveSourceBasedFileEntryImpl(override val name: String, val lineStartOffs
     override fun getColumnNumber(offset: Int): Int {
         assert(offset != UNDEFINED_OFFSET)
         if (offset == SYNTHETIC_OFFSET) return 0
-        var lineNumber = getLineNumber(offset)
+        val lineNumber = getLineNumber(offset)
         return offset - lineStartOffsets[lineNumber]
     }
 
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeclarationTable.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeclarationTable.kt
index 644985fbc21..079a82fae6d 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeclarationTable.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeclarationTable.kt
@@ -22,20 +22,17 @@ class DescriptorTable {
 abstract class DeclarationTable(val builtIns: IrBuiltIns, val descriptorTable: DescriptorTable, mangler: KotlinMangler): KotlinMangler by mangler {
 
     private val table = mutableMapOf<IrDeclaration, UniqId>()
-    val debugIndex = mutableMapOf<UniqId, String>()
     val descriptors = descriptorTable
-    abstract protected var currentIndex: Long
-    protected var initialized: Boolean = false
+    protected abstract var currentIndex: Long
 
-    open fun loadKnownBuiltins() {
+    open fun loadKnownBuiltins(): Long {
         builtIns.knownBuiltins.forEach {
             table.put(it, UniqId(currentIndex++, false))
         }
-        initialized = true
+        return currentIndex
     }
 
     fun uniqIdByDeclaration(value: IrDeclaration) = table.getOrPut(value) {
-        if (!initialized) error("DeclarationTable has not been initialized")
         computeUniqIdByDeclaration(value)
     }
 
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeserializeDescriptorReference.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeserializeDescriptorReference.kt
index 54d4a026f3e..ca5a4dbd97a 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeserializeDescriptorReference.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/DeserializeDescriptorReference.kt
@@ -28,7 +28,7 @@ abstract class DescriptorReferenceDeserializer(
     protected fun getContributedDescriptors(packageFqNameString: String, name: String): Collection<DeclarationDescriptor> {
         val packageFqName = packageFqNameString.let {
             if (it == "<root>") FqName.ROOT else FqName(it)
-        }// TODO: whould we store an empty string in the protobuf?
+        }// TODO: would we store an empty string in the protobuf?
 
         val contributedName = if (name.startsWith("<get-") || name.startsWith("<set-")) {
             name.substring(5, name.length - 1) // FIXME: rework serialization format.
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt
index b3a63443e40..e8897e70e3c 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleDeserializer.kt
@@ -31,9 +31,6 @@ import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclarator.D
 import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrType.KindCase.*
 import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrVarargElement.VarargElementCase
 import org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeArgument.KindCase.*
-
-
-
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.types.Variance
 
@@ -55,9 +52,9 @@ abstract class IrModuleDeserializer(
     abstract fun deserializeString(proto: KotlinIr.String): String
     abstract fun deserializeLoopHeader(loopIndex: Int, loopBuilder: () -> IrLoopBase): IrLoopBase
 
-    private fun deserializeName(proto: KotlinIr.Name): Name {
-        val name = deserializeString(proto.name)
-        return if (proto.isSpecial) Name.special(name) else Name.identifier(name)
+    private fun deserializeName(proto: KotlinIr.String): Name {
+        val name = deserializeString(proto)
+        return Name.guessByFirstCharacter(name)
     }
 
     private fun deserializeTypeArguments(proto: KotlinIr.TypeArguments): List<IrType> {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt
index 4fb32519d33..399ddd75f6e 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/IrModuleSerializer.kt
@@ -88,12 +88,7 @@ open class IrModuleSerializer(
         return proto.build()
     }
 
-    fun serializeName(name: Name): KotlinIr.Name {
-        val proto = KotlinIr.Name.newBuilder()
-            .setName(serializeString(name.toString()))
-            .setIsSpecial(name.isSpecial)
-        return proto.build()
-    }
+    fun serializeName(name: Name): KotlinIr.String = serializeString(name.toString())
 
     /* ------- IrSymbols -------------------------------------------------------- */
 
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.java b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.java
index a3911d32f26..5fd2c5994c8 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.java
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.java
@@ -4457,496 +4457,6 @@ public final class KotlinIr {
     // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.IrDeclarationOrigin)
   }
 
-  public interface NameOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.Name)
-      org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
-
-    /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-     */
-    boolean hasName();
-    /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-     */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
-
-    /**
-     * <code>required bool is_special = 2;</code>
-     */
-    boolean hasIsSpecial();
-    /**
-     * <code>required bool is_special = 2;</code>
-     */
-    boolean getIsSpecial();
-  }
-  /**
-   * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.Name}
-   */
-  public static final class Name extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.backend.common.serialization.Name)
-      NameOrBuilder {
-    // Use Name.newBuilder() to construct.
-    private Name(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Name(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
-
-    private static final Name defaultInstance;
-    public static Name getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Name getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
-    private Name(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
-          org.jetbrains.kotlin.protobuf.ByteString.newOutput();
-      org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
-          org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
-              unknownFieldsOutput);
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFieldsCodedOutput,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) == 0x00000001)) {
-                subBuilder = name_.toBuilder();
-              }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(name_);
-                name_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000001;
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              isSpecial_ = input.readBool();
-              break;
-            }
-          }
-        }
-      } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        try {
-          unknownFieldsCodedOutput.flush();
-        } catch (java.io.IOException e) {
-        // Should not happen
-        } finally {
-          unknownFields = unknownFieldsOutput.toByteString();
-        }
-        makeExtensionsImmutable();
-      }
-    }
-    public static org.jetbrains.kotlin.protobuf.Parser<Name> PARSER =
-        new org.jetbrains.kotlin.protobuf.AbstractParser<Name>() {
-      public Name parsePartialFrom(
-          org.jetbrains.kotlin.protobuf.CodedInputStream input,
-          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-        return new Name(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public org.jetbrains.kotlin.protobuf.Parser<Name> getParserForType() {
-      return PARSER;
-    }
-
-    private int bitField0_;
-    public static final int NAME_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
-    /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-     */
-    public boolean hasName() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-     */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
-      return name_;
-    }
-
-    public static final int IS_SPECIAL_FIELD_NUMBER = 2;
-    private boolean isSpecial_;
-    /**
-     * <code>required bool is_special = 2;</code>
-     */
-    public boolean hasIsSpecial() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    /**
-     * <code>required bool is_special = 2;</code>
-     */
-    public boolean getIsSpecial() {
-      return isSpecial_;
-    }
-
-    private void initFields() {
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
-      isSpecial_ = false;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasName()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasIsSpecial()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getName().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, name_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBool(2, isSpecial_);
-      }
-      output.writeRawBytes(unknownFields);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeMessageSize(1, name_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeBoolSize(2, isSpecial_);
-      }
-      size += unknownFields.size();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseFrom(
-        org.jetbrains.kotlin.protobuf.ByteString data)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseFrom(
-        org.jetbrains.kotlin.protobuf.ByteString data,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseFrom(byte[] data)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseFrom(
-        byte[] data,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseFrom(
-        java.io.InputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseDelimitedFrom(
-        java.io.InputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseFrom(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parseFrom(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-
-    /**
-     * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.Name}
-     */
-    public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name, Builder>
-        implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.backend.common.serialization.Name)
-        org.jetbrains.kotlin.backend.common.serialization.KotlinIr.NameOrBuilder {
-      // Construct using org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        isSpecial_ = false;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
-      }
-
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name build() {
-        org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name buildPartial() {
-        org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name result = new org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.name_ = name_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.isSpecial_ = isSpecial_;
-        result.bitField0_ = to_bitField0_;
-        return result;
-      }
-
-      public Builder mergeFrom(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name other) {
-        if (other == org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) return this;
-        if (other.hasName()) {
-          mergeName(other.getName());
-        }
-        if (other.hasIsSpecial()) {
-          setIsSpecial(other.getIsSpecial());
-        }
-        setUnknownFields(
-            getUnknownFields().concat(other.unknownFields));
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        if (!hasName()) {
-          
-          return false;
-        }
-        if (!hasIsSpecial()) {
-          
-          return false;
-        }
-        if (!getName().isInitialized()) {
-          
-          return false;
-        }
-        return true;
-      }
-
-      public Builder mergeFrom(
-          org.jetbrains.kotlin.protobuf.CodedInputStream input,
-          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
-      /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-       */
-      public boolean hasName() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-       */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
-        return name_;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-       */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        name_ = value;
-
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-       */
-      public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
-        name_ = builderForValue.build();
-
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-       */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
-        if (((bitField0_ & 0x00000001) == 0x00000001) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
-          name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
-        } else {
-          name_ = value;
-        }
-
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
-       */
-      public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
-
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-
-      private boolean isSpecial_ ;
-      /**
-       * <code>required bool is_special = 2;</code>
-       */
-      public boolean hasIsSpecial() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      /**
-       * <code>required bool is_special = 2;</code>
-       */
-      public boolean getIsSpecial() {
-        return isSpecial_;
-      }
-      /**
-       * <code>required bool is_special = 2;</code>
-       */
-      public Builder setIsSpecial(boolean value) {
-        bitField0_ |= 0x00000002;
-        isSpecial_ = value;
-        
-        return this;
-      }
-      /**
-       * <code>required bool is_special = 2;</code>
-       */
-      public Builder clearIsSpecial() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        isSpecial_ = false;
-        
-        return this;
-      }
-
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.backend.common.serialization.Name)
-    }
-
-    static {
-      defaultInstance = new Name(true);
-      defaultInstance.initFields();
-    }
-
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.backend.common.serialization.Name)
-  }
-
   public interface IrDeclarationContainerOrBuilder extends
       // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.backend.common.serialization.IrDeclarationContainer)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
@@ -7112,13 +6622,13 @@ public final class KotlinIr {
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
 
     /**
      * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.IrFile file = 2;</code>
@@ -7212,11 +6722,11 @@ public final class KotlinIr {
               break;
             }
             case 10: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -7309,17 +6819,17 @@ public final class KotlinIr {
 
     private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -7404,7 +6914,7 @@ public final class KotlinIr {
     }
 
     private void initFields() {
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       file_ = java.util.Collections.emptyList();
       symbolTable_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbolTable.getDefaultInstance();
       typeTable_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeTable.getDefaultInstance();
@@ -7595,7 +7105,7 @@ public final class KotlinIr {
 
       public Builder clear() {
         super.clear();
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
         file_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -7739,23 +7249,23 @@ public final class KotlinIr {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7765,23 +7275,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000001;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000001) == 0x00000001) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -7790,10 +7300,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
@@ -43629,13 +43139,13 @@ public final class KotlinIr {
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
 
     /**
      * <code>required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 2;</code>
@@ -43774,11 +43284,11 @@ public final class KotlinIr {
               break;
             }
             case 10: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -43920,17 +43430,17 @@ public final class KotlinIr {
 
     private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -44090,7 +43600,7 @@ public final class KotlinIr {
     }
 
     private void initFields() {
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance();
       isInline_ = false;
       isExternal_ = false;
@@ -44351,7 +43861,7 @@ public final class KotlinIr {
 
       public Builder clear() {
         super.clear();
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
         visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -44570,23 +44080,23 @@ public final class KotlinIr {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -44596,23 +44106,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000001;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000001) == 0x00000001) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -44621,10 +44131,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
@@ -45833,13 +45343,13 @@ public final class KotlinIr {
     org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression getInitializer();
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
 
     /**
      * <code>required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 4;</code>
@@ -45963,11 +45473,11 @@ public final class KotlinIr {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -46081,17 +45591,17 @@ public final class KotlinIr {
     }
 
     public static final int NAME_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -46173,7 +45683,7 @@ public final class KotlinIr {
     private void initFields() {
       symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
       initializer_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance();
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance();
       isFinal_ = false;
       isExternal_ = false;
@@ -46406,7 +45916,7 @@ public final class KotlinIr {
         bitField0_ = (bitField0_ & ~0x00000001);
         initializer_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
         visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -46701,23 +46211,23 @@ public final class KotlinIr {
         return this;
       }
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -46727,23 +46237,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000004) == 0x00000004) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -46752,10 +46262,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 3;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 3;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
@@ -47010,13 +46520,13 @@ public final class KotlinIr {
     org.jetbrains.kotlin.backend.common.serialization.KotlinIr.DescriptorReference getDescriptorReference();
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
 
     /**
      * <code>required .org.jetbrains.kotlin.backend.common.serialization.Visibility visibility = 3;</code>
@@ -47172,11 +46682,11 @@ public final class KotlinIr {
               break;
             }
             case 18: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -47331,17 +46841,17 @@ public final class KotlinIr {
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -47497,7 +47007,7 @@ public final class KotlinIr {
 
     private void initFields() {
       descriptorReference_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.DescriptorReference.getDefaultInstance();
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance();
       modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY;
       isVar_ = false;
@@ -47775,7 +47285,7 @@ public final class KotlinIr {
         super.clear();
         descriptorReference_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.DescriptorReference.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
         visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -48086,23 +47596,23 @@ public final class KotlinIr {
         return this;
       }
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -48112,23 +47622,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -48137,10 +47647,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
@@ -48597,13 +48107,13 @@ public final class KotlinIr {
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
 
     /**
      * <code>required .org.jetbrains.kotlin.backend.common.serialization.IrSymbol symbol = 2;</code>
@@ -48710,11 +48220,11 @@ public final class KotlinIr {
               break;
             }
             case 10: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -48811,17 +48321,17 @@ public final class KotlinIr {
 
     private int bitField0_;
     public static final int NAME_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -48916,7 +48426,7 @@ public final class KotlinIr {
     }
 
     private void initFields() {
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
       type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance();
       isVar_ = false;
@@ -49131,7 +48641,7 @@ public final class KotlinIr {
 
       public Builder clear() {
         super.clear();
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
         symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -49293,23 +48803,23 @@ public final class KotlinIr {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -49319,23 +48829,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000001;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000001) == 0x00000001) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -49344,10 +48854,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 1;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 1;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
@@ -49654,13 +49164,13 @@ public final class KotlinIr {
     org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol();
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
 
     /**
      * <code>required int32 index = 3;</code>
@@ -49780,11 +49290,11 @@ public final class KotlinIr {
               break;
             }
             case 18: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -49896,17 +49406,17 @@ public final class KotlinIr {
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -50002,7 +49512,7 @@ public final class KotlinIr {
 
     private void initFields() {
       symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       index_ = 0;
       type_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance();
       varargElementType_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeIndex.getDefaultInstance();
@@ -50232,7 +49742,7 @@ public final class KotlinIr {
         super.clear();
         symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
         index_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -50467,23 +49977,23 @@ public final class KotlinIr {
         return this;
       }
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -50493,23 +50003,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -50518,10 +50028,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
@@ -50828,13 +50338,13 @@ public final class KotlinIr {
     org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol();
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
 
     /**
      * <code>required int32 index = 3;</code>
@@ -50941,11 +50451,11 @@ public final class KotlinIr {
               break;
             }
             case 18: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -51036,17 +50546,17 @@ public final class KotlinIr {
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -51132,7 +50642,7 @@ public final class KotlinIr {
 
     private void initFields() {
       symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       index_ = 0;
       variance_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrTypeVariance.IN;
       superType_ = java.util.Collections.emptyList();
@@ -51332,7 +50842,7 @@ public final class KotlinIr {
         super.clear();
         symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
         index_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -51543,23 +51053,23 @@ public final class KotlinIr {
         return this;
       }
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -51569,23 +51079,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -51594,10 +51104,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
@@ -52345,13 +51855,13 @@ public final class KotlinIr {
     org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol getSymbol();
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
 
     /**
      * <code>required .org.jetbrains.kotlin.backend.common.serialization.ClassKind kind = 3;</code>
@@ -52538,11 +52048,11 @@ public final class KotlinIr {
               break;
             }
             case 18: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -52712,17 +52222,17 @@ public final class KotlinIr {
     }
 
     public static final int NAME_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -52936,7 +52446,7 @@ public final class KotlinIr {
 
     private void initFields() {
       symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       kind_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ClassKind.CLASS;
       visibility_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Visibility.getDefaultInstance();
       modality_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ModalityKind.FINAL_MODALITY;
@@ -53246,7 +52756,7 @@ public final class KotlinIr {
         super.clear();
         symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
         kind_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.ClassKind.CLASS;
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -53575,23 +53085,23 @@ public final class KotlinIr {
         return this;
       }
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -53601,23 +53111,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -53626,10 +53136,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 2;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 2;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
@@ -54289,13 +53799,13 @@ public final class KotlinIr {
     org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration getCorrespondingClass();
 
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
      */
     boolean hasName();
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
      */
-    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName();
+    org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName();
   }
   /**
    * Protobuf type {@code org.jetbrains.kotlin.backend.common.serialization.IrEnumEntry}
@@ -54387,11 +53897,11 @@ public final class KotlinIr {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder subBuilder = null;
+              org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = name_.toBuilder();
               }
-              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.PARSER, extensionRegistry);
+              name_ = input.readMessage(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(name_);
                 name_ = subBuilder.buildPartial();
@@ -54479,17 +53989,17 @@ public final class KotlinIr {
     }
 
     public static final int NAME_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_;
+    private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_;
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
      */
     public boolean hasName() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+     * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+    public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
       return name_;
     }
 
@@ -54497,7 +54007,7 @@ public final class KotlinIr {
       symbol_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrSymbol.getDefaultInstance();
       initializer_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrExpression.getDefaultInstance();
       correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance();
-      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -54677,7 +54187,7 @@ public final class KotlinIr {
         bitField0_ = (bitField0_ & ~0x00000002);
         correspondingClass_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.IrDeclaration.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -54972,23 +54482,23 @@ public final class KotlinIr {
         return this;
       }
 
-      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+      private org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
        */
       public boolean hasName() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
        */
-      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name getName() {
+      public org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String getName() {
         return name_;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
        */
-      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder setName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -54998,23 +54508,23 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
        */
       public Builder setName(
-          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.Builder builderForValue) {
+          org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.Builder builderForValue) {
         name_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
        */
-      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name value) {
+      public Builder mergeName(org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance()) {
+            name_ != org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance()) {
           name_ =
-            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.newBuilder(name_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.newBuilder(name_).mergeFrom(value).buildPartial();
         } else {
           name_ = value;
         }
@@ -55023,10 +54533,10 @@ public final class KotlinIr {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.kotlin.backend.common.serialization.Name name = 4;</code>
+       * <code>required .org.jetbrains.kotlin.backend.common.serialization.String name = 4;</code>
        */
       public Builder clearName() {
-        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.Name.getDefaultInstance();
+        name_ = org.jetbrains.kotlin.backend.common.serialization.KotlinIr.String.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
index a0cc7f2342b..0e00c42f198 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIrLinker.kt
@@ -27,11 +27,11 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.Deserializ
 import java.io.File
 
 abstract class KotlinIrLinker(
-    currentModule: ModuleDescriptor,
     logger: LoggingContext,
     builtIns: IrBuiltIns,
     symbolTable: SymbolTable,
-    private val forwardModuleDescriptor: ModuleDescriptor?)
+    private val forwardModuleDescriptor: ModuleDescriptor?, 
+    val firstKnownBuiltinsIndex: Long)
         : IrModuleDeserializer(logger, builtIns, symbolTable),
           DescriptorUniqIdAware {
 
@@ -50,9 +50,18 @@ abstract class KotlinIrLinker(
 
     abstract protected val descriptorReferenceDeserializer: DescriptorReferenceDeserializer
 
-    private val descriptorToDirectoryMap = mutableMapOf<ModuleDescriptor, File>()
+    protected val indexAfterKnownBuiltins = loadKnownBuiltinSymbols()
 
-    private fun irDirectory(m: ModuleDescriptor): File = descriptorToDirectoryMap[m]!!
+    fun loadKnownBuiltinSymbols(): Long {
+        var currentIndex = firstKnownBuiltinsIndex
+        builtIns.knownBuiltins.forEach {
+            require(it is IrFunction)
+            deserializedSymbols.put(UniqIdKey(null, UniqId(currentIndex, isLocal = false)), it.symbol)
+            assert(symbolTable.referenceSimpleFunction(it.descriptor) == it.symbol)
+            currentIndex++
+        }
+        return currentIndex
+    }
 
     private fun referenceDeserializedSymbol(proto: KotlinIr.IrSymbolData, descriptor: DeclarationDescriptor?): IrSymbol = when (proto.kind) {
         KotlinIr.IrSymbolKind.ANONYMOUS_INIT_SYMBOL ->
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
index 37703d26e5c..ac7fd01e502 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinMangler.kt
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.descriptors.Visibility
-import org.jetbrains.kotlin.ir.backend.common.serialization.*
+import org.jetbrains.kotlin.backend.common.serialization.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol
 import org.jetbrains.kotlin.ir.types.*
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/LegacyDescriptorUtils.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/LegacyDescriptorUtils.kt
index 5888100681d..f0cb2e65b12 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/LegacyDescriptorUtils.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/LegacyDescriptorUtils.kt
@@ -21,7 +21,7 @@ internal val DeclarationDescriptor.isExpectMember: Boolean
 internal val DeclarationDescriptor.isSerializableExpectClass: Boolean
     get() = this is ClassDescriptor && ExpectedActualDeclarationChecker.shouldGenerateExpectClass(this)
 
-tailrec internal fun DeclarationDescriptor.findPackage(): PackageFragmentDescriptor {
+internal tailrec fun DeclarationDescriptor.findPackage(): PackageFragmentDescriptor {
     return if (this is PackageFragmentDescriptor) this
     else this.containingDeclaration!!.findPackage()
 }
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/UniqSymbolName.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/UniqSymbolName.kt
deleted file mode 100644
index e9e570fa130..00000000000
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/UniqSymbolName.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.ir.backend.common.serialization
-
-import org.jetbrains.kotlin.ir.declarations.*
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.Name
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt
index 71d1e79a614..f3e0b5a04e0 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt
@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
 import org.jetbrains.kotlin.utils.DFS
 import java.io.File
-import java.nio.file.Files
+import java.nio.file.Files.move
 import java.nio.file.Paths
 import java.nio.file.StandardCopyOption
 
@@ -328,7 +328,7 @@ fun serializeModuleIntoKlib(
     dependencies: List<CompiledModule>,
     moduleFragment: IrModuleFragment
 ) {
-    val declarationTable = JsDeclarationTable(moduleFragment.irBuiltins, DescriptorTable()).apply { loadKnownBuiltins() }
+    val declarationTable = JsDeclarationTable(moduleFragment.irBuiltins, DescriptorTable())
 
     val serializedIr = JsIrModuleSerializer(logggg, declarationTable).serializedIrModule(moduleFragment)
     val serializer = JsKlibMetadataSerializationUtil
@@ -355,7 +355,7 @@ fun serializeModuleIntoKlib(
 
     val irDeclarationDir = File(klibDir, declarationsDirName).also { it.mkdir() }
     val irCombinedFile = File(irDeclarationDir, "irCombined.knd")
-    Files.copy(Paths.get(serializedIr.combinedDeclarationFilePath), Paths.get(irCombinedFile.path), StandardCopyOption.REPLACE_EXISTING)
+    move(Paths.get(serializedIr.combinedDeclarationFilePath), Paths.get(irCombinedFile.path), StandardCopyOption.REPLACE_EXISTING)
 
     File(klibDir, "${moduleDescription.name}.${JsKlibMetadataSerializationUtil.CLASS_METADATA_FILE_EXTENSION}").also {
         it.writeBytes(serializedData.asByteArray())
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTable.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTable.kt
index d81d155863d..56976d1e48b 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTable.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTable.kt
@@ -11,11 +11,9 @@ class JsDeclarationTable(builtIns: IrBuiltIns, descriptorTable: DescriptorTable)
 
     override var currentIndex = 0x1_0000_0000L
 
-    private /* lateinit */ var FUNCTION_INDEX_START: Long = 0xdeadbeefL
+    private val FUNCTION_INDEX_START: Long = loadKnownBuiltins()
 
-    override fun loadKnownBuiltins() {
-        super.loadKnownBuiltins()
-        FUNCTION_INDEX_START = currentIndex
+    init {
         currentIndex += BUILT_IN_UNIQ_ID_GAP
     }
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/AnotherIrUtils.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTableUtils.kt
similarity index 100%
rename from compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/AnotherIrUtils.kt
rename to compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsDeclarationTableUtils.kt
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
index 57e35744780..a8aa1dcc46f 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/JsIrLinker.kt
@@ -18,25 +18,13 @@ class JsIrLinker(
     logger: LoggingContext,
     builtIns: IrBuiltIns,
     symbolTable: SymbolTable) :
-    KotlinIrLinker(currentModule, logger, builtIns, symbolTable, null),
+    KotlinIrLinker(logger, builtIns, symbolTable, null, 0x1_0000_0000L),
     DescriptorUniqIdAware by JsDescriptorUniqIdAware {
 
-    private val FUNCTION_INDEX_START: Long
+    private val FUNCTION_INDEX_START: Long = indexAfterKnownBuiltins
+
     val moduleToReaderMap = mutableMapOf<ModuleDescriptor, CombinedIrFileReader>()
 
-    init {
-        // TODO: think about order
-        var currentIndex = 0x1_0000_0000L
-        builtIns.knownBuiltins.forEach {
-            require(it is IrFunction)
-            deserializedSymbols.put(UniqIdKey(null, UniqId(currentIndex, isLocal = false)), it.symbol)
-            assert(symbolTable.referenceSimpleFunction(it.descriptor) == it.symbol)
-            currentIndex++
-        }
-
-        FUNCTION_INDEX_START = currentIndex
-    }
-
     override fun getPrimitiveTypeOrNull(symbol: IrClassifierSymbol, hasQuestionMark: Boolean) =
         builtIns.getPrimitiveTypeOrNullByDescriptor(symbol.descriptor, hasQuestionMark)
 
diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
index 7b5557f5319..6485e8768b1 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
@@ -58,7 +58,6 @@ val PROTO_PATHS: List<ProtoPath> = listOf(
         ProtoPath("core/metadata.jvm/src/jvm_metadata.proto"),
         ProtoPath("core/metadata.jvm/src/jvm_module.proto"),
         ProtoPath("build-common/src/java_descriptors.proto"),
-        //ProtoPath("compiler/ir/backend.js/src/ir.proto", false),
         ProtoPath("compiler/ir/backend.js/src/js.proto", false),
         ProtoPath("compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/serialization/KotlinIr.proto", false)
 )