diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java
similarity index 90%
rename from build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java
rename to build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java
index 655c1cf4ac9..a2fef2ceb47 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmPackageTable.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java
@@ -1,15 +1,15 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptors.jvm/src/jvm_package_table.debug.proto
+// source: core/descriptors.jvm/src/jvm_module.debug.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
-public final class DebugJvmPackageTable {
-  private DebugJvmPackageTable() {}
+public final class DebugJvmModuleProtoBuf {
+  private DebugJvmModuleProtoBuf() {}
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
   }
-  public interface PackageTableOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+  public interface ModuleOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.Module)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -19,7 +19,7 @@ public final class DebugJvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> 
+    java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> 
         getPackagePartsList();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
@@ -28,7 +28,7 @@ public final class DebugJvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts getPackageParts(int index);
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index);
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
      *
@@ -44,7 +44,7 @@ public final class DebugJvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
+    java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
         getPackagePartsOrBuilderList();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
@@ -53,7 +53,7 @@ public final class DebugJvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder getPackagePartsOrBuilder(
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
         int index);
 
     /**
@@ -63,7 +63,7 @@ public final class DebugJvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> 
+    java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> 
         getMetadataPartsList();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
@@ -72,7 +72,7 @@ public final class DebugJvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts getMetadataParts(int index);
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index);
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
      *
@@ -88,7 +88,7 @@ public final class DebugJvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
+    java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
         getMetadataPartsOrBuilderList();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
@@ -97,7 +97,7 @@ public final class DebugJvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
         int index);
 
     /**
@@ -140,25 +140,25 @@ public final class DebugJvmPackageTable {
         getJvmPackageNameBytes(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
    */
-  public static final class PackageTable extends
+  public static final class Module extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
-      PackageTableOrBuilder {
-    // Use PackageTable.newBuilder() to construct.
-    private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.Module)
+      ModuleOrBuilder {
+    // Use Module.newBuilder() to construct.
+    private Module(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private PackageTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private Module(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final PackageTable defaultInstance;
-    public static PackageTable getDefaultInstance() {
+    private static final Module defaultInstance;
+    public static Module getDefaultInstance() {
       return defaultInstance;
     }
 
-    public PackageTable getDefaultInstanceForType() {
+    public Module getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -168,7 +168,7 @@ public final class DebugJvmPackageTable {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private PackageTable(
+    private Module(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
@@ -193,18 +193,18 @@ public final class DebugJvmPackageTable {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts>();
+                packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              packageParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.PARSER, extensionRegistry));
+              packageParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
               break;
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts>();
+                metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts>();
                 mutable_bitField0_ |= 0x00000002;
               }
-              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.PARSER, extensionRegistry));
+              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
               break;
             }
             case 26: {
@@ -239,33 +239,33 @@ public final class DebugJvmPackageTable {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.Builder.class);
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.Builder.class);
     }
 
-    public static org.jetbrains.kotlin.protobuf.Parser<PackageTable> PARSER =
-        new org.jetbrains.kotlin.protobuf.AbstractParser<PackageTable>() {
-      public PackageTable parsePartialFrom(
+    public static org.jetbrains.kotlin.protobuf.Parser<Module> PARSER =
+        new org.jetbrains.kotlin.protobuf.AbstractParser<Module>() {
+      public Module parsePartialFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-        return new PackageTable(input, extensionRegistry);
+        return new Module(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public org.jetbrains.kotlin.protobuf.Parser<PackageTable> getParserForType() {
+    public org.jetbrains.kotlin.protobuf.Parser<Module> getParserForType() {
       return PARSER;
     }
 
     public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
-    private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_;
+    private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> packageParts_;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
      *
@@ -273,7 +273,7 @@ public final class DebugJvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> getPackagePartsList() {
+    public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> getPackagePartsList() {
       return packageParts_;
     }
     /**
@@ -283,7 +283,7 @@ public final class DebugJvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
+    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
         getPackagePartsOrBuilderList() {
       return packageParts_;
     }
@@ -304,7 +304,7 @@ public final class DebugJvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts getPackageParts(int index) {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index) {
       return packageParts_.get(index);
     }
     /**
@@ -314,13 +314,13 @@ public final class DebugJvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder getPackagePartsOrBuilder(
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
         int index) {
       return packageParts_.get(index);
     }
 
     public static final int METADATA_PARTS_FIELD_NUMBER = 2;
-    private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> metadataParts_;
+    private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> metadataParts_;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
      *
@@ -328,7 +328,7 @@ public final class DebugJvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> getMetadataPartsList() {
+    public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> getMetadataPartsList() {
       return metadataParts_;
     }
     /**
@@ -338,7 +338,7 @@ public final class DebugJvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
+    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
         getMetadataPartsOrBuilderList() {
       return metadataParts_;
     }
@@ -359,7 +359,7 @@ public final class DebugJvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts getMetadataParts(int index) {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
       return metadataParts_.get(index);
     }
     /**
@@ -369,7 +369,7 @@ public final class DebugJvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
         int index) {
       return metadataParts_.get(index);
     }
@@ -500,53 +500,53 @@ public final class DebugJvmPackageTable {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module 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.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module 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.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module 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.serialization.jvm.DebugJvmPackageTable.PackageTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module 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.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -555,7 +555,7 @@ public final class DebugJvmPackageTable {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -567,25 +567,25 @@ public final class DebugJvmPackageTable {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.Module)
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.ModuleOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.Builder.class);
+                org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -630,23 +630,23 @@ public final class DebugJvmPackageTable {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module build() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable(this);
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module(this);
         int from_bitField0_ = bitField0_;
         if (packagePartsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -676,16 +676,16 @@ public final class DebugJvmPackageTable {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.getDefaultInstance()) return this;
         if (packagePartsBuilder_ == null) {
           if (!other.packageParts_.isEmpty()) {
             if (packageParts_.isEmpty()) {
@@ -772,11 +772,11 @@ public final class DebugJvmPackageTable {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -787,17 +787,17 @@ public final class DebugJvmPackageTable {
       }
       private int bitField0_;
 
-      private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> packageParts_ =
+      private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> packageParts_ =
         java.util.Collections.emptyList();
       private void ensurePackagePartsIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts>(packageParts_);
+          packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts>(packageParts_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> packagePartsBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> packagePartsBuilder_;
 
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
@@ -806,7 +806,7 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> getPackagePartsList() {
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> getPackagePartsList() {
         if (packagePartsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(packageParts_);
         } else {
@@ -834,7 +834,7 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts getPackageParts(int index) {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index) {
         if (packagePartsBuilder_ == null) {
           return packageParts_.get(index);
         } else {
@@ -849,7 +849,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (packagePartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -870,7 +870,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
           packageParts_.set(index, builderForValue.build());
@@ -887,7 +887,7 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public Builder addPackageParts(org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts value) {
+      public Builder addPackageParts(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (packagePartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -908,7 +908,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (packagePartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -929,7 +929,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder addPackageParts(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
           packageParts_.add(builderForValue.build());
@@ -947,7 +947,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
           packageParts_.add(index, builderForValue.build());
@@ -965,7 +965,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder addAllPackageParts(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> values) {
+          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> values) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -1017,7 +1017,7 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder getPackagePartsBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder getPackagePartsBuilder(
           int index) {
         return getPackagePartsFieldBuilder().getBuilder(index);
       }
@@ -1028,7 +1028,7 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder getPackagePartsOrBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
           int index) {
         if (packagePartsBuilder_ == null) {
           return packageParts_.get(index);  } else {
@@ -1042,7 +1042,7 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
+      public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
            getPackagePartsOrBuilderList() {
         if (packagePartsBuilder_ != null) {
           return packagePartsBuilder_.getMessageOrBuilderList();
@@ -1057,9 +1057,9 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder addPackagePartsBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder() {
         return getPackagePartsFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
@@ -1068,10 +1068,10 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder addPackagePartsBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder(
           int index) {
         return getPackagePartsFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
@@ -1080,16 +1080,16 @@ public final class DebugJvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder> 
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder> 
            getPackagePartsBuilderList() {
         return getPackagePartsFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
           getPackagePartsFieldBuilder() {
         if (packagePartsBuilder_ == null) {
           packagePartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder>(
                   packageParts_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -1099,17 +1099,17 @@ public final class DebugJvmPackageTable {
         return packagePartsBuilder_;
       }
 
-      private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> metadataParts_ =
+      private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> metadataParts_ =
         java.util.Collections.emptyList();
       private void ensureMetadataPartsIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts>(metadataParts_);
+          metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts>(metadataParts_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> metadataPartsBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> metadataPartsBuilder_;
 
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
@@ -1118,7 +1118,7 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> getMetadataPartsList() {
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> getMetadataPartsList() {
         if (metadataPartsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(metadataParts_);
         } else {
@@ -1146,7 +1146,7 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts getMetadataParts(int index) {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
         if (metadataPartsBuilder_ == null) {
           return metadataParts_.get(index);
         } else {
@@ -1161,7 +1161,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (metadataPartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1182,7 +1182,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (metadataPartsBuilder_ == null) {
           ensureMetadataPartsIsMutable();
           metadataParts_.set(index, builderForValue.build());
@@ -1199,7 +1199,7 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public Builder addMetadataParts(org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts value) {
+      public Builder addMetadataParts(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (metadataPartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1220,7 +1220,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (metadataPartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1241,7 +1241,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder addMetadataParts(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (metadataPartsBuilder_ == null) {
           ensureMetadataPartsIsMutable();
           metadataParts_.add(builderForValue.build());
@@ -1259,7 +1259,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (metadataPartsBuilder_ == null) {
           ensureMetadataPartsIsMutable();
           metadataParts_.add(index, builderForValue.build());
@@ -1277,7 +1277,7 @@ public final class DebugJvmPackageTable {
        * </pre>
        */
       public Builder addAllMetadataParts(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts> values) {
+          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts> values) {
         if (metadataPartsBuilder_ == null) {
           ensureMetadataPartsIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -1329,7 +1329,7 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder getMetadataPartsBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder getMetadataPartsBuilder(
           int index) {
         return getMetadataPartsFieldBuilder().getBuilder(index);
       }
@@ -1340,7 +1340,7 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
           int index) {
         if (metadataPartsBuilder_ == null) {
           return metadataParts_.get(index);  } else {
@@ -1354,7 +1354,7 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
+      public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
            getMetadataPartsOrBuilderList() {
         if (metadataPartsBuilder_ != null) {
           return metadataPartsBuilder_.getMessageOrBuilderList();
@@ -1369,9 +1369,9 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder addMetadataPartsBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder() {
         return getMetadataPartsFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
@@ -1380,10 +1380,10 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder addMetadataPartsBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder(
           int index) {
         return getMetadataPartsFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
       }
       /**
        * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
@@ -1392,16 +1392,16 @@ public final class DebugJvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder> 
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder> 
            getMetadataPartsBuilderList() {
         return getMetadataPartsFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
           getMetadataPartsFieldBuilder() {
         if (metadataPartsBuilder_ == null) {
           metadataPartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder>(
                   metadataParts_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -1549,15 +1549,15 @@ public final class DebugJvmPackageTable {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.Module)
     }
 
     static {
-      defaultInstance = new PackageTable(true);
+      defaultInstance = new Module(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.Module)
   }
 
   public interface PackagePartsOrBuilder extends
@@ -1919,14 +1919,14 @@ public final class DebugJvmPackageTable {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder.class);
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser<PackageParts> PARSER =
@@ -2353,53 +2353,53 @@ public final class DebugJvmPackageTable {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts 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.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts 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.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts 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.serialization.jvm.DebugJvmPackageTable.PackageParts parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts 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.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2408,7 +2408,7 @@ public final class DebugJvmPackageTable {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2425,20 +2425,20 @@ public final class DebugJvmPackageTable {
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackagePartsOrBuilder {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.Builder.class);
+                org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2479,23 +2479,23 @@ public final class DebugJvmPackageTable {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts build() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts(this);
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2533,16 +2533,16 @@ public final class DebugJvmPackageTable {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance()) return this;
         if (other.hasPackageFqName()) {
           bitField0_ |= 0x00000001;
           packageFqName_ = other.packageFqName_;
@@ -2614,11 +2614,11 @@ public final class DebugJvmPackageTable {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3361,10 +3361,10 @@ public final class DebugJvmPackageTable {
   }
 
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
     internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
   private static
@@ -3379,21 +3379,20 @@ public final class DebugJvmPackageTable {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n6core/descriptors.jvm/src/jvm_package_t" +
-      "able.debug.proto\022&org.jetbrains.kotlin.s" +
-      "erialization.jvm\"\303\001\n\014PackageTable\022K\n\rpac" +
-      "kage_parts\030\001 \003(\01324.org.jetbrains.kotlin." +
-      "serialization.jvm.PackageParts\022L\n\016metada" +
-      "ta_parts\030\002 \003(\01324.org.jetbrains.kotlin.se" +
-      "rialization.jvm.PackageParts\022\030\n\020jvm_pack" +
-      "age_name\030\003 \003(\t\"\366\001\n\014PackageParts\022\027\n\017packa" +
-      "ge_fq_name\030\001 \002(\t\022\030\n\020short_class_name\030\002 \003" +
-      "(\t\022*\n\036multifile_facade_short_name_id\030\003 \003",
-      "(\005B\002\020\001\022#\n\033multifile_facade_short_name\030\004 " +
-      "\003(\t\022.\n&class_with_jvm_package_name_short" +
-      "_name\030\005 \003(\t\0222\n&class_with_jvm_package_na" +
-      "me_package_id\030\006 \003(\005B\002\020\001B\026B\024DebugJvmPacka" +
-      "geTable"
+      "\n/core/descriptors.jvm/src/jvm_module.de" +
+      "bug.proto\022&org.jetbrains.kotlin.serializ" +
+      "ation.jvm\"\275\001\n\006Module\022K\n\rpackage_parts\030\001 " +
+      "\003(\01324.org.jetbrains.kotlin.serialization" +
+      ".jvm.PackageParts\022L\n\016metadata_parts\030\002 \003(" +
+      "\01324.org.jetbrains.kotlin.serialization.j" +
+      "vm.PackageParts\022\030\n\020jvm_package_name\030\003 \003(" +
+      "\t\"\366\001\n\014PackageParts\022\027\n\017package_fq_name\030\001 " +
+      "\002(\t\022\030\n\020short_class_name\030\002 \003(\t\022*\n\036multifi" +
+      "le_facade_short_name_id\030\003 \003(\005B\002\020\001\022#\n\033mul",
+      "tifile_facade_short_name\030\004 \003(\t\022.\n&class_" +
+      "with_jvm_package_name_short_name\030\005 \003(\t\0222" +
+      "\n&class_with_jvm_package_name_package_id" +
+      "\030\006 \003(\005B\002\020\001B\030B\026DebugJvmModuleProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -3407,11 +3406,11 @@ public final class DebugJvmPackageTable {
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
         }, assigner);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor =
+    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_PackageTable_descriptor,
+        internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor,
         new java.lang.String[] { "PackageParts", "MetadataParts", "JvmPackageName", });
     internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
       getDescriptor().getMessageTypes().get(1);
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugModuleProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugModuleProtoBuf.java
new file mode 100644
index 00000000000..9368650ce2f
--- /dev/null
+++ b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugModuleProtoBuf.java
@@ -0,0 +1,3424 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/descriptors.jvm/src/jvm_module.debug.proto
+
+package org.jetbrains.kotlin.serialization.jvm;
+
+public final class DebugModuleProtoBuf {
+  private DebugModuleProtoBuf() {}
+  public static void registerAllExtensions(
+      org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
+  }
+  public interface ModuleOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.Module)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> 
+        getPackagePartsList();
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getPackageParts(int index);
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    int getPackagePartsCount();
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
+        getPackagePartsOrBuilderList();
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> 
+        getMetadataPartsList();
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getMetadataParts(int index);
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    int getMetadataPartsCount();
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
+        getMetadataPartsOrBuilderList();
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated string jvm_package_name = 3;</code>
+     *
+     * <pre>
+     * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+     * The names here are dot-separated, e.g. "org.foo.bar"
+     * </pre>
+     */
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getJvmPackageNameList();
+    /**
+     * <code>repeated string jvm_package_name = 3;</code>
+     *
+     * <pre>
+     * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+     * The names here are dot-separated, e.g. "org.foo.bar"
+     * </pre>
+     */
+    int getJvmPackageNameCount();
+    /**
+     * <code>repeated string jvm_package_name = 3;</code>
+     *
+     * <pre>
+     * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+     * The names here are dot-separated, e.g. "org.foo.bar"
+     * </pre>
+     */
+    java.lang.String getJvmPackageName(int index);
+    /**
+     * <code>repeated string jvm_package_name = 3;</code>
+     *
+     * <pre>
+     * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+     * The names here are dot-separated, e.g. "org.foo.bar"
+     * </pre>
+     */
+    org.jetbrains.kotlin.protobuf.ByteString
+        getJvmPackageNameBytes(int index);
+  }
+  /**
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
+   */
+  public static final class Module extends
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.Module)
+      ModuleOrBuilder {
+    // Use Module.newBuilder() to construct.
+    private Module(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private Module(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final Module defaultInstance;
+    public static Module getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public Module getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final org.jetbrains.kotlin.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final org.jetbrains.kotlin.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private Module(
+        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.UnknownFieldSet.Builder unknownFields =
+          org.jetbrains.kotlin.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+                packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              packageParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
+              break;
+            }
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
+              break;
+            }
+            case 26: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
+              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+                jvmPackageName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              jvmPackageName_.add(bs);
+              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 {
+        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
+          packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
+        }
+        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+          metadataParts_ = java.util.Collections.unmodifiableList(metadataParts_);
+        }
+        if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+          jvmPackageName_ = jvmPackageName_.getUnmodifiableView();
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
+    }
+
+    protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.class, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.Builder.class);
+    }
+
+    public static org.jetbrains.kotlin.protobuf.Parser<Module> PARSER =
+        new org.jetbrains.kotlin.protobuf.AbstractParser<Module>() {
+      public Module parsePartialFrom(
+          org.jetbrains.kotlin.protobuf.CodedInputStream input,
+          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
+        return new Module(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public org.jetbrains.kotlin.protobuf.Parser<Module> getParserForType() {
+      return PARSER;
+    }
+
+    public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
+    private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> packageParts_;
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> getPackagePartsList() {
+      return packageParts_;
+    }
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
+        getPackagePartsOrBuilderList() {
+      return packageParts_;
+    }
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    public int getPackagePartsCount() {
+      return packageParts_.size();
+    }
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getPackageParts(int index) {
+      return packageParts_.get(index);
+    }
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+     *
+     * <pre>
+     * Names of .class files for each package
+     * </pre>
+     */
+    public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
+        int index) {
+      return packageParts_.get(index);
+    }
+
+    public static final int METADATA_PARTS_FIELD_NUMBER = 2;
+    private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> metadataParts_;
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> getMetadataPartsList() {
+      return metadataParts_;
+    }
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
+        getMetadataPartsOrBuilderList() {
+      return metadataParts_;
+    }
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    public int getMetadataPartsCount() {
+      return metadataParts_.size();
+    }
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getMetadataParts(int index) {
+      return metadataParts_.get(index);
+    }
+    /**
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+     *
+     * <pre>
+     * Names of .kotlin_metadata files for each package
+     * </pre>
+     */
+    public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+        int index) {
+      return metadataParts_.get(index);
+    }
+
+    public static final int JVM_PACKAGE_NAME_FIELD_NUMBER = 3;
+    private org.jetbrains.kotlin.protobuf.LazyStringList jvmPackageName_;
+    /**
+     * <code>repeated string jvm_package_name = 3;</code>
+     *
+     * <pre>
+     * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+     * The names here are dot-separated, e.g. "org.foo.bar"
+     * </pre>
+     */
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getJvmPackageNameList() {
+      return jvmPackageName_;
+    }
+    /**
+     * <code>repeated string jvm_package_name = 3;</code>
+     *
+     * <pre>
+     * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+     * The names here are dot-separated, e.g. "org.foo.bar"
+     * </pre>
+     */
+    public int getJvmPackageNameCount() {
+      return jvmPackageName_.size();
+    }
+    /**
+     * <code>repeated string jvm_package_name = 3;</code>
+     *
+     * <pre>
+     * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+     * The names here are dot-separated, e.g. "org.foo.bar"
+     * </pre>
+     */
+    public java.lang.String getJvmPackageName(int index) {
+      return jvmPackageName_.get(index);
+    }
+    /**
+     * <code>repeated string jvm_package_name = 3;</code>
+     *
+     * <pre>
+     * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+     * The names here are dot-separated, e.g. "org.foo.bar"
+     * </pre>
+     */
+    public org.jetbrains.kotlin.protobuf.ByteString
+        getJvmPackageNameBytes(int index) {
+      return jvmPackageName_.getByteString(index);
+    }
+
+    private void initFields() {
+      packageParts_ = java.util.Collections.emptyList();
+      metadataParts_ = java.util.Collections.emptyList();
+      jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      for (int i = 0; i < getPackagePartsCount(); i++) {
+        if (!getPackageParts(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      for (int i = 0; i < getMetadataPartsCount(); i++) {
+        if (!getMetadataParts(i).isInitialized()) {
+          memoizedIsInitialized = 0;
+          return false;
+        }
+      }
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      for (int i = 0; i < packageParts_.size(); i++) {
+        output.writeMessage(1, packageParts_.get(i));
+      }
+      for (int i = 0; i < metadataParts_.size(); i++) {
+        output.writeMessage(2, metadataParts_.get(i));
+      }
+      for (int i = 0; i < jvmPackageName_.size(); i++) {
+        output.writeBytes(3, jvmPackageName_.getByteString(i));
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < packageParts_.size(); i++) {
+        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
+          .computeMessageSize(1, packageParts_.get(i));
+      }
+      for (int i = 0; i < metadataParts_.size(); i++) {
+        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
+          .computeMessageSize(2, metadataParts_.get(i));
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < jvmPackageName_.size(); i++) {
+          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(jvmPackageName_.getByteString(i));
+        }
+        size += dataSize;
+        size += 1 * getJvmPackageNameList().size();
+      }
+      size += getUnknownFields().getSerializedSize();
+      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.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(
+        org.jetbrains.kotlin.protobuf.ByteString data)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module 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.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(byte[] data)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module 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.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module 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.serialization.jvm.DebugModuleProtoBuf.Module parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module 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.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(
+        org.jetbrains.kotlin.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module 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.serialization.jvm.DebugModuleProtoBuf.Module prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
+     */
+    public static final class Builder extends
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.Module)
+        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.ModuleOrBuilder {
+      public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
+      }
+
+      protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.class, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.Builder.class);
+      }
+
+      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+          getPackagePartsFieldBuilder();
+          getMetadataPartsFieldBuilder();
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        if (packagePartsBuilder_ == null) {
+          packageParts_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          packagePartsBuilder_.clear();
+        }
+        if (metadataPartsBuilder_ == null) {
+          metadataParts_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          metadataPartsBuilder_.clear();
+        }
+        jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
+      }
+
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.getDefaultInstance();
+      }
+
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module build() {
+        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module result = new org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module(this);
+        int from_bitField0_ = bitField0_;
+        if (packagePartsBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) == 0x00000001)) {
+            packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.packageParts_ = packageParts_;
+        } else {
+          result.packageParts_ = packagePartsBuilder_.build();
+        }
+        if (metadataPartsBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) == 0x00000002)) {
+            metadataParts_ = java.util.Collections.unmodifiableList(metadataParts_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.metadataParts_ = metadataParts_;
+        } else {
+          result.metadataParts_ = metadataPartsBuilder_.build();
+        }
+        if (((bitField0_ & 0x00000004) == 0x00000004)) {
+          jvmPackageName_ = jvmPackageName_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.jvmPackageName_ = jvmPackageName_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.getDefaultInstance()) return this;
+        if (packagePartsBuilder_ == null) {
+          if (!other.packageParts_.isEmpty()) {
+            if (packageParts_.isEmpty()) {
+              packageParts_ = other.packageParts_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensurePackagePartsIsMutable();
+              packageParts_.addAll(other.packageParts_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.packageParts_.isEmpty()) {
+            if (packagePartsBuilder_.isEmpty()) {
+              packagePartsBuilder_.dispose();
+              packagePartsBuilder_ = null;
+              packageParts_ = other.packageParts_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              packagePartsBuilder_ = 
+                org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   getPackagePartsFieldBuilder() : null;
+            } else {
+              packagePartsBuilder_.addAllMessages(other.packageParts_);
+            }
+          }
+        }
+        if (metadataPartsBuilder_ == null) {
+          if (!other.metadataParts_.isEmpty()) {
+            if (metadataParts_.isEmpty()) {
+              metadataParts_ = other.metadataParts_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureMetadataPartsIsMutable();
+              metadataParts_.addAll(other.metadataParts_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.metadataParts_.isEmpty()) {
+            if (metadataPartsBuilder_.isEmpty()) {
+              metadataPartsBuilder_.dispose();
+              metadataPartsBuilder_ = null;
+              metadataParts_ = other.metadataParts_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              metadataPartsBuilder_ = 
+                org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
+                   getMetadataPartsFieldBuilder() : null;
+            } else {
+              metadataPartsBuilder_.addAllMessages(other.metadataParts_);
+            }
+          }
+        }
+        if (!other.jvmPackageName_.isEmpty()) {
+          if (jvmPackageName_.isEmpty()) {
+            jvmPackageName_ = other.jvmPackageName_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureJvmPackageNameIsMutable();
+            jvmPackageName_.addAll(other.jvmPackageName_);
+          }
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        for (int i = 0; i < getPackagePartsCount(); i++) {
+          if (!getPackageParts(i).isInitialized()) {
+            
+            return false;
+          }
+        }
+        for (int i = 0; i < getMetadataPartsCount(); i++) {
+          if (!getMetadataParts(i).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.serialization.jvm.DebugModuleProtoBuf.Module parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> packageParts_ =
+        java.util.Collections.emptyList();
+      private void ensurePackagePartsIsMutable() {
+        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
+          packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts>(packageParts_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> packagePartsBuilder_;
+
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> getPackagePartsList() {
+        if (packagePartsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(packageParts_);
+        } else {
+          return packagePartsBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public int getPackagePartsCount() {
+        if (packagePartsBuilder_ == null) {
+          return packageParts_.size();
+        } else {
+          return packagePartsBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getPackageParts(int index) {
+        if (packagePartsBuilder_ == null) {
+          return packageParts_.get(index);
+        } else {
+          return packagePartsBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder setPackageParts(
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
+        if (packagePartsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePackagePartsIsMutable();
+          packageParts_.set(index, value);
+          onChanged();
+        } else {
+          packagePartsBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder setPackageParts(
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
+        if (packagePartsBuilder_ == null) {
+          ensurePackagePartsIsMutable();
+          packageParts_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          packagePartsBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder addPackageParts(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
+        if (packagePartsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePackagePartsIsMutable();
+          packageParts_.add(value);
+          onChanged();
+        } else {
+          packagePartsBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder addPackageParts(
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
+        if (packagePartsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePackagePartsIsMutable();
+          packageParts_.add(index, value);
+          onChanged();
+        } else {
+          packagePartsBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder addPackageParts(
+          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
+        if (packagePartsBuilder_ == null) {
+          ensurePackagePartsIsMutable();
+          packageParts_.add(builderForValue.build());
+          onChanged();
+        } else {
+          packagePartsBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder addPackageParts(
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
+        if (packagePartsBuilder_ == null) {
+          ensurePackagePartsIsMutable();
+          packageParts_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          packagePartsBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder addAllPackageParts(
+          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> values) {
+        if (packagePartsBuilder_ == null) {
+          ensurePackagePartsIsMutable();
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, packageParts_);
+          onChanged();
+        } else {
+          packagePartsBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder clearPackageParts() {
+        if (packagePartsBuilder_ == null) {
+          packageParts_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          packagePartsBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public Builder removePackageParts(int index) {
+        if (packagePartsBuilder_ == null) {
+          ensurePackagePartsIsMutable();
+          packageParts_.remove(index);
+          onChanged();
+        } else {
+          packagePartsBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder getPackagePartsBuilder(
+          int index) {
+        return getPackagePartsFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
+          int index) {
+        if (packagePartsBuilder_ == null) {
+          return packageParts_.get(index);  } else {
+          return packagePartsBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
+           getPackagePartsOrBuilderList() {
+        if (packagePartsBuilder_ != null) {
+          return packagePartsBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(packageParts_);
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder() {
+        return getPackagePartsFieldBuilder().addBuilder(
+            org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder(
+          int index) {
+        return getPackagePartsFieldBuilder().addBuilder(
+            index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
+       *
+       * <pre>
+       * Names of .class files for each package
+       * </pre>
+       */
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder> 
+           getPackagePartsBuilderList() {
+        return getPackagePartsFieldBuilder().getBuilderList();
+      }
+      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
+          getPackagePartsFieldBuilder() {
+        if (packagePartsBuilder_ == null) {
+          packagePartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+              org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder>(
+                  packageParts_,
+                  ((bitField0_ & 0x00000001) == 0x00000001),
+                  getParentForChildren(),
+                  isClean());
+          packageParts_ = null;
+        }
+        return packagePartsBuilder_;
+      }
+
+      private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> metadataParts_ =
+        java.util.Collections.emptyList();
+      private void ensureMetadataPartsIsMutable() {
+        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+          metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts>(metadataParts_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> metadataPartsBuilder_;
+
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> getMetadataPartsList() {
+        if (metadataPartsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(metadataParts_);
+        } else {
+          return metadataPartsBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public int getMetadataPartsCount() {
+        if (metadataPartsBuilder_ == null) {
+          return metadataParts_.size();
+        } else {
+          return metadataPartsBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getMetadataParts(int index) {
+        if (metadataPartsBuilder_ == null) {
+          return metadataParts_.get(index);
+        } else {
+          return metadataPartsBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder setMetadataParts(
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
+        if (metadataPartsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMetadataPartsIsMutable();
+          metadataParts_.set(index, value);
+          onChanged();
+        } else {
+          metadataPartsBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder setMetadataParts(
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
+        if (metadataPartsBuilder_ == null) {
+          ensureMetadataPartsIsMutable();
+          metadataParts_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          metadataPartsBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder addMetadataParts(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
+        if (metadataPartsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMetadataPartsIsMutable();
+          metadataParts_.add(value);
+          onChanged();
+        } else {
+          metadataPartsBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder addMetadataParts(
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
+        if (metadataPartsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMetadataPartsIsMutable();
+          metadataParts_.add(index, value);
+          onChanged();
+        } else {
+          metadataPartsBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder addMetadataParts(
+          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
+        if (metadataPartsBuilder_ == null) {
+          ensureMetadataPartsIsMutable();
+          metadataParts_.add(builderForValue.build());
+          onChanged();
+        } else {
+          metadataPartsBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder addMetadataParts(
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
+        if (metadataPartsBuilder_ == null) {
+          ensureMetadataPartsIsMutable();
+          metadataParts_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          metadataPartsBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder addAllMetadataParts(
+          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts> values) {
+        if (metadataPartsBuilder_ == null) {
+          ensureMetadataPartsIsMutable();
+          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+              values, metadataParts_);
+          onChanged();
+        } else {
+          metadataPartsBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder clearMetadataParts() {
+        if (metadataPartsBuilder_ == null) {
+          metadataParts_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          metadataPartsBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public Builder removeMetadataParts(int index) {
+        if (metadataPartsBuilder_ == null) {
+          ensureMetadataPartsIsMutable();
+          metadataParts_.remove(index);
+          onChanged();
+        } else {
+          metadataPartsBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder getMetadataPartsBuilder(
+          int index) {
+        return getMetadataPartsFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+          int index) {
+        if (metadataPartsBuilder_ == null) {
+          return metadataParts_.get(index);  } else {
+          return metadataPartsBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
+           getMetadataPartsOrBuilderList() {
+        if (metadataPartsBuilder_ != null) {
+          return metadataPartsBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(metadataParts_);
+        }
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder() {
+        return getMetadataPartsFieldBuilder().addBuilder(
+            org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder(
+          int index) {
+        return getMetadataPartsFieldBuilder().addBuilder(
+            index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
+       *
+       * <pre>
+       * Names of .kotlin_metadata files for each package
+       * </pre>
+       */
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder> 
+           getMetadataPartsBuilderList() {
+        return getMetadataPartsFieldBuilder().getBuilderList();
+      }
+      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
+          getMetadataPartsFieldBuilder() {
+        if (metadataPartsBuilder_ == null) {
+          metadataPartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
+              org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder>(
+                  metadataParts_,
+                  ((bitField0_ & 0x00000002) == 0x00000002),
+                  getParentForChildren(),
+                  isClean());
+          metadataParts_ = null;
+        }
+        return metadataPartsBuilder_;
+      }
+
+      private org.jetbrains.kotlin.protobuf.LazyStringList jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+      private void ensureJvmPackageNameIsMutable() {
+        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+          jvmPackageName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(jvmPackageName_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
+          getJvmPackageNameList() {
+        return jvmPackageName_.getUnmodifiableView();
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public int getJvmPackageNameCount() {
+        return jvmPackageName_.size();
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public java.lang.String getJvmPackageName(int index) {
+        return jvmPackageName_.get(index);
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public org.jetbrains.kotlin.protobuf.ByteString
+          getJvmPackageNameBytes(int index) {
+        return jvmPackageName_.getByteString(index);
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public Builder setJvmPackageName(
+          int index, java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureJvmPackageNameIsMutable();
+        jvmPackageName_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public Builder addJvmPackageName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureJvmPackageNameIsMutable();
+        jvmPackageName_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public Builder addAllJvmPackageName(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureJvmPackageNameIsMutable();
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, jvmPackageName_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public Builder clearJvmPackageName() {
+        jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string jvm_package_name = 3;</code>
+       *
+       * <pre>
+       * Values of &#64;JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+       * The names here are dot-separated, e.g. "org.foo.bar"
+       * </pre>
+       */
+      public Builder addJvmPackageNameBytes(
+          org.jetbrains.kotlin.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureJvmPackageNameIsMutable();
+        jvmPackageName_.add(value);
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.Module)
+    }
+
+    static {
+      defaultInstance = new Module(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.Module)
+  }
+
+  public interface PackagePartsOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>required string package_fq_name = 1;</code>
+     */
+    boolean hasPackageFqName();
+    /**
+     * <code>required string package_fq_name = 1;</code>
+     */
+    java.lang.String getPackageFqName();
+    /**
+     * <code>required string package_fq_name = 1;</code>
+     */
+    org.jetbrains.kotlin.protobuf.ByteString
+        getPackageFqNameBytes();
+
+    /**
+     * <code>repeated string short_class_name = 2;</code>
+     *
+     * <pre>
+     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+     * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+     * </pre>
+     */
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getShortClassNameList();
+    /**
+     * <code>repeated string short_class_name = 2;</code>
+     *
+     * <pre>
+     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+     * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+     * </pre>
+     */
+    int getShortClassNameCount();
+    /**
+     * <code>repeated string short_class_name = 2;</code>
+     *
+     * <pre>
+     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+     * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+     * </pre>
+     */
+    java.lang.String getShortClassName(int index);
+    /**
+     * <code>repeated string short_class_name = 2;</code>
+     *
+     * <pre>
+     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+     * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+     * </pre>
+     */
+    org.jetbrains.kotlin.protobuf.ByteString
+        getShortClassNameBytes(int index);
+
+    /**
+     * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+     * </pre>
+     */
+    java.util.List<java.lang.Integer> getMultifileFacadeShortNameIdList();
+    /**
+     * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+     * </pre>
+     */
+    int getMultifileFacadeShortNameIdCount();
+    /**
+     * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+     * </pre>
+     */
+    int getMultifileFacadeShortNameId(int index);
+
+    /**
+     * <code>repeated string multifile_facade_short_name = 4;</code>
+     *
+     * <pre>
+     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+     * </pre>
+     */
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getMultifileFacadeShortNameList();
+    /**
+     * <code>repeated string multifile_facade_short_name = 4;</code>
+     *
+     * <pre>
+     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+     * </pre>
+     */
+    int getMultifileFacadeShortNameCount();
+    /**
+     * <code>repeated string multifile_facade_short_name = 4;</code>
+     *
+     * <pre>
+     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+     * </pre>
+     */
+    java.lang.String getMultifileFacadeShortName(int index);
+    /**
+     * <code>repeated string multifile_facade_short_name = 4;</code>
+     *
+     * <pre>
+     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+     * </pre>
+     */
+    org.jetbrains.kotlin.protobuf.ByteString
+        getMultifileFacadeShortNameBytes(int index);
+
+    /**
+     * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+     *
+     * <pre>
+     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+     * </pre>
+     */
+    org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getClassWithJvmPackageNameShortNameList();
+    /**
+     * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+     *
+     * <pre>
+     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+     * </pre>
+     */
+    int getClassWithJvmPackageNameShortNameCount();
+    /**
+     * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+     *
+     * <pre>
+     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+     * </pre>
+     */
+    java.lang.String getClassWithJvmPackageNameShortName(int index);
+    /**
+     * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+     *
+     * <pre>
+     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+     * </pre>
+     */
+    org.jetbrains.kotlin.protobuf.ByteString
+        getClassWithJvmPackageNameShortNameBytes(int index);
+
+    /**
+     * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+     * when a bunch of files from the same Kotlin package have the same JVM package name.
+     * </pre>
+     */
+    java.util.List<java.lang.Integer> getClassWithJvmPackageNamePackageIdList();
+    /**
+     * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+     * when a bunch of files from the same Kotlin package have the same JVM package name.
+     * </pre>
+     */
+    int getClassWithJvmPackageNamePackageIdCount();
+    /**
+     * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+     * when a bunch of files from the same Kotlin package have the same JVM package name.
+     * </pre>
+     */
+    int getClassWithJvmPackageNamePackageId(int index);
+  }
+  /**
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
+   */
+  public static final class PackageParts extends
+      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      PackagePartsOrBuilder {
+    // Use PackageParts.newBuilder() to construct.
+    private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private PackageParts(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final PackageParts defaultInstance;
+    public static PackageParts getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public PackageParts getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final org.jetbrains.kotlin.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final org.jetbrains.kotlin.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private PackageParts(
+        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.UnknownFieldSet.Builder unknownFields =
+          org.jetbrains.kotlin.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 10: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
+              bitField0_ |= 0x00000001;
+              packageFqName_ = bs;
+              break;
+            }
+            case 18: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
+              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+                shortClassName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              shortClassName_.add(bs);
+              break;
+            }
+            case 24: {
+              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+                multifileFacadeShortNameId_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              multifileFacadeShortNameId_.add(input.readInt32());
+              break;
+            }
+            case 26: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) {
+                multifileFacadeShortNameId_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                multifileFacadeShortNameId_.add(input.readInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 34: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
+              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+                multifileFacadeShortName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              multifileFacadeShortName_.add(bs);
+              break;
+            }
+            case 42: {
+              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
+              if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+                classWithJvmPackageNameShortName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000010;
+              }
+              classWithJvmPackageNameShortName_.add(bs);
+              break;
+            }
+            case 48: {
+              if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+                classWithJvmPackageNamePackageId_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000020;
+              }
+              classWithJvmPackageNamePackageId_.add(input.readInt32());
+              break;
+            }
+            case 50: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
+                classWithJvmPackageNamePackageId_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000020;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                classWithJvmPackageNamePackageId_.add(input.readInt32());
+              }
+              input.popLimit(limit);
+              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 {
+        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+          shortClassName_ = shortClassName_.getUnmodifiableView();
+        }
+        if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
+          multifileFacadeShortNameId_ = java.util.Collections.unmodifiableList(multifileFacadeShortNameId_);
+        }
+        if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
+          multifileFacadeShortName_ = multifileFacadeShortName_.getUnmodifiableView();
+        }
+        if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
+          classWithJvmPackageNameShortName_ = classWithJvmPackageNameShortName_.getUnmodifiableView();
+        }
+        if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
+          classWithJvmPackageNamePackageId_ = java.util.Collections.unmodifiableList(classWithJvmPackageNamePackageId_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+    }
+
+    protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder.class);
+    }
+
+    public static org.jetbrains.kotlin.protobuf.Parser<PackageParts> PARSER =
+        new org.jetbrains.kotlin.protobuf.AbstractParser<PackageParts>() {
+      public PackageParts parsePartialFrom(
+          org.jetbrains.kotlin.protobuf.CodedInputStream input,
+          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
+        return new PackageParts(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public org.jetbrains.kotlin.protobuf.Parser<PackageParts> getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
+    private java.lang.Object packageFqName_;
+    /**
+     * <code>required string package_fq_name = 1;</code>
+     */
+    public boolean hasPackageFqName() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>required string package_fq_name = 1;</code>
+     */
+    public java.lang.String getPackageFqName() {
+      java.lang.Object ref = packageFqName_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        org.jetbrains.kotlin.protobuf.ByteString bs = 
+            (org.jetbrains.kotlin.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          packageFqName_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>required string package_fq_name = 1;</code>
+     */
+    public org.jetbrains.kotlin.protobuf.ByteString
+        getPackageFqNameBytes() {
+      java.lang.Object ref = packageFqName_;
+      if (ref instanceof java.lang.String) {
+        org.jetbrains.kotlin.protobuf.ByteString b = 
+            org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        packageFqName_ = b;
+        return b;
+      } else {
+        return (org.jetbrains.kotlin.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int SHORT_CLASS_NAME_FIELD_NUMBER = 2;
+    private org.jetbrains.kotlin.protobuf.LazyStringList shortClassName_;
+    /**
+     * <code>repeated string short_class_name = 2;</code>
+     *
+     * <pre>
+     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+     * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+     * </pre>
+     */
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getShortClassNameList() {
+      return shortClassName_;
+    }
+    /**
+     * <code>repeated string short_class_name = 2;</code>
+     *
+     * <pre>
+     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+     * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+     * </pre>
+     */
+    public int getShortClassNameCount() {
+      return shortClassName_.size();
+    }
+    /**
+     * <code>repeated string short_class_name = 2;</code>
+     *
+     * <pre>
+     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+     * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+     * </pre>
+     */
+    public java.lang.String getShortClassName(int index) {
+      return shortClassName_.get(index);
+    }
+    /**
+     * <code>repeated string short_class_name = 2;</code>
+     *
+     * <pre>
+     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+     * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+     * </pre>
+     */
+    public org.jetbrains.kotlin.protobuf.ByteString
+        getShortClassNameBytes(int index) {
+      return shortClassName_.getByteString(index);
+    }
+
+    public static final int MULTIFILE_FACADE_SHORT_NAME_ID_FIELD_NUMBER = 3;
+    private java.util.List<java.lang.Integer> multifileFacadeShortNameId_;
+    /**
+     * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+     * </pre>
+     */
+    public java.util.List<java.lang.Integer>
+        getMultifileFacadeShortNameIdList() {
+      return multifileFacadeShortNameId_;
+    }
+    /**
+     * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+     * </pre>
+     */
+    public int getMultifileFacadeShortNameIdCount() {
+      return multifileFacadeShortNameId_.size();
+    }
+    /**
+     * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+     * </pre>
+     */
+    public int getMultifileFacadeShortNameId(int index) {
+      return multifileFacadeShortNameId_.get(index);
+    }
+    private int multifileFacadeShortNameIdMemoizedSerializedSize = -1;
+
+    public static final int MULTIFILE_FACADE_SHORT_NAME_FIELD_NUMBER = 4;
+    private org.jetbrains.kotlin.protobuf.LazyStringList multifileFacadeShortName_;
+    /**
+     * <code>repeated string multifile_facade_short_name = 4;</code>
+     *
+     * <pre>
+     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+     * </pre>
+     */
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getMultifileFacadeShortNameList() {
+      return multifileFacadeShortName_;
+    }
+    /**
+     * <code>repeated string multifile_facade_short_name = 4;</code>
+     *
+     * <pre>
+     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+     * </pre>
+     */
+    public int getMultifileFacadeShortNameCount() {
+      return multifileFacadeShortName_.size();
+    }
+    /**
+     * <code>repeated string multifile_facade_short_name = 4;</code>
+     *
+     * <pre>
+     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+     * </pre>
+     */
+    public java.lang.String getMultifileFacadeShortName(int index) {
+      return multifileFacadeShortName_.get(index);
+    }
+    /**
+     * <code>repeated string multifile_facade_short_name = 4;</code>
+     *
+     * <pre>
+     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+     * </pre>
+     */
+    public org.jetbrains.kotlin.protobuf.ByteString
+        getMultifileFacadeShortNameBytes(int index) {
+      return multifileFacadeShortName_.getByteString(index);
+    }
+
+    public static final int CLASS_WITH_JVM_PACKAGE_NAME_SHORT_NAME_FIELD_NUMBER = 5;
+    private org.jetbrains.kotlin.protobuf.LazyStringList classWithJvmPackageNameShortName_;
+    /**
+     * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+     *
+     * <pre>
+     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+     * </pre>
+     */
+    public org.jetbrains.kotlin.protobuf.ProtocolStringList
+        getClassWithJvmPackageNameShortNameList() {
+      return classWithJvmPackageNameShortName_;
+    }
+    /**
+     * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+     *
+     * <pre>
+     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+     * </pre>
+     */
+    public int getClassWithJvmPackageNameShortNameCount() {
+      return classWithJvmPackageNameShortName_.size();
+    }
+    /**
+     * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+     *
+     * <pre>
+     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+     * </pre>
+     */
+    public java.lang.String getClassWithJvmPackageNameShortName(int index) {
+      return classWithJvmPackageNameShortName_.get(index);
+    }
+    /**
+     * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+     *
+     * <pre>
+     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+     * </pre>
+     */
+    public org.jetbrains.kotlin.protobuf.ByteString
+        getClassWithJvmPackageNameShortNameBytes(int index) {
+      return classWithJvmPackageNameShortName_.getByteString(index);
+    }
+
+    public static final int CLASS_WITH_JVM_PACKAGE_NAME_PACKAGE_ID_FIELD_NUMBER = 6;
+    private java.util.List<java.lang.Integer> classWithJvmPackageNamePackageId_;
+    /**
+     * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+     * when a bunch of files from the same Kotlin package have the same JVM package name.
+     * </pre>
+     */
+    public java.util.List<java.lang.Integer>
+        getClassWithJvmPackageNamePackageIdList() {
+      return classWithJvmPackageNamePackageId_;
+    }
+    /**
+     * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+     * when a bunch of files from the same Kotlin package have the same JVM package name.
+     * </pre>
+     */
+    public int getClassWithJvmPackageNamePackageIdCount() {
+      return classWithJvmPackageNamePackageId_.size();
+    }
+    /**
+     * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+     *
+     * <pre>
+     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+     * when a bunch of files from the same Kotlin package have the same JVM package name.
+     * </pre>
+     */
+    public int getClassWithJvmPackageNamePackageId(int index) {
+      return classWithJvmPackageNamePackageId_.get(index);
+    }
+    private int classWithJvmPackageNamePackageIdMemoizedSerializedSize = -1;
+
+    private void initFields() {
+      packageFqName_ = "";
+      shortClassName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+      multifileFacadeShortNameId_ = java.util.Collections.emptyList();
+      multifileFacadeShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+      classWithJvmPackageNameShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+      classWithJvmPackageNamePackageId_ = java.util.Collections.emptyList();
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      if (!hasPackageFqName()) {
+        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.writeBytes(1, getPackageFqNameBytes());
+      }
+      for (int i = 0; i < shortClassName_.size(); i++) {
+        output.writeBytes(2, shortClassName_.getByteString(i));
+      }
+      if (getMultifileFacadeShortNameIdList().size() > 0) {
+        output.writeRawVarint32(26);
+        output.writeRawVarint32(multifileFacadeShortNameIdMemoizedSerializedSize);
+      }
+      for (int i = 0; i < multifileFacadeShortNameId_.size(); i++) {
+        output.writeInt32NoTag(multifileFacadeShortNameId_.get(i));
+      }
+      for (int i = 0; i < multifileFacadeShortName_.size(); i++) {
+        output.writeBytes(4, multifileFacadeShortName_.getByteString(i));
+      }
+      for (int i = 0; i < classWithJvmPackageNameShortName_.size(); i++) {
+        output.writeBytes(5, classWithJvmPackageNameShortName_.getByteString(i));
+      }
+      if (getClassWithJvmPackageNamePackageIdList().size() > 0) {
+        output.writeRawVarint32(50);
+        output.writeRawVarint32(classWithJvmPackageNamePackageIdMemoizedSerializedSize);
+      }
+      for (int i = 0; i < classWithJvmPackageNamePackageId_.size(); i++) {
+        output.writeInt32NoTag(classWithJvmPackageNamePackageId_.get(i));
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    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
+          .computeBytesSize(1, getPackageFqNameBytes());
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < shortClassName_.size(); i++) {
+          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(shortClassName_.getByteString(i));
+        }
+        size += dataSize;
+        size += 1 * getShortClassNameList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < multifileFacadeShortNameId_.size(); i++) {
+          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(multifileFacadeShortNameId_.get(i));
+        }
+        size += dataSize;
+        if (!getMultifileFacadeShortNameIdList().isEmpty()) {
+          size += 1;
+          size += org.jetbrains.kotlin.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        multifileFacadeShortNameIdMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < multifileFacadeShortName_.size(); i++) {
+          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(multifileFacadeShortName_.getByteString(i));
+        }
+        size += dataSize;
+        size += 1 * getMultifileFacadeShortNameList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < classWithJvmPackageNameShortName_.size(); i++) {
+          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
+            .computeBytesSizeNoTag(classWithJvmPackageNameShortName_.getByteString(i));
+        }
+        size += dataSize;
+        size += 1 * getClassWithJvmPackageNameShortNameList().size();
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < classWithJvmPackageNamePackageId_.size(); i++) {
+          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(classWithJvmPackageNamePackageId_.get(i));
+        }
+        size += dataSize;
+        if (!getClassWithJvmPackageNamePackageIdList().isEmpty()) {
+          size += 1;
+          size += org.jetbrains.kotlin.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        classWithJvmPackageNamePackageIdMemoizedSerializedSize = dataSize;
+      }
+      size += getUnknownFields().getSerializedSize();
+      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.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(
+        org.jetbrains.kotlin.protobuf.ByteString data)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts 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.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(byte[] data)
+        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts 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.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts 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.serialization.jvm.DebugModuleProtoBuf.PackageParts parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts 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.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(
+        org.jetbrains.kotlin.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts 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.serialization.jvm.DebugModuleProtoBuf.PackageParts prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
+     */
+    public static final class Builder extends
+        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder {
+      public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+      }
+
+      protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder.class);
+      }
+
+      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        packageFqName_ = "";
+        bitField0_ = (bitField0_ & ~0x00000001);
+        shortClassName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        multifileFacadeShortNameId_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        multifileFacadeShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        classWithJvmPackageNameShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        classWithJvmPackageNamePackageId_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+      }
+
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance();
+      }
+
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts build() {
+        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.packageFqName_ = packageFqName_;
+        if (((bitField0_ & 0x00000002) == 0x00000002)) {
+          shortClassName_ = shortClassName_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.shortClassName_ = shortClassName_;
+        if (((bitField0_ & 0x00000004) == 0x00000004)) {
+          multifileFacadeShortNameId_ = java.util.Collections.unmodifiableList(multifileFacadeShortNameId_);
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.multifileFacadeShortNameId_ = multifileFacadeShortNameId_;
+        if (((bitField0_ & 0x00000008) == 0x00000008)) {
+          multifileFacadeShortName_ = multifileFacadeShortName_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000008);
+        }
+        result.multifileFacadeShortName_ = multifileFacadeShortName_;
+        if (((bitField0_ & 0x00000010) == 0x00000010)) {
+          classWithJvmPackageNameShortName_ = classWithJvmPackageNameShortName_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000010);
+        }
+        result.classWithJvmPackageNameShortName_ = classWithJvmPackageNameShortName_;
+        if (((bitField0_ & 0x00000020) == 0x00000020)) {
+          classWithJvmPackageNamePackageId_ = java.util.Collections.unmodifiableList(classWithJvmPackageNamePackageId_);
+          bitField0_ = (bitField0_ & ~0x00000020);
+        }
+        result.classWithJvmPackageNamePackageId_ = classWithJvmPackageNamePackageId_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance()) return this;
+        if (other.hasPackageFqName()) {
+          bitField0_ |= 0x00000001;
+          packageFqName_ = other.packageFqName_;
+          onChanged();
+        }
+        if (!other.shortClassName_.isEmpty()) {
+          if (shortClassName_.isEmpty()) {
+            shortClassName_ = other.shortClassName_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureShortClassNameIsMutable();
+            shortClassName_.addAll(other.shortClassName_);
+          }
+          onChanged();
+        }
+        if (!other.multifileFacadeShortNameId_.isEmpty()) {
+          if (multifileFacadeShortNameId_.isEmpty()) {
+            multifileFacadeShortNameId_ = other.multifileFacadeShortNameId_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureMultifileFacadeShortNameIdIsMutable();
+            multifileFacadeShortNameId_.addAll(other.multifileFacadeShortNameId_);
+          }
+          onChanged();
+        }
+        if (!other.multifileFacadeShortName_.isEmpty()) {
+          if (multifileFacadeShortName_.isEmpty()) {
+            multifileFacadeShortName_ = other.multifileFacadeShortName_;
+            bitField0_ = (bitField0_ & ~0x00000008);
+          } else {
+            ensureMultifileFacadeShortNameIsMutable();
+            multifileFacadeShortName_.addAll(other.multifileFacadeShortName_);
+          }
+          onChanged();
+        }
+        if (!other.classWithJvmPackageNameShortName_.isEmpty()) {
+          if (classWithJvmPackageNameShortName_.isEmpty()) {
+            classWithJvmPackageNameShortName_ = other.classWithJvmPackageNameShortName_;
+            bitField0_ = (bitField0_ & ~0x00000010);
+          } else {
+            ensureClassWithJvmPackageNameShortNameIsMutable();
+            classWithJvmPackageNameShortName_.addAll(other.classWithJvmPackageNameShortName_);
+          }
+          onChanged();
+        }
+        if (!other.classWithJvmPackageNamePackageId_.isEmpty()) {
+          if (classWithJvmPackageNamePackageId_.isEmpty()) {
+            classWithJvmPackageNamePackageId_ = other.classWithJvmPackageNamePackageId_;
+            bitField0_ = (bitField0_ & ~0x00000020);
+          } else {
+            ensureClassWithJvmPackageNamePackageIdIsMutable();
+            classWithJvmPackageNamePackageId_.addAll(other.classWithJvmPackageNamePackageId_);
+          }
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
+        return this;
+      }
+
+      public final boolean isInitialized() {
+        if (!hasPackageFqName()) {
+          
+          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.serialization.jvm.DebugModuleProtoBuf.PackageParts parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts) e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.lang.Object packageFqName_ = "";
+      /**
+       * <code>required string package_fq_name = 1;</code>
+       */
+      public boolean hasPackageFqName() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      /**
+       * <code>required string package_fq_name = 1;</code>
+       */
+      public java.lang.String getPackageFqName() {
+        java.lang.Object ref = packageFqName_;
+        if (!(ref instanceof java.lang.String)) {
+          org.jetbrains.kotlin.protobuf.ByteString bs =
+              (org.jetbrains.kotlin.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            packageFqName_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>required string package_fq_name = 1;</code>
+       */
+      public org.jetbrains.kotlin.protobuf.ByteString
+          getPackageFqNameBytes() {
+        java.lang.Object ref = packageFqName_;
+        if (ref instanceof String) {
+          org.jetbrains.kotlin.protobuf.ByteString b = 
+              org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          packageFqName_ = b;
+          return b;
+        } else {
+          return (org.jetbrains.kotlin.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>required string package_fq_name = 1;</code>
+       */
+      public Builder setPackageFqName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        packageFqName_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required string package_fq_name = 1;</code>
+       */
+      public Builder clearPackageFqName() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        packageFqName_ = getDefaultInstance().getPackageFqName();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>required string package_fq_name = 1;</code>
+       */
+      public Builder setPackageFqNameBytes(
+          org.jetbrains.kotlin.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000001;
+        packageFqName_ = value;
+        onChanged();
+        return this;
+      }
+
+      private org.jetbrains.kotlin.protobuf.LazyStringList shortClassName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+      private void ensureShortClassNameIsMutable() {
+        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+          shortClassName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(shortClassName_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
+          getShortClassNameList() {
+        return shortClassName_.getUnmodifiableView();
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public int getShortClassNameCount() {
+        return shortClassName_.size();
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public java.lang.String getShortClassName(int index) {
+        return shortClassName_.get(index);
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public org.jetbrains.kotlin.protobuf.ByteString
+          getShortClassNameBytes(int index) {
+        return shortClassName_.getByteString(index);
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public Builder setShortClassName(
+          int index, java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureShortClassNameIsMutable();
+        shortClassName_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public Builder addShortClassName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureShortClassNameIsMutable();
+        shortClassName_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public Builder addAllShortClassName(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureShortClassNameIsMutable();
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, shortClassName_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public Builder clearShortClassName() {
+        shortClassName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string short_class_name = 2;</code>
+       *
+       * <pre>
+       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+       * Kotlin package name (i.e. it has not been changed with &#64;JvmPackageName) are listed here.
+       * </pre>
+       */
+      public Builder addShortClassNameBytes(
+          org.jetbrains.kotlin.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureShortClassNameIsMutable();
+        shortClassName_.add(value);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> multifileFacadeShortNameId_ = java.util.Collections.emptyList();
+      private void ensureMultifileFacadeShortNameIdIsMutable() {
+        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
+          multifileFacadeShortNameId_ = new java.util.ArrayList<java.lang.Integer>(multifileFacadeShortNameId_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+       * </pre>
+       */
+      public java.util.List<java.lang.Integer>
+          getMultifileFacadeShortNameIdList() {
+        return java.util.Collections.unmodifiableList(multifileFacadeShortNameId_);
+      }
+      /**
+       * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+       * </pre>
+       */
+      public int getMultifileFacadeShortNameIdCount() {
+        return multifileFacadeShortNameId_.size();
+      }
+      /**
+       * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+       * </pre>
+       */
+      public int getMultifileFacadeShortNameId(int index) {
+        return multifileFacadeShortNameId_.get(index);
+      }
+      /**
+       * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+       * </pre>
+       */
+      public Builder setMultifileFacadeShortNameId(
+          int index, int value) {
+        ensureMultifileFacadeShortNameIdIsMutable();
+        multifileFacadeShortNameId_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+       * </pre>
+       */
+      public Builder addMultifileFacadeShortNameId(int value) {
+        ensureMultifileFacadeShortNameIdIsMutable();
+        multifileFacadeShortNameId_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+       * </pre>
+       */
+      public Builder addAllMultifileFacadeShortNameId(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureMultifileFacadeShortNameIdIsMutable();
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, multifileFacadeShortNameId_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 multifile_facade_short_name_id = 3 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+       * </pre>
+       */
+      public Builder clearMultifileFacadeShortNameId() {
+        multifileFacadeShortNameId_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
+      private org.jetbrains.kotlin.protobuf.LazyStringList multifileFacadeShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+      private void ensureMultifileFacadeShortNameIsMutable() {
+        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
+          multifileFacadeShortName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(multifileFacadeShortName_);
+          bitField0_ |= 0x00000008;
+         }
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
+          getMultifileFacadeShortNameList() {
+        return multifileFacadeShortName_.getUnmodifiableView();
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public int getMultifileFacadeShortNameCount() {
+        return multifileFacadeShortName_.size();
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public java.lang.String getMultifileFacadeShortName(int index) {
+        return multifileFacadeShortName_.get(index);
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public org.jetbrains.kotlin.protobuf.ByteString
+          getMultifileFacadeShortNameBytes(int index) {
+        return multifileFacadeShortName_.getByteString(index);
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public Builder setMultifileFacadeShortName(
+          int index, java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureMultifileFacadeShortNameIsMutable();
+        multifileFacadeShortName_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public Builder addMultifileFacadeShortName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureMultifileFacadeShortNameIsMutable();
+        multifileFacadeShortName_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public Builder addAllMultifileFacadeShortName(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureMultifileFacadeShortNameIsMutable();
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, multifileFacadeShortName_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public Builder clearMultifileFacadeShortName() {
+        multifileFacadeShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string multifile_facade_short_name = 4;</code>
+       *
+       * <pre>
+       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -&gt; facade mapping.
+       * </pre>
+       */
+      public Builder addMultifileFacadeShortNameBytes(
+          org.jetbrains.kotlin.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureMultifileFacadeShortNameIsMutable();
+        multifileFacadeShortName_.add(value);
+        onChanged();
+        return this;
+      }
+
+      private org.jetbrains.kotlin.protobuf.LazyStringList classWithJvmPackageNameShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+      private void ensureClassWithJvmPackageNameShortNameIsMutable() {
+        if (!((bitField0_ & 0x00000010) == 0x00000010)) {
+          classWithJvmPackageNameShortName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(classWithJvmPackageNameShortName_);
+          bitField0_ |= 0x00000010;
+         }
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public org.jetbrains.kotlin.protobuf.ProtocolStringList
+          getClassWithJvmPackageNameShortNameList() {
+        return classWithJvmPackageNameShortName_.getUnmodifiableView();
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public int getClassWithJvmPackageNameShortNameCount() {
+        return classWithJvmPackageNameShortName_.size();
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public java.lang.String getClassWithJvmPackageNameShortName(int index) {
+        return classWithJvmPackageNameShortName_.get(index);
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public org.jetbrains.kotlin.protobuf.ByteString
+          getClassWithJvmPackageNameShortNameBytes(int index) {
+        return classWithJvmPackageNameShortName_.getByteString(index);
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public Builder setClassWithJvmPackageNameShortName(
+          int index, java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureClassWithJvmPackageNameShortNameIsMutable();
+        classWithJvmPackageNameShortName_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public Builder addClassWithJvmPackageNameShortName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureClassWithJvmPackageNameShortNameIsMutable();
+        classWithJvmPackageNameShortName_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public Builder addAllClassWithJvmPackageNameShortName(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureClassWithJvmPackageNameShortNameIsMutable();
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, classWithJvmPackageNameShortName_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public Builder clearClassWithJvmPackageNameShortName() {
+        classWithJvmPackageNameShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000010);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string class_with_jvm_package_name_short_name = 5;</code>
+       *
+       * <pre>
+       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of &#64;JvmPackageName.
+       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+       * </pre>
+       */
+      public Builder addClassWithJvmPackageNameShortNameBytes(
+          org.jetbrains.kotlin.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureClassWithJvmPackageNameShortNameIsMutable();
+        classWithJvmPackageNameShortName_.add(value);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> classWithJvmPackageNamePackageId_ = java.util.Collections.emptyList();
+      private void ensureClassWithJvmPackageNamePackageIdIsMutable() {
+        if (!((bitField0_ & 0x00000020) == 0x00000020)) {
+          classWithJvmPackageNamePackageId_ = new java.util.ArrayList<java.lang.Integer>(classWithJvmPackageNamePackageId_);
+          bitField0_ |= 0x00000020;
+         }
+      }
+      /**
+       * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+       * when a bunch of files from the same Kotlin package have the same JVM package name.
+       * </pre>
+       */
+      public java.util.List<java.lang.Integer>
+          getClassWithJvmPackageNamePackageIdList() {
+        return java.util.Collections.unmodifiableList(classWithJvmPackageNamePackageId_);
+      }
+      /**
+       * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+       * when a bunch of files from the same Kotlin package have the same JVM package name.
+       * </pre>
+       */
+      public int getClassWithJvmPackageNamePackageIdCount() {
+        return classWithJvmPackageNamePackageId_.size();
+      }
+      /**
+       * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+       * when a bunch of files from the same Kotlin package have the same JVM package name.
+       * </pre>
+       */
+      public int getClassWithJvmPackageNamePackageId(int index) {
+        return classWithJvmPackageNamePackageId_.get(index);
+      }
+      /**
+       * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+       * when a bunch of files from the same Kotlin package have the same JVM package name.
+       * </pre>
+       */
+      public Builder setClassWithJvmPackageNamePackageId(
+          int index, int value) {
+        ensureClassWithJvmPackageNamePackageIdIsMutable();
+        classWithJvmPackageNamePackageId_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+       * when a bunch of files from the same Kotlin package have the same JVM package name.
+       * </pre>
+       */
+      public Builder addClassWithJvmPackageNamePackageId(int value) {
+        ensureClassWithJvmPackageNamePackageIdIsMutable();
+        classWithJvmPackageNamePackageId_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+       * when a bunch of files from the same Kotlin package have the same JVM package name.
+       * </pre>
+       */
+      public Builder addAllClassWithJvmPackageNamePackageId(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureClassWithJvmPackageNamePackageIdIsMutable();
+        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
+            values, classWithJvmPackageNamePackageId_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];</code>
+       *
+       * <pre>
+       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+       * when a bunch of files from the same Kotlin package have the same JVM package name.
+       * </pre>
+       */
+      public Builder clearClassWithJvmPackageNamePackageId() {
+        classWithJvmPackageNamePackageId_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        onChanged();
+        return this;
+      }
+
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+    }
+
+    static {
+      defaultInstance = new PackageParts(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+  }
+
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
+  private static
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable;
+  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+  private static
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
+      internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable;
+
+  public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n/core/descriptors.jvm/src/jvm_module.de" +
+      "bug.proto\022&org.jetbrains.kotlin.serializ" +
+      "ation.jvm\"\275\001\n\006Module\022K\n\rpackage_parts\030\001 " +
+      "\003(\01324.org.jetbrains.kotlin.serialization" +
+      ".jvm.PackageParts\022L\n\016metadata_parts\030\002 \003(" +
+      "\01324.org.jetbrains.kotlin.serialization.j" +
+      "vm.PackageParts\022\030\n\020jvm_package_name\030\003 \003(" +
+      "\t\"\366\001\n\014PackageParts\022\027\n\017package_fq_name\030\001 " +
+      "\002(\t\022\030\n\020short_class_name\030\002 \003(\t\022*\n\036multifi" +
+      "le_facade_short_name_id\030\003 \003(\005B\002\020\001\022#\n\033mul",
+      "tifile_facade_short_name\030\004 \003(\t\022.\n&class_" +
+      "with_jvm_package_name_short_name\030\005 \003(\t\0222" +
+      "\n&class_with_jvm_package_name_package_id" +
+      "\030\006 \003(\005B\002\020\001B\025B\023DebugModuleProtoBuf"
+    };
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
+        }, assigner);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor,
+        new java.lang.String[] { "PackageParts", "MetadataParts", "JvmPackageName", });
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
+      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
+        new java.lang.String[] { "PackageFqName", "ShortClassName", "MultifileFacadeShortNameId", "MultifileFacadeShortName", "ClassWithJvmPackageNameShortName", "ClassWithJvmPackageNamePackageId", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
index 559c8bc7281..c7d246e81a7 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
-import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable;
+import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf;
 import org.jetbrains.org.objectweb.asm.Type;
 
 import java.io.File;
@@ -95,7 +95,7 @@ public class ClassFileFactory implements OutputFileCollection {
     }
 
     private void writeModuleMappings() {
-        JvmPackageTable.PackageTable.Builder builder = JvmPackageTable.PackageTable.newBuilder();
+        JvmModuleProtoBuf.Module.Builder builder = JvmModuleProtoBuf.Module.newBuilder();
         String outputFilePath = getMappingFileName(state.getModuleName());
 
         for (PackageParts part : ClassFileUtilsKt.addCompiledPartsAndSort(partsGroupedByPackage.values(), state)) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt
index fca92b66ba0..e64d4fef3bb 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
 import org.jetbrains.kotlin.load.kotlin.ModuleMapping
 import org.jetbrains.kotlin.load.kotlin.PackageParts
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
-import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable
+import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf
 import java.io.ByteArrayOutputStream
 
 fun ClassFileFactory.getClassFiles(): Iterable<OutputFile> {
@@ -57,7 +57,7 @@ private fun Iterable<PackageParts>.addCompiledParts(state: GenerationState): Lis
             }
 }
 
-fun JvmPackageTable.PackageTable.Builder.serializeToByteArray(): ByteArray {
+fun JvmModuleProtoBuf.Module.Builder.serializeToByteArray(): ByteArray {
     val moduleMapping = ByteArrayOutputStream(4096)
     val out = DataOutputStream(moduleMapping)
     val version = JvmMetadataVersion.INSTANCE.toArray()
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt
index 927756f17bb..6aad377fff2 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt
@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.serialization.DescriptorSerializer
 import org.jetbrains.kotlin.serialization.KotlinSerializerExtensionBase
 import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment.Companion.DOT_METADATA_FILE_EXTENSION
-import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable
+import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf
 import java.io.ByteArrayOutputStream
 import java.io.DataOutputStream
 import java.io.File
@@ -121,7 +121,7 @@ open class MetadataSerializer(private val dependOnOldBuiltIns: Boolean) {
         }
 
         val kotlinModuleFile = File(destDir, JvmCodegenUtil.getMappingFileName(JvmCodegenUtil.getModuleName(module)))
-        val packageTableBytes = JvmPackageTable.PackageTable.newBuilder().apply {
+        val packageTableBytes = JvmModuleProtoBuf.Module.newBuilder().apply {
             for (table in packageTable.values) {
                 table.addTo(this)
             }
diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/BarAsJ.kt b/compiler/testData/moduleProtoBuf/jvmPackageName/BarAsJ.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageName/BarAsJ.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageName/BarAsJ.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/BarAsJJ.kt b/compiler/testData/moduleProtoBuf/jvmPackageName/BarAsJJ.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageName/BarAsJJ.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageName/BarAsJJ.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/Foo.kt b/compiler/testData/moduleProtoBuf/jvmPackageName/Foo.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageName/Foo.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageName/Foo.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/FooAsJJJ.kt b/compiler/testData/moduleProtoBuf/jvmPackageName/FooAsJJJ.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageName/FooAsJJJ.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageName/FooAsJJJ.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/FooMultiFile.kt b/compiler/testData/moduleProtoBuf/jvmPackageName/FooMultiFile.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageName/FooMultiFile.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageName/FooMultiFile.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageName/jvm-package-table.txt b/compiler/testData/moduleProtoBuf/jvmPackageName/module-proto.txt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageName/jvm-package-table.txt
rename to compiler/testData/moduleProtoBuf/jvmPackageName/module-proto.txt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/Foo.kt b/compiler/testData/moduleProtoBuf/jvmPackageNameLanguageVersion11/Foo.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/Foo.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageNameLanguageVersion11/Foo.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/FooAsJ.kt b/compiler/testData/moduleProtoBuf/jvmPackageNameLanguageVersion11/FooAsJ.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/FooAsJ.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageNameLanguageVersion11/FooAsJ.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/jvm-package-table.txt b/compiler/testData/moduleProtoBuf/jvmPackageNameLanguageVersion11/module-proto.txt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageNameLanguageVersion11/jvm-package-table.txt
rename to compiler/testData/moduleProtoBuf/jvmPackageNameLanguageVersion11/module-proto.txt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo1.kt b/compiler/testData/moduleProtoBuf/jvmPackageNameManyParts/Foo1.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo1.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageNameManyParts/Foo1.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo2.kt b/compiler/testData/moduleProtoBuf/jvmPackageNameManyParts/Foo2.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo2.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageNameManyParts/Foo2.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo3.kt b/compiler/testData/moduleProtoBuf/jvmPackageNameManyParts/Foo3.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageNameManyParts/Foo3.kt
rename to compiler/testData/moduleProtoBuf/jvmPackageNameManyParts/Foo3.kt
diff --git a/compiler/testData/jvmPackageTable/jvmPackageNameManyParts/jvm-package-table.txt b/compiler/testData/moduleProtoBuf/jvmPackageNameManyParts/module-proto.txt
similarity index 100%
rename from compiler/testData/jvmPackageTable/jvmPackageNameManyParts/jvm-package-table.txt
rename to compiler/testData/moduleProtoBuf/jvmPackageNameManyParts/module-proto.txt
diff --git a/compiler/testData/jvmPackageTable/simple/AnotherFooMultiFilePart1.kt b/compiler/testData/moduleProtoBuf/simple/AnotherFooMultiFilePart1.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/AnotherFooMultiFilePart1.kt
rename to compiler/testData/moduleProtoBuf/simple/AnotherFooMultiFilePart1.kt
diff --git a/compiler/testData/jvmPackageTable/simple/BarFileFacade1.kt b/compiler/testData/moduleProtoBuf/simple/BarFileFacade1.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/BarFileFacade1.kt
rename to compiler/testData/moduleProtoBuf/simple/BarFileFacade1.kt
diff --git a/compiler/testData/jvmPackageTable/simple/BarMultiFilePart1.kt b/compiler/testData/moduleProtoBuf/simple/BarMultiFilePart1.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/BarMultiFilePart1.kt
rename to compiler/testData/moduleProtoBuf/simple/BarMultiFilePart1.kt
diff --git a/compiler/testData/jvmPackageTable/simple/BarMultiFilePart2.kt b/compiler/testData/moduleProtoBuf/simple/BarMultiFilePart2.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/BarMultiFilePart2.kt
rename to compiler/testData/moduleProtoBuf/simple/BarMultiFilePart2.kt
diff --git a/compiler/testData/jvmPackageTable/simple/FooFileFacade1.kt b/compiler/testData/moduleProtoBuf/simple/FooFileFacade1.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/FooFileFacade1.kt
rename to compiler/testData/moduleProtoBuf/simple/FooFileFacade1.kt
diff --git a/compiler/testData/jvmPackageTable/simple/FooFileFacade2.kt b/compiler/testData/moduleProtoBuf/simple/FooFileFacade2.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/FooFileFacade2.kt
rename to compiler/testData/moduleProtoBuf/simple/FooFileFacade2.kt
diff --git a/compiler/testData/jvmPackageTable/simple/FooMultiFilePart1.kt b/compiler/testData/moduleProtoBuf/simple/FooMultiFilePart1.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/FooMultiFilePart1.kt
rename to compiler/testData/moduleProtoBuf/simple/FooMultiFilePart1.kt
diff --git a/compiler/testData/jvmPackageTable/simple/FooMultiFilePart2.kt b/compiler/testData/moduleProtoBuf/simple/FooMultiFilePart2.kt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/FooMultiFilePart2.kt
rename to compiler/testData/moduleProtoBuf/simple/FooMultiFilePart2.kt
diff --git a/compiler/testData/jvmPackageTable/simple/jvm-package-table.txt b/compiler/testData/moduleProtoBuf/simple/module-proto.txt
similarity index 100%
rename from compiler/testData/jvmPackageTable/simple/jvm-package-table.txt
rename to compiler/testData/moduleProtoBuf/simple/module-proto.txt
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/JvmPackageTableTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt
similarity index 89%
rename from compiler/tests/org/jetbrains/kotlin/codegen/JvmPackageTableTest.kt
rename to compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt
index 569925e32e0..d1bbcb821d9 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/JvmPackageTableTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
 import java.io.File
 
-class JvmPackageTableTest : KtUsefulTestCase() {
+class JvmModuleProtoBufTest : KtUsefulTestCase() {
     private fun doTest(
             relativeDirectory: String,
             compileWith: LanguageVersion = LanguageVersion.LATEST_STABLE,
@@ -67,25 +67,25 @@ class JvmPackageTableTest : KtUsefulTestCase() {
             }
         }
 
-        KotlinTestUtils.assertEqualsToFile(File(directory, "jvm-package-table.txt"), result)
+        KotlinTestUtils.assertEqualsToFile(File(directory, "module-proto.txt"), result)
     }
 
     fun testSimple() {
-        doTest("/jvmPackageTable/simple")
+        doTest("/moduleProtoBuf/simple")
     }
 
     fun testJvmPackageName() {
-        doTest("/jvmPackageTable/jvmPackageName",
+        doTest("/moduleProtoBuf/jvmPackageName",
                compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_2)
     }
 
     fun testJvmPackageNameManyParts() {
-        doTest("/jvmPackageTable/jvmPackageNameManyParts",
+        doTest("/moduleProtoBuf/jvmPackageNameManyParts",
                compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_2)
     }
 
     fun testJvmPackageNameLanguageVersion11() {
-        doTest("/jvmPackageTable/jvmPackageNameLanguageVersion11",
+        doTest("/moduleProtoBuf/jvmPackageNameLanguageVersion11",
                compileWith = LanguageVersion.KOTLIN_1_2, loadWith = LanguageVersion.KOTLIN_1_1)
     }
 }
diff --git a/core/descriptors.jvm/src/jvm_module.proto b/core/descriptors.jvm/src/jvm_module.proto
new file mode 100644
index 00000000000..ecdc9aed2b7
--- /dev/null
+++ b/core/descriptors.jvm/src/jvm_module.proto
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.serialization.jvm;
+
+option java_outer_classname = "JvmModuleProtoBuf";
+option optimize_for = LITE_RUNTIME;
+
+message Module {
+  // Names of .class files for each package
+  repeated PackageParts package_parts = 1;
+
+  // Names of .kotlin_metadata files for each package
+  repeated PackageParts metadata_parts = 2;
+
+  // Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
+  // The names here are dot-separated, e.g. "org.foo.bar"
+  repeated string jvm_package_name = 3;
+}
+
+message PackageParts {
+  required string package_fq_name = 1;
+
+  // Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
+  // (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
+  // Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
+  repeated string short_class_name = 2;
+
+  // For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
+  // or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
+  // (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
+  repeated int32 multifile_facade_short_name_id = 3 [packed = true];
+
+  // Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
+  repeated string multifile_facade_short_name = 4;
+
+  // Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
+  // The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
+  repeated string class_with_jvm_package_name_short_name = 5;
+
+  // For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
+  // This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
+  //
+  // If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
+  // of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
+  // when a bunch of files from the same Kotlin package have the same JVM package name.
+  repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
+}
diff --git a/core/descriptors.jvm/src/jvm_package_table.proto b/core/descriptors.jvm/src/jvm_package_table.proto
deleted file mode 100644
index 8cfc89e7a5f..00000000000
--- a/core/descriptors.jvm/src/jvm_package_table.proto
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.serialization.jvm;
-
-option java_outer_classname = "JvmPackageTable";
-option optimize_for = LITE_RUNTIME;
-
-message PackageTable {
-  // Names of .class files for each package
-  repeated PackageParts package_parts = 1;
-
-  // Names of .kotlin_metadata files for each package
-  repeated PackageParts metadata_parts = 2;
-
-  // Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-  // The names here are dot-separated, e.g. "org.foo.bar"
-  repeated string jvm_package_name = 3;
-}
-
-message PackageParts {
-    required string package_fq_name = 1;
-
-    // Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-    // (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-    // Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-    repeated string short_class_name = 2;
-
-    // For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-    // or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-    // (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-    repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-
-    // Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-    repeated string multifile_facade_short_name = 4;
-
-    // Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-    // The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-    repeated string class_with_jvm_package_name_short_name = 5;
-
-    // For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-    // This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-    //
-    // If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-    // of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-    // when a bunch of files from the same Kotlin package have the same JVM package name.
-    repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-}
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
index 9071b6e2f6d..e988ca9c040 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
@@ -20,12 +20,15 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
-import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable
+import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf
 import java.io.ByteArrayInputStream
 import java.io.DataInputStream
 import java.io.IOException
 
-class ModuleMapping private constructor(val packageFqName2Parts: Map<String, PackageParts>, private val debugName: String) {
+class ModuleMapping private constructor(
+        val packageFqName2Parts: Map<String, PackageParts>,
+        private val debugName: String
+) {
     fun findPackageParts(packageFqName: String): PackageParts? {
         return packageFqName2Parts[packageFqName]
     }
@@ -63,10 +66,10 @@ class ModuleMapping private constructor(val packageFqName2Parts: Map<String, Pac
             val version = JvmMetadataVersion(*versionNumber)
 
             if (configuration.skipMetadataVersionCheck || version.isCompatible()) {
-                val table = JvmPackageTable.PackageTable.parseFrom(stream) ?: return EMPTY
+                val moduleProto = JvmModuleProtoBuf.Module.parseFrom(stream) ?: return EMPTY
                 val result = linkedMapOf<String, PackageParts>()
 
-                for (proto in table.packagePartsList) {
+                for (proto in moduleProto.packagePartsList) {
                     val packageFqName = proto.packageFqName
                     val packageParts = result.getOrPut(packageFqName) { PackageParts(packageFqName) }
 
@@ -82,13 +85,13 @@ class ModuleMapping private constructor(val packageFqName2Parts: Map<String, Pac
                             val packageId = proto.classWithJvmPackageNamePackageIdList.getOrNull(index)
                                             ?: proto.classWithJvmPackageNamePackageIdList.lastOrNull()
                                             ?: continue
-                            val jvmPackageName = table.jvmPackageNameList.getOrNull(packageId) ?: continue
+                            val jvmPackageName = moduleProto.jvmPackageNameList.getOrNull(packageId) ?: continue
                             packageParts.addPart(internalNameOf(jvmPackageName, partShortName), null)
                         }
                     }
                 }
 
-                for (proto in table.metadataPartsList) {
+                for (proto in moduleProto.metadataPartsList) {
                     val packageParts = result.getOrPut(proto.packageFqName) { PackageParts(proto.packageFqName) }
                     proto.shortClassNameList.forEach(packageParts::addMetadataPart)
                 }
@@ -127,9 +130,9 @@ class PackageParts(val packageFqName: String) {
         (metadataParts as MutableSet /* see KT-14663 */).add(shortName)
     }
 
-    fun addTo(builder: JvmPackageTable.PackageTable.Builder) {
+    fun addTo(builder: JvmModuleProtoBuf.Module.Builder) {
         if (parts.isNotEmpty()) {
-            builder.addPackageParts(JvmPackageTable.PackageParts.newBuilder().apply {
+            builder.addPackageParts(JvmModuleProtoBuf.PackageParts.newBuilder().apply {
                 packageFqName = this@PackageParts.packageFqName
 
                 val packageInternalName = packageFqName.replace('.', '/')
@@ -144,14 +147,14 @@ class PackageParts(val packageFqName: String) {
         }
 
         if (metadataParts.isNotEmpty()) {
-            builder.addMetadataParts(JvmPackageTable.PackageParts.newBuilder().apply {
+            builder.addMetadataParts(JvmModuleProtoBuf.PackageParts.newBuilder().apply {
                 packageFqName = this@PackageParts.packageFqName
                 addAllShortClassName(metadataParts.sorted())
             })
         }
     }
 
-    private fun JvmPackageTable.PackageParts.Builder.writePartsWithinPackage(parts: List<String>) {
+    private fun JvmModuleProtoBuf.PackageParts.Builder.writePartsWithinPackage(parts: List<String>) {
         val facadeNameToId = mutableMapOf<String, Int>()
         for ((facadeInternalName, partInternalNames) in parts.groupBy { getMultifileFacadeName(it) }.toSortedMap(nullsLast())) {
             for (partInternalName in partInternalNames.sorted()) {
@@ -169,9 +172,9 @@ class PackageParts(val packageFqName: String) {
     }
 
     // Writes information about package parts which have a different JVM package from the Kotlin package (with the help of @JvmPackageName)
-    private fun JvmPackageTable.PackageParts.Builder.writePartsOutsidePackage(
+    private fun JvmModuleProtoBuf.PackageParts.Builder.writePartsOutsidePackage(
             parts: List<String>,
-            packageTableBuilder: JvmPackageTable.PackageTable.Builder
+            packageTableBuilder: JvmModuleProtoBuf.Module.Builder
     ) {
         val packageIds = mutableListOf<Int>()
         for ((packageInternalName, partsInPackage) in parts.groupBy { it.packageName }.toSortedMap()) {
@@ -186,7 +189,7 @@ class PackageParts(val packageFqName: String) {
             }
         }
 
-        // See PackageParts#class_with_jvm_package_name_package_id in jvm_package_table.proto for description of this optimization
+        // See PackageParts#class_with_jvm_package_name_package_id in jvm_module.proto for description of this optimization
         while (packageIds.size > 1 && packageIds[packageIds.size - 1] == packageIds[packageIds.size - 2]) {
             packageIds.removeAt(packageIds.size - 1)
         }
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
similarity index 92%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java
rename to core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
index a60db9db991..741772d5173 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
@@ -1,15 +1,15 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptors.jvm/src/jvm_package_table.proto
+// source: core/descriptors.jvm/src/jvm_module.proto
 
 package org.jetbrains.kotlin.serialization.jvm;
 
-public final class JvmPackageTable {
-  private JvmPackageTable() {}
+public final class JvmModuleProtoBuf {
+  private JvmModuleProtoBuf() {}
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
   }
-  public interface PackageTableOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+  public interface ModuleOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.Module)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -19,7 +19,7 @@ public final class JvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> 
+    java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> 
         getPackagePartsList();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
@@ -28,7 +28,7 @@ public final class JvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts getPackageParts(int index);
+    org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index);
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
      *
@@ -45,7 +45,7 @@ public final class JvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> 
+    java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> 
         getMetadataPartsList();
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
@@ -54,7 +54,7 @@ public final class JvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts getMetadataParts(int index);
+    org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index);
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
      *
@@ -104,30 +104,30 @@ public final class JvmPackageTable {
         getJvmPackageNameBytes(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
    */
-  public static final class PackageTable extends
+  public static final class Module extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
-      PackageTableOrBuilder {
-    // Use PackageTable.newBuilder() to construct.
-    private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.Module)
+      ModuleOrBuilder {
+    // Use Module.newBuilder() to construct.
+    private Module(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private PackageTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
+    private Module(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
 
-    private static final PackageTable defaultInstance;
-    public static PackageTable getDefaultInstance() {
+    private static final Module defaultInstance;
+    public static Module getDefaultInstance() {
       return defaultInstance;
     }
 
-    public PackageTable getDefaultInstanceForType() {
+    public Module getDefaultInstanceForType() {
       return defaultInstance;
     }
 
     private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
-    private PackageTable(
+    private Module(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
@@ -155,18 +155,18 @@ public final class JvmPackageTable {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts>();
+                packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              packageParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.PARSER, extensionRegistry));
+              packageParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
               break;
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts>();
+                metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts>();
                 mutable_bitField0_ |= 0x00000002;
               }
-              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.PARSER, extensionRegistry));
+              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
               break;
             }
             case 26: {
@@ -205,23 +205,23 @@ public final class JvmPackageTable {
         makeExtensionsImmutable();
       }
     }
-    public static org.jetbrains.kotlin.protobuf.Parser<PackageTable> PARSER =
-        new org.jetbrains.kotlin.protobuf.AbstractParser<PackageTable>() {
-      public PackageTable parsePartialFrom(
+    public static org.jetbrains.kotlin.protobuf.Parser<Module> PARSER =
+        new org.jetbrains.kotlin.protobuf.AbstractParser<Module>() {
+      public Module parsePartialFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-        return new PackageTable(input, extensionRegistry);
+        return new Module(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public org.jetbrains.kotlin.protobuf.Parser<PackageTable> getParserForType() {
+    public org.jetbrains.kotlin.protobuf.Parser<Module> getParserForType() {
       return PARSER;
     }
 
     public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
-    private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_;
+    private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> packageParts_;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
      *
@@ -229,7 +229,7 @@ public final class JvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> getPackagePartsList() {
+    public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> getPackagePartsList() {
       return packageParts_;
     }
     /**
@@ -239,7 +239,7 @@ public final class JvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder> 
+    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder> 
         getPackagePartsOrBuilderList() {
       return packageParts_;
     }
@@ -260,7 +260,7 @@ public final class JvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts getPackageParts(int index) {
+    public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index) {
       return packageParts_.get(index);
     }
     /**
@@ -270,13 +270,13 @@ public final class JvmPackageTable {
      * Names of .class files for each package
      * </pre>
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder getPackagePartsOrBuilder(
+    public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
         int index) {
       return packageParts_.get(index);
     }
 
     public static final int METADATA_PARTS_FIELD_NUMBER = 2;
-    private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> metadataParts_;
+    private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> metadataParts_;
     /**
      * <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;</code>
      *
@@ -284,7 +284,7 @@ public final class JvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> getMetadataPartsList() {
+    public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> getMetadataPartsList() {
       return metadataParts_;
     }
     /**
@@ -294,7 +294,7 @@ public final class JvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder> 
+    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder> 
         getMetadataPartsOrBuilderList() {
       return metadataParts_;
     }
@@ -315,7 +315,7 @@ public final class JvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts getMetadataParts(int index) {
+    public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
       return metadataParts_.get(index);
     }
     /**
@@ -325,7 +325,7 @@ public final class JvmPackageTable {
      * Names of .kotlin_metadata files for each package
      * </pre>
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+    public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
         int index) {
       return metadataParts_.get(index);
     }
@@ -456,53 +456,53 @@ public final class JvmPackageTable {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module 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.serialization.jvm.JvmPackageTable.PackageTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module 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.serialization.jvm.JvmPackageTable.PackageTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module 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.serialization.jvm.JvmPackageTable.PackageTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module 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.serialization.jvm.JvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -511,21 +511,21 @@ public final class JvmPackageTable {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable, Builder>
+          org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.Module)
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.ModuleOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -551,20 +551,20 @@ public final class JvmPackageTable {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module build() {
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable result = new org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable(this);
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module result = new org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
@@ -584,8 +584,8 @@ public final class JvmPackageTable {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module.getDefaultInstance()) return this;
         if (!other.packageParts_.isEmpty()) {
           if (packageParts_.isEmpty()) {
             packageParts_ = other.packageParts_;
@@ -641,11 +641,11 @@ public final class JvmPackageTable {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -656,11 +656,11 @@ public final class JvmPackageTable {
       }
       private int bitField0_;
 
-      private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_ =
+      private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> packageParts_ =
         java.util.Collections.emptyList();
       private void ensurePackagePartsIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts>(packageParts_);
+          packageParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts>(packageParts_);
           bitField0_ |= 0x00000001;
          }
       }
@@ -672,7 +672,7 @@ public final class JvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> getPackagePartsList() {
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> getPackagePartsList() {
         return java.util.Collections.unmodifiableList(packageParts_);
       }
       /**
@@ -692,7 +692,7 @@ public final class JvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts getPackageParts(int index) {
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index) {
         return packageParts_.get(index);
       }
       /**
@@ -703,7 +703,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -720,7 +720,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensurePackagePartsIsMutable();
         packageParts_.set(index, builderForValue.build());
 
@@ -733,7 +733,7 @@ public final class JvmPackageTable {
        * Names of .class files for each package
        * </pre>
        */
-      public Builder addPackageParts(org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts value) {
+      public Builder addPackageParts(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -750,7 +750,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -767,7 +767,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder addPackageParts(
-          org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensurePackagePartsIsMutable();
         packageParts_.add(builderForValue.build());
 
@@ -781,7 +781,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensurePackagePartsIsMutable();
         packageParts_.add(index, builderForValue.build());
 
@@ -795,7 +795,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder addAllPackageParts(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> values) {
+          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> values) {
         ensurePackagePartsIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, packageParts_);
@@ -829,11 +829,11 @@ public final class JvmPackageTable {
         return this;
       }
 
-      private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> metadataParts_ =
+      private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> metadataParts_ =
         java.util.Collections.emptyList();
       private void ensureMetadataPartsIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts>(metadataParts_);
+          metadataParts_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts>(metadataParts_);
           bitField0_ |= 0x00000002;
          }
       }
@@ -845,7 +845,7 @@ public final class JvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> getMetadataPartsList() {
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> getMetadataPartsList() {
         return java.util.Collections.unmodifiableList(metadataParts_);
       }
       /**
@@ -865,7 +865,7 @@ public final class JvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts getMetadataParts(int index) {
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
         return metadataParts_.get(index);
       }
       /**
@@ -876,7 +876,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -893,7 +893,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensureMetadataPartsIsMutable();
         metadataParts_.set(index, builderForValue.build());
 
@@ -906,7 +906,7 @@ public final class JvmPackageTable {
        * Names of .kotlin_metadata files for each package
        * </pre>
        */
-      public Builder addMetadataParts(org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts value) {
+      public Builder addMetadataParts(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -923,7 +923,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -940,7 +940,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder addMetadataParts(
-          org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensureMetadataPartsIsMutable();
         metadataParts_.add(builderForValue.build());
 
@@ -954,7 +954,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensureMetadataPartsIsMutable();
         metadataParts_.add(index, builderForValue.build());
 
@@ -968,7 +968,7 @@ public final class JvmPackageTable {
        * </pre>
        */
       public Builder addAllMetadataParts(
-          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> values) {
+          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts> values) {
         ensureMetadataPartsIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, metadataParts_);
@@ -1140,15 +1140,15 @@ public final class JvmPackageTable {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.Module)
     }
 
     static {
-      defaultInstance = new PackageTable(true);
+      defaultInstance = new Module(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.Module)
   }
 
   public interface PackagePartsOrBuilder extends
@@ -1936,53 +1936,53 @@ public final class JvmPackageTable {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts 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.serialization.jvm.JvmPackageTable.PackageParts parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts 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.serialization.jvm.JvmPackageTable.PackageParts parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts 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.serialization.jvm.JvmPackageTable.PackageParts parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts 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.serialization.jvm.JvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1991,7 +1991,7 @@ public final class JvmPackageTable {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2001,11 +2001,11 @@ public final class JvmPackageTable {
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts, Builder>
+          org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts, Builder>
         implements
         // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.newBuilder()
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2037,20 +2037,20 @@ public final class JvmPackageTable {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts build() {
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts(this);
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2086,8 +2086,8 @@ public final class JvmPackageTable {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.getDefaultInstance()) return this;
         if (other.hasPackageFqName()) {
           bitField0_ |= 0x00000001;
           packageFqName_ = other.packageFqName_;
@@ -2160,11 +2160,11 @@ public final class JvmPackageTable {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
index 1592e167c9c..3b81eabfc88 100644
--- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
@@ -55,7 +55,7 @@ val PROTO_PATHS: List<ProtoPath> = listOf(
         ProtoPath("js/js.serializer/src/js.proto"),
         ProtoPath("js/js.serializer/src/js-ast.proto"),
         ProtoPath("core/descriptors.jvm/src/jvm_descriptors.proto"),
-        ProtoPath("core/descriptors.jvm/src/jvm_package_table.proto"),
+        ProtoPath("core/descriptors.jvm/src/jvm_module.proto"),
         ProtoPath("build-common/src/java_descriptors.proto")
 )
 
diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts
index b91e842e76b..2595f26ede7 100644
--- a/libraries/reflect/build.gradle.kts
+++ b/libraries/reflect/build.gradle.kts
@@ -1,7 +1,10 @@
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
+
+// NOTE: Rename JvmPackageTable to ModuleProtoBuf upon the next update of the bootstrap compiler
 import org.jetbrains.kotlin.serialization.jvm.JvmPackageTable
+
 import proguard.gradle.ProGuardTask
 import shadow.org.apache.tools.zip.ZipEntry
 import shadow.org.apache.tools.zip.ZipOutputStream