Rename JvmPackageTable -> JvmModuleProtoBuf, PackageTable -> Module

This protobuf message is going to contain more information about the module than just the table of package parts
2017-12-18 12:52:19 +01:00
parent 5d6d1bf182
commit ba5cc65792
34 changed files with 3806 additions and 377 deletions
@@ -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 {
+public final class DebugJvmModuleProtoBuf {
-  private DebugJvmPackageTable() {}
+  private DebugJvmModuleProtoBuf() {}
  public static void registerAllExtensions(
      org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
  }
-  public interface PackageTableOrBuilder extends
+  public interface ModuleOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      // @@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)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.Module)
-      PackageTableOrBuilder {
+      ModuleOrBuilder {
-    // Use PackageTable.newBuilder() to construct.
+    // Use Module.newBuilder() to construct.
-    private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
+    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;
+    private static final Module defaultInstance;
-    public static PackageTable getDefaultInstance() {
+    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 =
+    public static org.jetbrains.kotlin.protobuf.Parser<Module> PARSER =
-        new org.jetbrains.kotlin.protobuf.AbstractParser<PackageTable>() {
+        new org.jetbrains.kotlin.protobuf.AbstractParser<Module>() {
-      public PackageTable parsePartialFrom(
+      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)
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.Module)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTableOrBuilder {
+        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() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.getDefaultInstance();
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.getDefaultInstance();
      }
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable build() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable result = buildPartial();
+        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() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable(this);
+        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) {
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable)other);
+          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) {
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageTable.getDefaultInstance()) return this;
+        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() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.getDefaultInstance();
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance();
      }
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts build() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts result = buildPartial();
+        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() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts(this);
+        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) {
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts)other);
+          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) {
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmPackageTable.PackageParts.getDefaultInstance()) return this;
+        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" +
+      "\n/core/descriptors.jvm/src/jvm_module.de" +
-      "able.debug.proto\022&org.jetbrains.kotlin.s" +
+      "bug.proto\022&org.jetbrains.kotlin.serializ" +
-      "erialization.jvm\"\303\001\n\014PackageTable\022K\n\rpac" +
+      "ation.jvm\"\275\001\n\006Module\022K\n\rpackage_parts\030\001 " +
-      "kage_parts\030\001 \003(\01324.org.jetbrains.kotlin." +
+      "\003(\01324.org.jetbrains.kotlin.serialization" +
-      "serialization.jvm.PackageParts\022L\n\016metada" +
+      ".jvm.PackageParts\022L\n\016metadata_parts\030\002 \003(" +
-      "ta_parts\030\002 \003(\01324.org.jetbrains.kotlin.se" +
+      "\01324.org.jetbrains.kotlin.serialization.j" +
-      "rialization.jvm.PackageParts\022\030\n\020jvm_pack" +
+      "vm.PackageParts\022\030\n\020jvm_package_name\030\003 \003(" +
-      "age_name\030\003 \003(\t\"\366\001\n\014PackageParts\022\027\n\017packa" +
+      "\t\"\366\001\n\014PackageParts\022\027\n\017package_fq_name\030\001 " +
-      "ge_fq_name\030\001 \002(\t\022\030\n\020short_class_name\030\002 \003" +
+      "\002(\t\022\030\n\020short_class_name\030\002 \003(\t\022*\n\036multifi" +
-      "(\t\022*\n\036multifile_facade_short_name_id\030\003 \003",
+      "le_facade_short_name_id\030\003 \003(\005B\002\020\001\022#\n\033mul",
-      "(\005B\002\020\001\022#\n\033multifile_facade_short_name\030\004 " +
+      "tifile_facade_short_name\030\004 \003(\t\022.\n&class_" +
-      "\003(\t\022.\n&class_with_jvm_package_name_short" +
+      "with_jvm_package_name_short_name\030\005 \003(\t\0222" +
-      "_name\030\005 \003(\t\0222\n&class_with_jvm_package_na" +
+      "\n&class_with_jvm_package_name_package_id" +
-      "me_package_id\030\006 \003(\005B\002\020\001B\026B\024DebugJvmPacka" +
+      "\030\006 \003(\005B\002\020\001B\030B\026DebugJvmModuleProtoBuf"
      "geTable"
    };
    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);
@@ -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)) {
@@ -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()
@@ -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)
            }
@@ -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)
    }
 }
@@ -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];
 }
@@ -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];
 }
@@ -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)
        }
@@ -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 {
+public final class JvmModuleProtoBuf {
-  private JvmPackageTable() {}
+  private JvmModuleProtoBuf() {}
  public static void registerAllExtensions(
      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
  }
-  public interface PackageTableOrBuilder extends
+  public interface ModuleOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
+      // @@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)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.Module)
-      PackageTableOrBuilder {
+      ModuleOrBuilder {
-    // Use PackageTable.newBuilder() to construct.
+    // Use Module.newBuilder() to construct.
-    private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
+    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;
+    private static final Module defaultInstance;
-    public static PackageTable getDefaultInstance() {
+    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 =
+    public static org.jetbrains.kotlin.protobuf.Parser<Module> PARSER =
-        new org.jetbrains.kotlin.protobuf.AbstractParser<PackageTable>() {
+        new org.jetbrains.kotlin.protobuf.AbstractParser<Module>() {
-      public PackageTable parsePartialFrom(
+      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)
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.Module)
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.ModuleOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.newBuilder()
+      // 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() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.getDefaultInstance();
+        return org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module.getDefaultInstance();
      }
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable build() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable result = buildPartial();
+        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() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable result = new org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable(this);
+        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) {
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.getDefaultInstance()) return this;
+        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 {
+        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.newBuilder()
+      // 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() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.getDefaultInstance();
+        return org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.getDefaultInstance();
      }
-      public org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts build() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts result = buildPartial();
+        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() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts(this);
+        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) {
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.getDefaultInstance()) return this;
+        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) {
@@ -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")
 )
@@ -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