diff --git a/.idea/artifacts/KotlinBarePlugin.xml b/.idea/artifacts/KotlinBarePlugin.xml
index 1229a86e874..d14f328d01e 100644
--- a/.idea/artifacts/KotlinBarePlugin.xml
+++ b/.idea/artifacts/KotlinBarePlugin.xml
@@ -16,7 +16,7 @@
           <element id="module-output" name="bare-plugin" />
           <element id="module-output" name="descriptor.loader.java" />
           <element id="module-output" name="frontend.java" />
-          <element id="module-output" name="serialization.java" />
+          <element id="module-output" name="serialization.jvm" />
           <element id="module-output" name="descriptors" />
         </element>
         <element id="directory" name="jps">
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 6d1e13490e8..f123a82d416 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -25,7 +25,7 @@
           <element id="module-output" name="ide-compiler-runner" />
           <element id="module-output" name="preloader" />
           <element id="module-output" name="serialization" />
-          <element id="module-output" name="serialization.java" />
+          <element id="module-output" name="serialization.jvm" />
           <element id="module-output" name="backend-common" />
           <element id="library" level="project" name="builtins" />
           <element id="module-output" name="js.dart-ast" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index f6776a7987c..a4d5c8f1446 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -45,7 +45,7 @@
       <module fileurl="file://$PROJECT_DIR$/core/reflection.stub.jvm/reflection.stub.jvm.iml" filepath="$PROJECT_DIR$/core/reflection.stub.jvm/reflection.stub.jvm.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" filepath="$PROJECT_DIR$/core/runtime.jvm/runtime.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/core/serialization/serialization.iml" filepath="$PROJECT_DIR$/core/serialization/serialization.iml" group="core" />
-      <module fileurl="file://$PROJECT_DIR$/core/serialization.java/serialization.java.iml" filepath="$PROJECT_DIR$/core/serialization.java/serialization.java.iml" group="core" />
+      <module fileurl="file://$PROJECT_DIR$/core/serialization.jvm/serialization.jvm.iml" filepath="$PROJECT_DIR$/core/serialization.jvm/serialization.jvm.iml" group="core" />
       <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
       <module fileurl="file://$PROJECT_DIR$/core/util.runtime/util.runtime.iml" filepath="$PROJECT_DIR$/core/util.runtime/util.runtime.iml" group="core" />
     </modules>
diff --git a/build.xml b/build.xml
index a524c38f7e5..019f8f8aeb4 100644
--- a/build.xml
+++ b/build.xml
@@ -89,7 +89,7 @@
         <include name="core/descriptors/src"/>
         <include name="core/serialization/src"/>
         <include name="core/descriptor.loader.java/src"/>
-        <include name="core/serialization.java/src"/>
+        <include name="core/serialization.jvm/src"/>
         <include name="core/util.runtime/src"/>
         <include name="compiler/frontend/src"/>
         <include name="compiler/frontend.java/src"/>
@@ -114,7 +114,7 @@
         <include name="serialization/**"/>
         <include name="descriptor.loader.java/**"/>
         <include name="frontend.java/**"/>
-        <include name="serialization.java/**"/>
+        <include name="serialization.jvm/**"/>
         <include name="backend/**"/>
         <include name="backend-common/**"/>
         <include name="cli/**"/>
@@ -178,7 +178,7 @@
             <fileset dir="core/descriptors/src"/>
             <fileset dir="core/descriptor.loader.java/src"/>
             <fileset dir="core/serialization/src"/>
-            <fileset dir="core/serialization.java/src"/>
+            <fileset dir="core/serialization.jvm/src"/>
             <fileset dir="core/util.runtime/src"/>
             <fileset dir="compiler/frontend/src"/>
             <fileset dir="compiler/frontend.java/src"/>
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
index e1b5acf9ea7..5ebf18aedfa 100644
--- a/compiler/backend/backend.iml
+++ b/compiler/backend/backend.iml
@@ -13,9 +13,8 @@
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="library" name="protobuf-java" level="project" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend-common" exported="" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 0e3e1ae0157..1aea1e62a68 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.context.*;
 import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
-import org.jetbrains.jet.descriptors.serialization.BitEncoding;
+import org.jetbrains.kotlin.serialization.jvm.BitEncoding;
 import org.jetbrains.jet.descriptors.serialization.ClassData;
 import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
@@ -234,7 +234,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return;
 
         DescriptorSerializer serializer =
-                DescriptorSerializer.create(descriptor, new JavaSerializerExtension(v.getSerializationBindings()));
+                DescriptorSerializer.create(descriptor, new JvmSerializerExtension(v.getSerializationBindings()));
 
         ProtoBuf.Class classProto = serializer.classProto(descriptor).build();
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JavaSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java
similarity index 80%
rename from compiler/backend/src/org/jetbrains/kotlin/codegen/JavaSerializerExtension.java
rename to compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java
index d3465ac56be..8de3bf801f1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JavaSerializerExtension.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java
@@ -19,13 +19,17 @@ package org.jetbrains.kotlin.codegen;
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.*;
+import org.jetbrains.jet.descriptors.serialization.NameResolver;
+import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.jet.descriptors.serialization.SerializerExtension;
+import org.jetbrains.jet.descriptors.serialization.StringTable;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPropertyDescriptor;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.kotlin.SignatureDeserializer;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
 import org.jetbrains.org.objectweb.asm.Type;
 import org.jetbrains.org.objectweb.asm.commons.Method;
 
@@ -33,10 +37,10 @@ import java.util.Arrays;
 
 import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*;
 
-public class JavaSerializerExtension extends SerializerExtension {
+public class JvmSerializerExtension extends SerializerExtension {
     private final JvmSerializationBindings bindings;
 
-    public JavaSerializerExtension(@NotNull JvmSerializationBindings bindings) {
+    public JvmSerializerExtension(@NotNull JvmSerializationBindings bindings) {
         this.bindings = bindings;
     }
 
@@ -58,7 +62,7 @@ public class JavaSerializerExtension extends SerializerExtension {
     ) {
         Integer index = bindings.get(INDEX_FOR_VALUE_PARAMETER, descriptor);
         if (index != null) {
-            proto.setExtension(JavaProtoBuf.index, index);
+            proto.setExtension(JvmProtoBuf.index, index);
         }
     }
 
@@ -69,18 +73,18 @@ public class JavaSerializerExtension extends SerializerExtension {
     ) {
         SignatureSerializer signatureSerializer = new SignatureSerializer(stringTable);
         if (callable instanceof FunctionDescriptor) {
-            JavaProtoBuf.JavaMethodSignature signature;
+            JvmProtoBuf.JvmMethodSignature signature;
             if (callable instanceof DeserializedSimpleFunctionDescriptor) {
                 DeserializedSimpleFunctionDescriptor deserialized = (DeserializedSimpleFunctionDescriptor) callable;
                 signature = signatureSerializer.copyMethodSignature(
-                        deserialized.getProto().getExtension(JavaProtoBuf.methodSignature), deserialized.getNameResolver());
+                        deserialized.getProto().getExtension(JvmProtoBuf.methodSignature), deserialized.getNameResolver());
             }
             else {
                 Method method = bindings.get(METHOD_FOR_FUNCTION, (FunctionDescriptor) callable);
                 signature = method != null ? signatureSerializer.methodSignature(method) : null;
             }
             if (signature != null) {
-                proto.setExtension(JavaProtoBuf.methodSignature, signature);
+                proto.setExtension(JvmProtoBuf.methodSignature, signature);
             }
         }
         else if (callable instanceof PropertyDescriptor) {
@@ -109,11 +113,11 @@ public class JavaSerializerExtension extends SerializerExtension {
                 syntheticMethod = bindings.get(SYNTHETIC_METHOD_FOR_PROPERTY, property);
             }
 
-            JavaProtoBuf.JavaPropertySignature signature;
+            JvmProtoBuf.JvmPropertySignature signature;
             if (callable instanceof DeserializedPropertyDescriptor) {
                 DeserializedPropertyDescriptor deserializedCallable = (DeserializedPropertyDescriptor) callable;
                 signature = signatureSerializer.copyPropertySignature(
-                        deserializedCallable.getProto().getExtension(JavaProtoBuf.propertySignature),
+                        deserializedCallable.getProto().getExtension(JvmProtoBuf.propertySignature),
                         deserializedCallable.getNameResolver()
                 );
             }
@@ -121,7 +125,7 @@ public class JavaSerializerExtension extends SerializerExtension {
                 signature = signatureSerializer
                         .propertySignature(fieldType, fieldName, isStaticInOuter, syntheticMethod, getterMethod, setterMethod);
             }
-            proto.setExtension(JavaProtoBuf.propertySignature, signature);
+            proto.setExtension(JvmProtoBuf.propertySignature, signature);
         }
     }
 
@@ -132,7 +136,7 @@ public class JavaSerializerExtension extends SerializerExtension {
     ) {
         String name = bindings.get(IMPL_CLASS_NAME_FOR_CALLABLE, callable);
         if (name != null) {
-            proto.setExtension(JavaProtoBuf.implClassName, stringTable.getSimpleNameIndex(Name.identifier(name)));
+            proto.setExtension(JvmProtoBuf.implClassName, stringTable.getSimpleNameIndex(Name.identifier(name)));
         }
     }
 
@@ -144,8 +148,8 @@ public class JavaSerializerExtension extends SerializerExtension {
         }
 
         @NotNull
-        public JavaProtoBuf.JavaMethodSignature copyMethodSignature(
-                @NotNull JavaProtoBuf.JavaMethodSignature signature,
+        public JvmProtoBuf.JvmMethodSignature copyMethodSignature(
+                @NotNull JvmProtoBuf.JvmMethodSignature signature,
                 @NotNull NameResolver nameResolver
         ) {
             String method = new SignatureDeserializer(nameResolver).methodSignatureString(signature);
@@ -153,8 +157,8 @@ public class JavaSerializerExtension extends SerializerExtension {
         }
 
         @NotNull
-        public JavaProtoBuf.JavaMethodSignature methodSignature(@NotNull Method method) {
-            JavaProtoBuf.JavaMethodSignature.Builder signature = JavaProtoBuf.JavaMethodSignature.newBuilder();
+        public JvmProtoBuf.JvmMethodSignature methodSignature(@NotNull Method method) {
+            JvmProtoBuf.JvmMethodSignature.Builder signature = JvmProtoBuf.JvmMethodSignature.newBuilder();
 
             signature.setName(stringTable.getStringIndex(method.getName()));
 
@@ -168,8 +172,8 @@ public class JavaSerializerExtension extends SerializerExtension {
         }
 
         @NotNull
-        public JavaProtoBuf.JavaPropertySignature copyPropertySignature(
-                @NotNull JavaProtoBuf.JavaPropertySignature signature,
+        public JvmProtoBuf.JvmPropertySignature copyPropertySignature(
+                @NotNull JvmProtoBuf.JvmPropertySignature signature,
                 @NotNull NameResolver nameResolver
         ) {
             Type fieldType;
@@ -177,7 +181,7 @@ public class JavaSerializerExtension extends SerializerExtension {
             boolean isStaticInOuter;
             SignatureDeserializer signatureDeserializer = new SignatureDeserializer(nameResolver);
             if (signature.hasField()) {
-                JavaProtoBuf.JavaFieldSignature field = signature.getField();
+                JvmProtoBuf.JvmFieldSignature field = signature.getField();
                 fieldType = Type.getType(signatureDeserializer.typeDescriptor(field.getType()));
                 fieldName = nameResolver.getName(field.getName()).asString();
                 isStaticInOuter = field.getIsStaticInOuter();
@@ -199,7 +203,7 @@ public class JavaSerializerExtension extends SerializerExtension {
         }
 
         @NotNull
-        public JavaProtoBuf.JavaPropertySignature propertySignature(
+        public JvmProtoBuf.JvmPropertySignature propertySignature(
                 @Nullable Type fieldType,
                 @Nullable String fieldName,
                 boolean isStaticInOuter,
@@ -207,7 +211,7 @@ public class JavaSerializerExtension extends SerializerExtension {
                 @Nullable Method getter,
                 @Nullable Method setter
         ) {
-            JavaProtoBuf.JavaPropertySignature.Builder signature = JavaProtoBuf.JavaPropertySignature.newBuilder();
+            JvmProtoBuf.JvmPropertySignature.Builder signature = JvmProtoBuf.JvmPropertySignature.newBuilder();
 
             if (fieldType != null) {
                 assert fieldName != null : "Field name shouldn't be null when there's a field type: " + fieldType;
@@ -229,8 +233,8 @@ public class JavaSerializerExtension extends SerializerExtension {
         }
 
         @NotNull
-        public JavaProtoBuf.JavaFieldSignature fieldSignature(@NotNull Type type, @NotNull String name, boolean isStaticInOuter) {
-            JavaProtoBuf.JavaFieldSignature.Builder signature = JavaProtoBuf.JavaFieldSignature.newBuilder();
+        public JvmProtoBuf.JvmFieldSignature fieldSignature(@NotNull Type type, @NotNull String name, boolean isStaticInOuter) {
+            JvmProtoBuf.JvmFieldSignature.Builder signature = JvmProtoBuf.JvmFieldSignature.newBuilder();
             signature.setName(stringTable.getStringIndex(name));
             signature.setType(type(type));
             if (isStaticInOuter) {
@@ -240,8 +244,8 @@ public class JavaSerializerExtension extends SerializerExtension {
         }
 
         @NotNull
-        public JavaProtoBuf.JavaType type(@NotNull Type givenType) {
-            JavaProtoBuf.JavaType.Builder builder = JavaProtoBuf.JavaType.newBuilder();
+        public JvmProtoBuf.JvmType type(@NotNull Type givenType) {
+            JvmProtoBuf.JvmType.Builder builder = JvmProtoBuf.JvmType.newBuilder();
 
             int arrayDimension = 0;
             Type type = givenType;
@@ -258,7 +262,7 @@ public class JavaSerializerExtension extends SerializerExtension {
                 builder.setClassFqName(stringTable.getFqNameIndex(fqName));
             }
             else {
-                builder.setPrimitiveType(JavaProtoBuf.JavaType.PrimitiveType.valueOf(type.getSort()));
+                builder.setPrimitiveType(JvmProtoBuf.JvmType.PrimitiveType.valueOf(type.getSort()));
             }
 
             return builder.build();
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
index 65c80024aaf..2ec8eb0da56 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.codegen.context.MethodContext;
 import org.jetbrains.kotlin.codegen.context.PackageContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.config.IncrementalCompilation;
-import org.jetbrains.jet.descriptors.serialization.BitEncoding;
+import org.jetbrains.kotlin.serialization.jvm.BitEncoding;
 import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer;
 import org.jetbrains.jet.descriptors.serialization.PackageData;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
@@ -272,7 +272,7 @@ public class PackageCodegen {
             if (file.isScript()) return;
         }
 
-        DescriptorSerializer serializer = DescriptorSerializer.createTopLevel(new JavaSerializerExtension(bindings));
+        DescriptorSerializer serializer = DescriptorSerializer.createTopLevel(new JvmSerializerExtension(bindings));
         Collection<PackageFragmentDescriptor> packageFragments = Lists.newArrayList();
         ContainerUtil.addIfNotNull(packageFragments, packageFragment);
         ContainerUtil.addIfNotNull(packageFragments, compiledPackageFragment);
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
index 196004ae50c..84125246e41 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.context.CodegenContext;
 import org.jetbrains.kotlin.codegen.context.PackageContext;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -105,10 +105,10 @@ public class InlineCodegenUtil {
         DeclarationDescriptor parentDeclaration = deserializedDescriptor.getContainingDeclaration();
         if (parentDeclaration instanceof PackageFragmentDescriptor) {
             ProtoBuf.Callable proto = deserializedDescriptor.getProto();
-            if (!proto.hasExtension(JavaProtoBuf.implClassName)) {
+            if (!proto.hasExtension(JvmProtoBuf.implClassName)) {
                 throw new IllegalStateException("Function in namespace should have implClassName property in proto: " + deserializedDescriptor);
             }
-            Name name = deserializedDescriptor.getNameResolver().getName(proto.getExtension(JavaProtoBuf.implClassName));
+            Name name = deserializedDescriptor.getNameResolver().getName(proto.getExtension(JvmProtoBuf.implClassName));
             FqName packagePartFqName =
                     PackageClassUtils.getPackageClassFqName(((PackageFragmentDescriptor) parentDeclaration).getFqName()).parent().child(
                             name);
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
index 538d9373f1f..5da42806451 100644
--- a/compiler/cli/cli.iml
+++ b/compiler/cli/cli.iml
@@ -18,6 +18,6 @@
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="backend-common" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
   </component>
 </module>
\ No newline at end of file
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
index d4fba2ed50c..3c7fdc31aa0 100644
--- a/compiler/frontend.java/frontend.java.iml
+++ b/compiler/frontend.java/frontend.java.iml
@@ -11,10 +11,9 @@
     <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="descriptor.loader.java" exported="" />
     <orderEntry type="module" module-name="util.runtime" />
     <orderEntry type="module" module-name="util" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java
index cc6a8750dff..4f146f74a9a 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.PathUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
@@ -86,7 +86,7 @@ public class PackagePartClassUtils {
     @NotNull
     public static FqName getPackagePartFqName(@NotNull DeserializedCallableMemberDescriptor callable) {
         FqName packageFqName = ((PackageFragmentDescriptor) callable.getContainingDeclaration()).getFqName();
-        return packageFqName.child(callable.getNameResolver().getName(callable.getProto().getExtension(JavaProtoBuf.implClassName)));
+        return packageFqName.child(callable.getNameResolver().getName(callable.getProto().getExtension(JvmProtoBuf.implClassName)));
     }
 
     @NotNull
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt
index 30263d72f00..f04c780b320 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt
@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope
 import org.jetbrains.jet.descriptors.serialization.*
+import org.jetbrains.kotlin.serialization.jvm.*
 import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
 import org.jetbrains.kotlin.storage.NotNullLazyValue
@@ -101,7 +102,7 @@ public class IncrementalPackageFragmentProvider(
                     JetScope.Empty
                 }
                 else {
-                    IncrementalPackageScope(JavaProtoBufUtil.readPackageDataFrom(packageDataBytes))
+                    IncrementalPackageScope(JvmProtoBufUtil.readPackageDataFrom(packageDataBytes))
                 }
             }
         }
@@ -116,8 +117,8 @@ public class IncrementalPackageFragmentProvider(
                 return allMemberProtos
                         .filter {
                             member ->
-                            if (member.hasExtension(JavaProtoBuf.implClassName)) {
-                                val shortName = packageData.getNameResolver().getName(member.getExtension(JavaProtoBuf.implClassName)!!)
+                            if (member.hasExtension(JvmProtoBuf.implClassName)) {
+                                val shortName = packageData.getNameResolver().getName(member.getExtension(JvmProtoBuf.implClassName)!!)
                                 val internalName = JvmClassName.byFqNameWithoutInnerClasses(fqName.child(shortName)).getInternalName()
                                 internalName !in packagePartsToNotLoadFromCache
                             }
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
index 19d6cacf19e..249cccb288b 100644
--- a/compiler/tests/compiler-tests.iml
+++ b/compiler/tests/compiler-tests.iml
@@ -16,7 +16,7 @@
     <orderEntry type="library" name="idea-full" level="project" />
     <orderEntry type="library" name="dx-android" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="builtins-serializer" />
     <orderEntry type="module" module-name="js.frontend" />
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
index b0c923d8a38..d0cb359c5e6 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.descriptors.serialization.ClassData;
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
@@ -54,7 +54,7 @@ public class KotlinClassAnnotationTest extends CodegenTestCase {
 
         String[] data = (String[]) CodegenTestUtil.getAnnotationAttribute(kotlinClass, "data");
         assertNotNull(data);
-        ClassData classData = JavaProtoBufUtil.readClassDataFrom(data);
+        ClassData classData = JvmProtoBufUtil.readClassDataFrom(data);
 
         Set<String> callableNames = collectCallableNames(classData.getClassProto().getMemberList(), classData.getNameResolver());
         assertSameElements(Arrays.asList("foo", "bar"), callableNames);
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
index caa1f1d42bc..438fc7010e7 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
 import org.jetbrains.jet.descriptors.serialization.NameResolver;
 import org.jetbrains.jet.descriptors.serialization.PackageData;
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
@@ -60,7 +60,7 @@ public class KotlinPackageAnnotationTest extends CodegenTestCase {
 
         String[] data = (String[]) CodegenTestUtil.getAnnotationAttribute(kotlinPackage, "data");
         assertNotNull(data);
-        PackageData packageData = JavaProtoBufUtil.readPackageDataFrom(data);
+        PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data);
 
         Set<String> callableNames = collectCallableNames(packageData.getPackageProto().getMemberList(), packageData.getNameResolver());
         assertSameElements(callableNames, Arrays.asList("foo", "bar"));
diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BitEncodingTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/BitEncodingTest.java
similarity index 90%
rename from compiler/tests/org/jetbrains/jet/descriptors/serialization/BitEncodingTest.java
rename to compiler/tests/org/jetbrains/kotlin/serialization/jvm/BitEncodingTest.java
index 6f6635821bf..57328247f11 100644
--- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BitEncodingTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/BitEncodingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * 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.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.jvm;
 
 import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Random;
 
-import static org.jetbrains.jet.descriptors.serialization.BitEncoding.decodeBytes;
-import static org.jetbrains.jet.descriptors.serialization.BitEncoding.encodeBytes;
+import static org.jetbrains.kotlin.serialization.jvm.BitEncoding.decodeBytes;
+import static org.jetbrains.kotlin.serialization.jvm.BitEncoding.encodeBytes;
 import static org.junit.Assert.assertArrayEquals;
 
 public class BitEncodingTest extends UsefulTestCase {
diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
similarity index 58%
rename from compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java
rename to compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
index 6fa69b02566..ccb0c13aa60 100644
--- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
@@ -1,23 +1,23 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization.java/src/java_descriptors.debug.proto
+// source: core/serialization.jvm/src/jvm_descriptors.debug.proto
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.jvm;
 
-public final class DebugJavaProtoBuf {
-  private DebugJavaProtoBuf() {}
+public final class DebugJvmProtoBuf {
+  private DebugJvmProtoBuf() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
-    registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.methodSignature);
-    registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.propertySignature);
-    registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.implClassName);
-    registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.index);
+    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.methodSignature);
+    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.propertySignature);
+    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.implClassName);
+    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.index);
   }
-  public interface JavaTypeOrBuilder
+  public interface JvmTypeOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
      *
      * <pre>
      * One of these should be present
@@ -25,13 +25,13 @@ public final class DebugJavaProtoBuf {
      */
     boolean hasPrimitiveType();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
      *
      * <pre>
      * One of these should be present
      * </pre>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType getPrimitiveType();
 
     // optional int32 class_fq_name = 2;
     /**
@@ -54,24 +54,24 @@ public final class DebugJavaProtoBuf {
     int getArrayDimension();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaType}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmType}
    */
-  public static final class JavaType extends
+  public static final class JvmType extends
       com.google.protobuf.GeneratedMessage
-      implements JavaTypeOrBuilder {
-    // Use JavaType.newBuilder() to construct.
-    private JavaType(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements JvmTypeOrBuilder {
+    // Use JvmType.newBuilder() to construct.
+    private JvmType(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private JavaType(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private JvmType(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final JavaType defaultInstance;
-    public static JavaType getDefaultInstance() {
+    private static final JvmType defaultInstance;
+    public static JvmType getDefaultInstance() {
       return defaultInstance;
     }
 
-    public JavaType getDefaultInstanceForType() {
+    public JvmType getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -81,7 +81,7 @@ public final class DebugJavaProtoBuf {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private JavaType(
+    private JvmType(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -106,7 +106,7 @@ public final class DebugJavaProtoBuf {
             }
             case 8: {
               int rawValue = input.readEnum();
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType value = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.valueOf(rawValue);
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType value = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -139,33 +139,33 @@ public final class DebugJavaProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor;
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder.class);
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<JavaType> PARSER =
-        new com.google.protobuf.AbstractParser<JavaType>() {
-      public JavaType parsePartialFrom(
+    public static com.google.protobuf.Parser<JvmType> PARSER =
+        new com.google.protobuf.AbstractParser<JvmType>() {
+      public JvmType parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JavaType(input, extensionRegistry);
+        return new JvmType(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<JavaType> getParserForType() {
+    public com.google.protobuf.Parser<JvmType> getParserForType() {
       return PARSER;
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType}
      */
     public enum PrimitiveType
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -292,7 +292,7 @@ public final class DebugJavaProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final PrimitiveType[] VALUES = values();
@@ -314,15 +314,15 @@ public final class DebugJavaProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType)
     }
 
     private int bitField0_;
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;
     public static final int PRIMITIVE_TYPE_FIELD_NUMBER = 1;
-    private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType primitiveType_;
+    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType primitiveType_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
      *
      * <pre>
      * One of these should be present
@@ -332,13 +332,13 @@ public final class DebugJavaProtoBuf {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
      *
      * <pre>
      * One of these should be present
      * </pre>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType getPrimitiveType() {
       return primitiveType_;
     }
 
@@ -375,7 +375,7 @@ public final class DebugJavaProtoBuf {
     }
 
     private void initFields() {
-      primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID;
+      primitiveType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType.VOID;
       classFqName_ = 0;
       arrayDimension_ = 0;
     }
@@ -433,53 +433,53 @@ public final class DebugJavaProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -488,7 +488,7 @@ public final class DebugJavaProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -500,24 +500,24 @@ public final class DebugJavaProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaType}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmType}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder {
+       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder.class);
+                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -537,7 +537,7 @@ public final class DebugJavaProtoBuf {
 
       public Builder clear() {
         super.clear();
-        primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID;
+        primitiveType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType.VOID;
         bitField0_ = (bitField0_ & ~0x00000001);
         classFqName_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -552,23 +552,23 @@ public final class DebugJavaProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType build() {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType build() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType(this);
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -589,16 +589,16 @@ public final class DebugJavaProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance()) return this;
         if (other.hasPrimitiveType()) {
           setPrimitiveType(other.getPrimitiveType());
         }
@@ -620,11 +620,11 @@ public final class DebugJavaProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -635,10 +635,10 @@ public final class DebugJavaProtoBuf {
       }
       private int bitField0_;
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;
-      private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID;
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;
+      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType primitiveType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType.VOID;
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
        *
        * <pre>
        * One of these should be present
@@ -648,23 +648,23 @@ public final class DebugJavaProtoBuf {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
        *
        * <pre>
        * One of these should be present
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType getPrimitiveType() {
         return primitiveType_;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
        *
        * <pre>
        * One of these should be present
        * </pre>
        */
-      public Builder setPrimitiveType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType value) {
+      public Builder setPrimitiveType(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -674,7 +674,7 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
        *
        * <pre>
        * One of these should be present
@@ -682,7 +682,7 @@ public final class DebugJavaProtoBuf {
        */
       public Builder clearPrimitiveType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID;
+        primitiveType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType.VOID;
         onChanged();
         return this;
       }
@@ -753,18 +753,18 @@ public final class DebugJavaProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaType)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmType)
     }
 
     static {
-      defaultInstance = new JavaType(true);
+      defaultInstance = new JvmType(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaType)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmType)
   }
 
-  public interface JavaMethodSignatureOrBuilder
+  public interface JvmMethodSignatureOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
     // required int32 name = 1;
@@ -777,64 +777,64 @@ public final class DebugJavaProtoBuf {
      */
     int getName();
 
-    // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;
+    // required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
     boolean hasReturnType();
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getReturnType();
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getReturnTypeOrBuilder();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;
+    // repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    java.util.List<org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType> 
+    java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType> 
         getParameterTypeList();
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index);
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getParameterType(int index);
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
     int getParameterTypeCount();
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    java.util.List<? extends org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> 
+    java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> 
         getParameterTypeOrBuilderList();
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder(
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getParameterTypeOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaMethodSignature}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
    */
-  public static final class JavaMethodSignature extends
+  public static final class JvmMethodSignature extends
       com.google.protobuf.GeneratedMessage
-      implements JavaMethodSignatureOrBuilder {
-    // Use JavaMethodSignature.newBuilder() to construct.
-    private JavaMethodSignature(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements JvmMethodSignatureOrBuilder {
+    // Use JvmMethodSignature.newBuilder() to construct.
+    private JvmMethodSignature(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private JavaMethodSignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private JvmMethodSignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final JavaMethodSignature defaultInstance;
-    public static JavaMethodSignature getDefaultInstance() {
+    private static final JvmMethodSignature defaultInstance;
+    public static JvmMethodSignature getDefaultInstance() {
       return defaultInstance;
     }
 
-    public JavaMethodSignature getDefaultInstanceForType() {
+    public JvmMethodSignature getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -844,7 +844,7 @@ public final class DebugJavaProtoBuf {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private JavaMethodSignature(
+    private JvmMethodSignature(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -873,11 +873,11 @@ public final class DebugJavaProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = returnType_.toBuilder();
               }
-              returnType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry);
+              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(returnType_);
                 returnType_ = subBuilder.buildPartial();
@@ -887,10 +887,10 @@ public final class DebugJavaProtoBuf {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                parameterType_ = new java.util.ArrayList<org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType>();
+                parameterType_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType>();
                 mutable_bitField0_ |= 0x00000004;
               }
-              parameterType_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry));
+              parameterType_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PARSER, extensionRegistry));
               break;
             }
           }
@@ -910,28 +910,28 @@ public final class DebugJavaProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor;
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder.class);
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<JavaMethodSignature> PARSER =
-        new com.google.protobuf.AbstractParser<JavaMethodSignature>() {
-      public JavaMethodSignature parsePartialFrom(
+    public static com.google.protobuf.Parser<JvmMethodSignature> PARSER =
+        new com.google.protobuf.AbstractParser<JvmMethodSignature>() {
+      public JvmMethodSignature parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JavaMethodSignature(input, extensionRegistry);
+        return new JvmMethodSignature(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<JavaMethodSignature> getParserForType() {
+    public com.google.protobuf.Parser<JvmMethodSignature> getParserForType() {
       return PARSER;
     }
 
@@ -952,67 +952,67 @@ public final class DebugJavaProtoBuf {
       return name_;
     }
 
-    // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;
+    // required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;
     public static final int RETURN_TYPE_FIELD_NUMBER = 2;
-    private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType returnType_;
+    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType returnType_;
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
     public boolean hasReturnType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getReturnType() {
       return returnType_;
     }
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getReturnTypeOrBuilder() {
       return returnType_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;
+    // repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;
     public static final int PARAMETER_TYPE_FIELD_NUMBER = 3;
-    private java.util.List<org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType> parameterType_;
+    private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType> parameterType_;
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    public java.util.List<org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType> getParameterTypeList() {
+    public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType> getParameterTypeList() {
       return parameterType_;
     }
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    public java.util.List<? extends org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> 
+    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> 
         getParameterTypeOrBuilderList() {
       return parameterType_;
     }
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
     public int getParameterTypeCount() {
       return parameterType_.size();
     }
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index) {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getParameterType(int index) {
       return parameterType_.get(index);
     }
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder(
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getParameterTypeOrBuilder(
         int index) {
       return parameterType_.get(index);
     }
 
     private void initFields() {
       name_ = 0;
-      returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+      returnType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
       parameterType_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -1077,53 +1077,53 @@ public final class DebugJavaProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1132,7 +1132,7 @@ public final class DebugJavaProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1144,24 +1144,24 @@ public final class DebugJavaProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaMethodSignature}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder {
+       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder.class);
+                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1186,7 +1186,7 @@ public final class DebugJavaProtoBuf {
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+          returnType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
         } else {
           returnTypeBuilder_.clear();
         }
@@ -1206,23 +1206,23 @@ public final class DebugJavaProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature build() {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature build() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature(this);
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1252,16 +1252,16 @@ public final class DebugJavaProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -1314,11 +1314,11 @@ public final class DebugJavaProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1362,20 +1362,20 @@ public final class DebugJavaProtoBuf {
         return this;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;
-      private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+      // required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;
+      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType returnType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> returnTypeBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> returnTypeBuilder_;
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
       public boolean hasReturnType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getReturnType() {
         if (returnTypeBuilder_ == null) {
           return returnType_;
         } else {
@@ -1383,9 +1383,9 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
-      public Builder setReturnType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) {
+      public Builder setReturnType(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType value) {
         if (returnTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1399,10 +1399,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
       public Builder setReturnType(
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder builderForValue) {
         if (returnTypeBuilder_ == null) {
           returnType_ = builderForValue.build();
           onChanged();
@@ -1413,14 +1413,14 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
-      public Builder mergeReturnType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) {
+      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType value) {
         if (returnTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              returnType_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) {
+              returnType_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance()) {
             returnType_ =
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder(returnType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.newBuilder(returnType_).mergeFrom(value).buildPartial();
           } else {
             returnType_ = value;
           }
@@ -1432,11 +1432,11 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
       public Builder clearReturnType() {
         if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+          returnType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
           onChanged();
         } else {
           returnTypeBuilder_.clear();
@@ -1445,17 +1445,17 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getReturnTypeBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder getReturnTypeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getReturnTypeFieldBuilder().getBuilder();
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getReturnTypeOrBuilder() {
         if (returnTypeBuilder_ != null) {
           return returnTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -1463,14 +1463,14 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> 
           getReturnTypeFieldBuilder() {
         if (returnTypeBuilder_ == null) {
           returnTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder>(
                   returnType_,
                   getParentForChildren(),
                   isClean());
@@ -1479,23 +1479,23 @@ public final class DebugJavaProtoBuf {
         return returnTypeBuilder_;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;
-      private java.util.List<org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType> parameterType_ =
+      // repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;
+      private java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType> parameterType_ =
         java.util.Collections.emptyList();
       private void ensureParameterTypeIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          parameterType_ = new java.util.ArrayList<org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType>(parameterType_);
+          parameterType_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType>(parameterType_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> parameterTypeBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> parameterTypeBuilder_;
 
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public java.util.List<org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType> getParameterTypeList() {
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType> getParameterTypeList() {
         if (parameterTypeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(parameterType_);
         } else {
@@ -1503,7 +1503,7 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public int getParameterTypeCount() {
         if (parameterTypeBuilder_ == null) {
@@ -1513,9 +1513,9 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index) {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getParameterType(int index) {
         if (parameterTypeBuilder_ == null) {
           return parameterType_.get(index);
         } else {
@@ -1523,10 +1523,10 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder setParameterType(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType value) {
         if (parameterTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1540,10 +1540,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder setParameterType(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder builderForValue) {
         if (parameterTypeBuilder_ == null) {
           ensureParameterTypeIsMutable();
           parameterType_.set(index, builderForValue.build());
@@ -1554,9 +1554,9 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public Builder addParameterType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) {
+      public Builder addParameterType(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType value) {
         if (parameterTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1570,10 +1570,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder addParameterType(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType value) {
         if (parameterTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1587,10 +1587,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder addParameterType(
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder builderForValue) {
         if (parameterTypeBuilder_ == null) {
           ensureParameterTypeIsMutable();
           parameterType_.add(builderForValue.build());
@@ -1601,10 +1601,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder addParameterType(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder builderForValue) {
         if (parameterTypeBuilder_ == null) {
           ensureParameterTypeIsMutable();
           parameterType_.add(index, builderForValue.build());
@@ -1615,10 +1615,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder addAllParameterType(
-          java.lang.Iterable<? extends org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType> values) {
+          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType> values) {
         if (parameterTypeBuilder_ == null) {
           ensureParameterTypeIsMutable();
           super.addAll(values, parameterType_);
@@ -1629,7 +1629,7 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder clearParameterType() {
         if (parameterTypeBuilder_ == null) {
@@ -1642,7 +1642,7 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder removeParameterType(int index) {
         if (parameterTypeBuilder_ == null) {
@@ -1655,16 +1655,16 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getParameterTypeBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder getParameterTypeBuilder(
           int index) {
         return getParameterTypeFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getParameterTypeOrBuilder(
           int index) {
         if (parameterTypeBuilder_ == null) {
           return parameterType_.get(index);  } else {
@@ -1672,9 +1672,9 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public java.util.List<? extends org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> 
+      public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> 
            getParameterTypeOrBuilderList() {
         if (parameterTypeBuilder_ != null) {
           return parameterTypeBuilder_.getMessageOrBuilderList();
@@ -1683,33 +1683,33 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder addParameterTypeBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder addParameterTypeBuilder() {
         return getParameterTypeFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder addParameterTypeBuilder(
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder addParameterTypeBuilder(
           int index) {
         return getParameterTypeFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance());
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public java.util.List<org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder> 
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder> 
            getParameterTypeBuilderList() {
         return getParameterTypeFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> 
           getParameterTypeFieldBuilder() {
         if (parameterTypeBuilder_ == null) {
           parameterTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder>(
                   parameterType_,
                   ((bitField0_ & 0x00000004) == 0x00000004),
                   getParentForChildren(),
@@ -1719,18 +1719,18 @@ public final class DebugJavaProtoBuf {
         return parameterTypeBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaMethodSignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
     }
 
     static {
-      defaultInstance = new JavaMethodSignature(true);
+      defaultInstance = new JvmMethodSignature(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaMethodSignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
   }
 
-  public interface JavaFieldSignatureOrBuilder
+  public interface JvmFieldSignatureOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
     // required int32 name = 1;
@@ -1743,19 +1743,19 @@ public final class DebugJavaProtoBuf {
      */
     int getName();
 
-    // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;
+    // required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
     boolean hasType();
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getType();
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getTypeOrBuilder();
 
     // optional bool is_static_in_outer = 3 [default = false];
     /**
@@ -1778,24 +1778,24 @@ public final class DebugJavaProtoBuf {
     boolean getIsStaticInOuter();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaFieldSignature}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
    */
-  public static final class JavaFieldSignature extends
+  public static final class JvmFieldSignature extends
       com.google.protobuf.GeneratedMessage
-      implements JavaFieldSignatureOrBuilder {
-    // Use JavaFieldSignature.newBuilder() to construct.
-    private JavaFieldSignature(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements JvmFieldSignatureOrBuilder {
+    // Use JvmFieldSignature.newBuilder() to construct.
+    private JvmFieldSignature(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private JavaFieldSignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private JvmFieldSignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final JavaFieldSignature defaultInstance;
-    public static JavaFieldSignature getDefaultInstance() {
+    private static final JvmFieldSignature defaultInstance;
+    public static JvmFieldSignature getDefaultInstance() {
       return defaultInstance;
     }
 
-    public JavaFieldSignature getDefaultInstanceForType() {
+    public JvmFieldSignature getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -1805,7 +1805,7 @@ public final class DebugJavaProtoBuf {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private JavaFieldSignature(
+    private JvmFieldSignature(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1834,11 +1834,11 @@ public final class DebugJavaProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = type_.toBuilder();
               }
-              type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry);
+              type_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(type_);
                 type_ = subBuilder.buildPartial();
@@ -1865,28 +1865,28 @@ public final class DebugJavaProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor;
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder.class);
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<JavaFieldSignature> PARSER =
-        new com.google.protobuf.AbstractParser<JavaFieldSignature>() {
-      public JavaFieldSignature parsePartialFrom(
+    public static com.google.protobuf.Parser<JvmFieldSignature> PARSER =
+        new com.google.protobuf.AbstractParser<JvmFieldSignature>() {
+      public JvmFieldSignature parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JavaFieldSignature(input, extensionRegistry);
+        return new JvmFieldSignature(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<JavaFieldSignature> getParserForType() {
+    public com.google.protobuf.Parser<JvmFieldSignature> getParserForType() {
       return PARSER;
     }
 
@@ -1907,25 +1907,25 @@ public final class DebugJavaProtoBuf {
       return name_;
     }
 
-    // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;
+    // required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;
     public static final int TYPE_FIELD_NUMBER = 2;
-    private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType type_;
+    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType type_;
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getType() {
       return type_;
     }
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getTypeOrBuilder() {
       return type_;
     }
 
@@ -1957,7 +1957,7 @@ public final class DebugJavaProtoBuf {
 
     private void initFields() {
       name_ = 0;
-      type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+      type_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
       isStaticInOuter_ = false;
     }
     private byte memoizedIsInitialized = -1;
@@ -2022,53 +2022,53 @@ public final class DebugJavaProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2077,7 +2077,7 @@ public final class DebugJavaProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2089,24 +2089,24 @@ public final class DebugJavaProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaFieldSignature}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder {
+       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder.class);
+                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2130,7 +2130,7 @@ public final class DebugJavaProtoBuf {
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (typeBuilder_ == null) {
-          type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
         } else {
           typeBuilder_.clear();
         }
@@ -2146,23 +2146,23 @@ public final class DebugJavaProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature build() {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature build() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature(this);
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2187,16 +2187,16 @@ public final class DebugJavaProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -2226,11 +2226,11 @@ public final class DebugJavaProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2274,20 +2274,20 @@ public final class DebugJavaProtoBuf {
         return this;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;
-      private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+      // required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;
+      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType type_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> typeBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> typeBuilder_;
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType getType() {
         if (typeBuilder_ == null) {
           return type_;
         } else {
@@ -2295,9 +2295,9 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
-      public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) {
+      public Builder setType(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType value) {
         if (typeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2311,10 +2311,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
       public Builder setType(
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder builderForValue) {
         if (typeBuilder_ == null) {
           type_ = builderForValue.build();
           onChanged();
@@ -2325,14 +2325,14 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
-      public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) {
+      public Builder mergeType(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType value) {
         if (typeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              type_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) {
+              type_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance()) {
             type_ =
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder(type_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.newBuilder(type_).mergeFrom(value).buildPartial();
           } else {
             type_ = value;
           }
@@ -2344,11 +2344,11 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
       public Builder clearType() {
         if (typeBuilder_ == null) {
-          type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.getDefaultInstance();
           onChanged();
         } else {
           typeBuilder_.clear();
@@ -2357,17 +2357,17 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getTypeBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder getTypeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getTypeFieldBuilder().getBuilder();
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder getTypeOrBuilder() {
         if (typeBuilder_ != null) {
           return typeBuilder_.getMessageOrBuilder();
         } else {
@@ -2375,14 +2375,14 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder> 
           getTypeFieldBuilder() {
         if (typeBuilder_ == null) {
           typeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmTypeOrBuilder>(
                   type_,
                   getParentForChildren(),
                   isClean());
@@ -2444,23 +2444,23 @@ public final class DebugJavaProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaFieldSignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
     }
 
     static {
-      defaultInstance = new JavaFieldSignature(true);
+      defaultInstance = new JvmFieldSignature(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaFieldSignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
   }
 
-  public interface JavaPropertySignatureOrBuilder
+  public interface JvmPropertySignatureOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
@@ -2469,27 +2469,27 @@ public final class DebugJavaProtoBuf {
      */
     boolean hasField();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
      * If the property is annotated, then either field or synthetic_method should be present
      * </pre>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature getField();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
      * If the property is annotated, then either field or synthetic_method should be present
      * </pre>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
@@ -2497,69 +2497,69 @@ public final class DebugJavaProtoBuf {
      */
     boolean hasSyntheticMethod();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
      * </pre>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
      * </pre>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
     boolean hasGetter();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
     boolean hasSetter();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder();
+    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaPropertySignature}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
    */
-  public static final class JavaPropertySignature extends
+  public static final class JvmPropertySignature extends
       com.google.protobuf.GeneratedMessage
-      implements JavaPropertySignatureOrBuilder {
-    // Use JavaPropertySignature.newBuilder() to construct.
-    private JavaPropertySignature(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+      implements JvmPropertySignatureOrBuilder {
+    // Use JvmPropertySignature.newBuilder() to construct.
+    private JvmPropertySignature(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
-    private JavaPropertySignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+    private JvmPropertySignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
 
-    private static final JavaPropertySignature defaultInstance;
-    public static JavaPropertySignature getDefaultInstance() {
+    private static final JvmPropertySignature defaultInstance;
+    public static JvmPropertySignature getDefaultInstance() {
       return defaultInstance;
     }
 
-    public JavaPropertySignature getDefaultInstanceForType() {
+    public JvmPropertySignature getDefaultInstanceForType() {
       return defaultInstance;
     }
 
@@ -2569,7 +2569,7 @@ public final class DebugJavaProtoBuf {
         getUnknownFields() {
       return this.unknownFields;
     }
-    private JavaPropertySignature(
+    private JvmPropertySignature(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2593,11 +2593,11 @@ public final class DebugJavaProtoBuf {
               break;
             }
             case 10: {
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = field_.toBuilder();
               }
-              field_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.PARSER, extensionRegistry);
+              field_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(field_);
                 field_ = subBuilder.buildPartial();
@@ -2606,11 +2606,11 @@ public final class DebugJavaProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = syntheticMethod_.toBuilder();
               }
-              syntheticMethod_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry);
+              syntheticMethod_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(syntheticMethod_);
                 syntheticMethod_ = subBuilder.buildPartial();
@@ -2619,11 +2619,11 @@ public final class DebugJavaProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = getter_.toBuilder();
               }
-              getter_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry);
+              getter_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(getter_);
                 getter_ = subBuilder.buildPartial();
@@ -2632,11 +2632,11 @@ public final class DebugJavaProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = setter_.toBuilder();
               }
-              setter_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry);
+              setter_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(setter_);
                 setter_ = subBuilder.buildPartial();
@@ -2658,37 +2658,37 @@ public final class DebugJavaProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor;
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.Builder.class);
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.Builder.class);
     }
 
-    public static com.google.protobuf.Parser<JavaPropertySignature> PARSER =
-        new com.google.protobuf.AbstractParser<JavaPropertySignature>() {
-      public JavaPropertySignature parsePartialFrom(
+    public static com.google.protobuf.Parser<JvmPropertySignature> PARSER =
+        new com.google.protobuf.AbstractParser<JvmPropertySignature>() {
+      public JvmPropertySignature parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JavaPropertySignature(input, extensionRegistry);
+        return new JvmPropertySignature(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<JavaPropertySignature> getParserForType() {
+    public com.google.protobuf.Parser<JvmPropertySignature> getParserForType() {
       return PARSER;
     }
 
     private int bitField0_;
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
     public static final int FIELD_FIELD_NUMBER = 1;
-    private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature field_;
+    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
@@ -2699,33 +2699,33 @@ public final class DebugJavaProtoBuf {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
      * If the property is annotated, then either field or synthetic_method should be present
      * </pre>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature getField() {
       return field_;
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
      * If the property is annotated, then either field or synthetic_method should be present
      * </pre>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder() {
       return field_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
     public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2;
-    private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature syntheticMethod_;
+    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
@@ -2735,75 +2735,75 @@ public final class DebugJavaProtoBuf {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
      * </pre>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
       return syntheticMethod_;
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
      * </pre>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder() {
       return syntheticMethod_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
     public static final int GETTER_FIELD_NUMBER = 3;
-    private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getter_;
+    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
     public boolean hasGetter() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter() {
       return getter_;
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder() {
       return getter_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
     public static final int SETTER_FIELD_NUMBER = 4;
-    private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature setter_;
+    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
     public boolean hasSetter() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter() {
       return setter_;
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder() {
+    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder() {
       return setter_;
     }
 
     private void initFields() {
-      field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance();
-      syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
-      getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
-      setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+      syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2890,53 +2890,53 @@ public final class DebugJavaProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2945,7 +2945,7 @@ public final class DebugJavaProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2957,24 +2957,24 @@ public final class DebugJavaProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaPropertySignature}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignatureOrBuilder {
+       implements org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.Builder.class);
+                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2999,25 +2999,25 @@ public final class DebugJavaProtoBuf {
       public Builder clear() {
         super.clear();
         if (fieldBuilder_ == null) {
-          field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance();
+          field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
         } else {
           fieldBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
         if (syntheticMethodBuilder_ == null) {
-          syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+          syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         } else {
           syntheticMethodBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
         if (getterBuilder_ == null) {
-          getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+          getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         } else {
           getterBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
         if (setterBuilder_ == null) {
-          setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+          setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         } else {
           setterBuilder_.clear();
         }
@@ -3031,23 +3031,23 @@ public final class DebugJavaProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor;
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature build() {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature build() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature(this);
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3088,16 +3088,16 @@ public final class DebugJavaProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance()) return this;
         if (other.hasField()) {
           mergeField(other.getField());
         }
@@ -3146,11 +3146,11 @@ public final class DebugJavaProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3161,12 +3161,12 @@ public final class DebugJavaProtoBuf {
       }
       private int bitField0_;
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;
-      private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder> fieldBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> fieldBuilder_;
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
@@ -3177,14 +3177,14 @@ public final class DebugJavaProtoBuf {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
        * If the property is annotated, then either field or synthetic_method should be present
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature getField() {
         if (fieldBuilder_ == null) {
           return field_;
         } else {
@@ -3192,14 +3192,14 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
        * If the property is annotated, then either field or synthetic_method should be present
        * </pre>
        */
-      public Builder setField(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature value) {
+      public Builder setField(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature value) {
         if (fieldBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3213,7 +3213,7 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
@@ -3221,7 +3221,7 @@ public final class DebugJavaProtoBuf {
        * </pre>
        */
       public Builder setField(
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder builderForValue) {
         if (fieldBuilder_ == null) {
           field_ = builderForValue.build();
           onChanged();
@@ -3232,19 +3232,19 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
        * If the property is annotated, then either field or synthetic_method should be present
        * </pre>
        */
-      public Builder mergeField(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature value) {
+      public Builder mergeField(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature value) {
         if (fieldBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              field_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance()) {
+              field_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance()) {
             field_ =
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial();
           } else {
             field_ = value;
           }
@@ -3256,7 +3256,7 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
@@ -3265,7 +3265,7 @@ public final class DebugJavaProtoBuf {
        */
       public Builder clearField() {
         if (fieldBuilder_ == null) {
-          field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance();
+          field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
           onChanged();
         } else {
           fieldBuilder_.clear();
@@ -3274,27 +3274,27 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
        * If the property is annotated, then either field or synthetic_method should be present
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder getFieldBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder getFieldBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFieldFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
        * If the property is annotated, then either field or synthetic_method should be present
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder() {
         if (fieldBuilder_ != null) {
           return fieldBuilder_.getMessageOrBuilder();
         } else {
@@ -3302,7 +3302,7 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
@@ -3310,11 +3310,11 @@ public final class DebugJavaProtoBuf {
        * </pre>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> 
           getFieldFieldBuilder() {
         if (fieldBuilder_ == null) {
           fieldBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder>(
                   field_,
                   getParentForChildren(),
                   isClean());
@@ -3323,12 +3323,12 @@ public final class DebugJavaProtoBuf {
         return fieldBuilder_;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;
-      private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> syntheticMethodBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> syntheticMethodBuilder_;
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
@@ -3338,13 +3338,13 @@ public final class DebugJavaProtoBuf {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
         if (syntheticMethodBuilder_ == null) {
           return syntheticMethod_;
         } else {
@@ -3352,13 +3352,13 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
-      public Builder setSyntheticMethod(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) {
+      public Builder setSyntheticMethod(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (syntheticMethodBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3372,14 +3372,14 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
       public Builder setSyntheticMethod(
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         if (syntheticMethodBuilder_ == null) {
           syntheticMethod_ = builderForValue.build();
           onChanged();
@@ -3390,18 +3390,18 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
-      public Builder mergeSyntheticMethod(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) {
+      public Builder mergeSyntheticMethod(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (syntheticMethodBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              syntheticMethod_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) {
+              syntheticMethod_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
             syntheticMethod_ =
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial();
           } else {
             syntheticMethod_ = value;
           }
@@ -3413,7 +3413,7 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
@@ -3421,7 +3421,7 @@ public final class DebugJavaProtoBuf {
        */
       public Builder clearSyntheticMethod() {
         if (syntheticMethodBuilder_ == null) {
-          syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+          syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
           onChanged();
         } else {
           syntheticMethodBuilder_.clear();
@@ -3430,25 +3430,25 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getSyntheticMethodBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getSyntheticMethodBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getSyntheticMethodFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder() {
         if (syntheticMethodBuilder_ != null) {
           return syntheticMethodBuilder_.getMessageOrBuilder();
         } else {
@@ -3456,18 +3456,18 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
           getSyntheticMethodFieldBuilder() {
         if (syntheticMethodBuilder_ == null) {
           syntheticMethodBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
                   syntheticMethod_,
                   getParentForChildren(),
                   isClean());
@@ -3476,20 +3476,20 @@ public final class DebugJavaProtoBuf {
         return syntheticMethodBuilder_;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;
-      private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> getterBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> getterBuilder_;
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
       public boolean hasGetter() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter() {
         if (getterBuilder_ == null) {
           return getter_;
         } else {
@@ -3497,9 +3497,9 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
-      public Builder setGetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) {
+      public Builder setGetter(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (getterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3513,10 +3513,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
       public Builder setGetter(
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         if (getterBuilder_ == null) {
           getter_ = builderForValue.build();
           onChanged();
@@ -3527,14 +3527,14 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
-      public Builder mergeGetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) {
+      public Builder mergeGetter(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (getterBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              getter_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) {
+              getter_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
             getter_ =
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial();
           } else {
             getter_ = value;
           }
@@ -3546,11 +3546,11 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
       public Builder clearGetter() {
         if (getterBuilder_ == null) {
-          getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+          getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
           onChanged();
         } else {
           getterBuilder_.clear();
@@ -3559,17 +3559,17 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getGetterBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getGetterBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getGetterFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder() {
         if (getterBuilder_ != null) {
           return getterBuilder_.getMessageOrBuilder();
         } else {
@@ -3577,14 +3577,14 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
           getGetterFieldBuilder() {
         if (getterBuilder_ == null) {
           getterBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
                   getter_,
                   getParentForChildren(),
                   isClean());
@@ -3593,20 +3593,20 @@ public final class DebugJavaProtoBuf {
         return getterBuilder_;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;
-      private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> setterBuilder_;
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> setterBuilder_;
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
       public boolean hasSetter() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter() {
         if (setterBuilder_ == null) {
           return setter_;
         } else {
@@ -3614,9 +3614,9 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
-      public Builder setSetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) {
+      public Builder setSetter(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (setterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -3630,10 +3630,10 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
       public Builder setSetter(
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         if (setterBuilder_ == null) {
           setter_ = builderForValue.build();
           onChanged();
@@ -3644,14 +3644,14 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
-      public Builder mergeSetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) {
+      public Builder mergeSetter(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (setterBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              setter_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) {
+              setter_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
             setter_ =
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial();
           } else {
             setter_ = value;
           }
@@ -3663,11 +3663,11 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
       public Builder clearSetter() {
         if (setterBuilder_ == null) {
-          setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+          setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
           onChanged();
         } else {
           setterBuilder_.clear();
@@ -3676,17 +3676,17 @@ public final class DebugJavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getSetterBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getSetterBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getSetterFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder() {
+      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder() {
         if (setterBuilder_ != null) {
           return setterBuilder_.getMessageOrBuilder();
         } else {
@@ -3694,14 +3694,14 @@ public final class DebugJavaProtoBuf {
         }
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> 
+          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
           getSetterFieldBuilder() {
         if (setterBuilder_ == null) {
           setterBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>(
+              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
                   setter_,
                   getParentForChildren(),
                   isClean());
@@ -3710,15 +3710,15 @@ public final class DebugJavaProtoBuf {
         return setterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaPropertySignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
     }
 
     static {
-      defaultInstance = new JavaPropertySignature(true);
+      defaultInstance = new JvmPropertySignature(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaPropertySignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
   }
 
   public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
@@ -3728,10 +3728,10 @@ public final class DebugJavaProtoBuf {
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
       org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
-      org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature> methodSignature = com.google.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature> methodSignature = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class,
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance());
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class,
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance());
   public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 101;
   /**
    * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
@@ -3739,10 +3739,10 @@ public final class DebugJavaProtoBuf {
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
       org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
-      org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature> propertySignature = com.google.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature> propertySignature = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class,
-        org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance());
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class,
+        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance());
   public static final int IMPL_CLASS_NAME_FIELD_NUMBER = 102;
   /**
    * <code>extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }</code>
@@ -3766,25 +3766,25 @@ public final class DebugJavaProtoBuf {
         java.lang.Integer.class,
         null);
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -3794,76 +3794,74 @@ public final class DebugJavaProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n8core/serialization.java/src/java_descr" +
-      "iptors.debug.proto\022+org.jetbrains.jet.de" +
-      "scriptors.serialization\032.core/serializat" +
-      "ion/src/descriptors.debug.proto\"\213\002\n\010Java" +
-      "Type\022[\n\016primitive_type\030\001 \001(\0162C.org.jetbr" +
-      "ains.jet.descriptors.serialization.JavaT" +
-      "ype.PrimitiveType\022\025\n\rclass_fq_name\030\002 \001(\005" +
-      "\022\032\n\017array_dimension\030\003 \001(\005:\0010\"o\n\rPrimitiv" +
-      "eType\022\010\n\004VOID\020\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010" +
-      "\n\004BYTE\020\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022",
-      "\010\n\004LONG\020\007\022\n\n\006DOUBLE\020\010\"\276\001\n\023JavaMethodSign" +
-      "ature\022\014\n\004name\030\001 \002(\005\022J\n\013return_type\030\002 \002(\013" +
-      "25.org.jetbrains.jet.descriptors.seriali" +
-      "zation.JavaType\022M\n\016parameter_type\030\003 \003(\0132" +
+      "\n6core/serialization.jvm/src/jvm_descrip" +
+      "tors.debug.proto\022&org.jetbrains.kotlin.s" +
+      "erialization.jvm\032.core/serialization/src" +
+      "/descriptors.debug.proto\"\204\002\n\007JvmType\022U\n\016" +
+      "primitive_type\030\001 \001(\0162=.org.jetbrains.kot" +
+      "lin.serialization.jvm.JvmType.PrimitiveT" +
+      "ype\022\025\n\rclass_fq_name\030\002 \001(\005\022\032\n\017array_dime" +
+      "nsion\030\003 \001(\005:\0010\"o\n\rPrimitiveType\022\010\n\004VOID\020" +
+      "\000\022\013\n\007BOOLEAN\020\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022\t\n\005SH" +
+      "ORT\020\004\022\007\n\003INT\020\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007\022\n\n\006D",
+      "OUBLE\020\010\"\261\001\n\022JvmMethodSignature\022\014\n\004name\030\001" +
+      " \002(\005\022D\n\013return_type\030\002 \002(\0132/.org.jetbrain" +
+      "s.kotlin.serialization.jvm.JvmType\022G\n\016pa" +
+      "rameter_type\030\003 \003(\0132/.org.jetbrains.kotli" +
+      "n.serialization.jvm.JvmType\"\203\001\n\021JvmField" +
+      "Signature\022\014\n\004name\030\001 \002(\005\022=\n\004type\030\002 \002(\0132/." +
+      "org.jetbrains.kotlin.serialization.jvm.J" +
+      "vmType\022!\n\022is_static_in_outer\030\003 \001(\010:\005fals" +
+      "e\"\316\002\n\024JvmPropertySignature\022H\n\005field\030\001 \001(" +
+      "\01329.org.jetbrains.kotlin.serialization.j",
+      "vm.JvmFieldSignature\022T\n\020synthetic_method" +
+      "\030\002 \001(\0132:.org.jetbrains.kotlin.serializat" +
+      "ion.jvm.JvmMethodSignature\022J\n\006getter\030\003 \001" +
+      "(\0132:.org.jetbrains.kotlin.serialization." +
+      "jvm.JvmMethodSignature\022J\n\006setter\030\004 \001(\0132:" +
+      ".org.jetbrains.kotlin.serialization.jvm." +
+      "JvmMethodSignature:\213\001\n\020method_signature\022" +
       "5.org.jetbrains.jet.descriptors.serializ" +
-      "ation.JavaType\"\212\001\n\022JavaFieldSignature\022\014\n" +
-      "\004name\030\001 \002(\005\022C\n\004type\030\002 \002(\01325.org.jetbrain" +
-      "s.jet.descriptors.serialization.JavaType" +
-      "\022!\n\022is_static_in_outer\030\003 \001(\010:\005false\"\347\002\n\025" +
-      "JavaPropertySignature\022N\n\005field\030\001 \001(\0132?.o",
-      "rg.jetbrains.jet.descriptors.serializati" +
-      "on.JavaFieldSignature\022Z\n\020synthetic_metho" +
-      "d\030\002 \001(\0132@.org.jetbrains.jet.descriptors." +
-      "serialization.JavaMethodSignature\022P\n\006get" +
-      "ter\030\003 \001(\0132@.org.jetbrains.jet.descriptor" +
-      "s.serialization.JavaMethodSignature\022P\n\006s" +
-      "etter\030\004 \001(\0132@.org.jetbrains.jet.descript" +
-      "ors.serialization.JavaMethodSignature:\221\001" +
-      "\n\020method_signature\0225.org.jetbrains.jet.d" +
-      "escriptors.serialization.Callable\030d \001(\0132",
-      "@.org.jetbrains.jet.descriptors.serializ" +
-      "ation.JavaMethodSignature:\225\001\n\022property_s" +
-      "ignature\0225.org.jetbrains.jet.descriptors" +
-      ".serialization.Callable\030e \001(\0132B.org.jetb" +
-      "rains.jet.descriptors.serialization.Java" +
-      "PropertySignature:N\n\017impl_class_name\0225.o" +
-      "rg.jetbrains.jet.descriptors.serializati" +
-      "on.Callable\030f \001(\005:S\n\005index\022D.org.jetbrai" +
-      "ns.jet.descriptors.serialization.Callabl" +
-      "e.ValueParameter\030d \001(\005B\023B\021DebugJavaProto",
-      "Buf"
+      "ation.Callable\030d \001(\0132:.org.jetbrains.kot" +
+      "lin.serialization.jvm.JvmMethodSignature",
+      ":\217\001\n\022property_signature\0225.org.jetbrains." +
+      "jet.descriptors.serialization.Callable\030e" +
+      " \001(\0132<.org.jetbrains.kotlin.serializatio" +
+      "n.jvm.JvmPropertySignature:N\n\017impl_class" +
+      "_name\0225.org.jetbrains.jet.descriptors.se" +
+      "rialization.Callable\030f \001(\005:S\n\005index\022D.or" +
+      "g.jetbrains.jet.descriptors.serializatio" +
+      "n.Callable.ValueParameter\030d \001(\005B\022B\020Debug" +
+      "JvmProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
             com.google.protobuf.Descriptors.FileDescriptor root) {
           descriptor = root;
-          internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_jvm_JvmType_descriptor,
               new java.lang.String[] { "PrimitiveType", "ClassFqName", "ArrayDimension", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor,
               new java.lang.String[] { "Name", "ReturnType", "ParameterType", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor,
               new java.lang.String[] { "Name", "Type", "IsStaticInOuter", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor,
               new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", });
           methodSignature.internalInit(descriptor.getExtensions().get(0));
           propertySignature.internalInit(descriptor.getExtensions().get(1));
diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml
index f92fcb74c9c..53da6311a8d 100644
--- a/core/descriptor.loader.java/descriptor.loader.java.iml
+++ b/core/descriptor.loader.java/descriptor.loader.java.iml
@@ -8,10 +8,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" name="javax.inject" level="project" />
     <orderEntry type="module" module-name="util.runtime" />
     <orderEntry type="library" name="protobuf-java" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
index d91fde6a86c..79d75a3c3b1 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
@@ -21,8 +21,7 @@ import java.util.ArrayList
 import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotatedCallableKind
 import org.jetbrains.jet.descriptors.serialization.NameResolver
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.*
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.*
 import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
@@ -119,7 +118,7 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader<A : Any, C
         val methodSignature = getCallableSignature(callable, nameResolver, kind)
         if (methodSignature != null) {
             if (proto.hasExtension(index)) {
-                val paramSignature = MemberSignature.fromMethodSignatureAndParameterIndex(methodSignature, proto.getExtension(JavaProtoBuf.index))
+                val paramSignature = MemberSignature.fromMethodSignatureAndParameterIndex(methodSignature, proto.getExtension(index))
                 return findClassAndLoadMemberAnnotations(container, callable, nameResolver, kind, paramSignature)
             }
         }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
index 44ce89a41dc..5227f2c2563 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.kotlin;
 import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
 import org.jetbrains.jet.descriptors.serialization.PackageData;
 import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents;
 import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope;
@@ -55,7 +55,7 @@ public final class DeserializedDescriptorResolver {
         String[] data = readData(kotlinClass, CLASS);
         if (data != null) {
             return components.getClassDeserializer().deserializeClass(
-                    kotlinClass.getClassId(), JavaProtoBufUtil.readClassDataFrom(data)
+                    kotlinClass.getClassId(), JvmProtoBufUtil.readClassDataFrom(data)
             );
         }
         return null;
@@ -66,7 +66,7 @@ public final class DeserializedDescriptorResolver {
         String[] data = readData(kotlinClass, PACKAGE_FACADE);
         if (data != null) {
             //all classes are included in java scope
-            PackageData packageData = JavaProtoBufUtil.readPackageDataFrom(data);
+            PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data);
             return new DeserializedPackageMemberScope(
                     descriptor, packageData.getPackageProto(), packageData.getNameResolver(), components,
                     new Function0<Collection<Name>>() {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt
index 68a84edcfc1..02486d415e5 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.kotlin
 import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
 import org.jetbrains.jet.descriptors.serialization.ClassData
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
 
 public class JavaClassDataFinder(
@@ -30,6 +30,6 @@ public class JavaClassDataFinder(
         val javaClassId = DeserializedResolverUtils.kotlinClassIdToJavaClassId(classId)
         val kotlinJvmBinaryClass = kotlinClassFinder.findKotlinClass(javaClassId) ?: return null
         val data = deserializedDescriptorResolver.readData(kotlinJvmBinaryClass, KotlinClassHeader.Kind.CLASS) ?: return null
-        return JavaProtoBufUtil.readClassDataFrom(data)
+        return JvmProtoBufUtil.readClassDataFrom(data)
     }
 }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java
index 92a48ec9e22..8b69bbf673c 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.resolve.kotlin;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf;
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
 import org.jetbrains.jet.descriptors.serialization.NameResolver;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
@@ -33,7 +33,7 @@ public class SignatureDeserializer {
     }
 
     @NotNull
-    public String methodSignatureString(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
+    public String methodSignatureString(@NotNull JvmProtoBuf.JvmMethodSignature signature) {
         Name name = nameResolver.getName(signature.getName());
 
         StringBuilder sb = new StringBuilder();
@@ -48,17 +48,17 @@ public class SignatureDeserializer {
     }
 
     @NotNull
-    public MemberSignature methodSignature(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
+    public MemberSignature methodSignature(@NotNull JvmProtoBuf.JvmMethodSignature signature) {
         return MemberSignature.fromMethodNameAndDesc(methodSignatureString(signature));
     }
 
     @NotNull
-    public String typeDescriptor(@NotNull JavaProtoBuf.JavaType type) {
+    public String typeDescriptor(@NotNull JvmProtoBuf.JvmType type) {
         return typeDescriptor(type, new StringBuilder()).toString();
     }
 
     @NotNull
-    private StringBuilder typeDescriptor(@NotNull JavaProtoBuf.JavaType type, @NotNull StringBuilder sb) {
+    private StringBuilder typeDescriptor(@NotNull JvmProtoBuf.JvmType type, @NotNull StringBuilder sb) {
         for (int i = 0; i < type.getArrayDimension(); i++) {
             sb.append('[');
         }
diff --git a/core/serialization.java/serialization.java.iml b/core/serialization.jvm/serialization.jvm.iml
similarity index 100%
rename from core/serialization.java/serialization.java.iml
rename to core/serialization.jvm/serialization.jvm.iml
diff --git a/core/serialization.java/src/java_descriptors.proto b/core/serialization.jvm/src/jvm_descriptors.proto
similarity index 74%
rename from core/serialization.java/src/java_descriptors.proto
rename to core/serialization.jvm/src/jvm_descriptors.proto
index b2e4fb3062f..f08fabc5dfc 100644
--- a/core/serialization.java/src/java_descriptors.proto
+++ b/core/serialization.jvm/src/jvm_descriptors.proto
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * 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.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.jvm;
 
 import "core/serialization/src/descriptors.proto";
 
-option java_outer_classname = "JavaProtoBuf";
+option java_outer_classname = "JvmProtoBuf";
 option optimize_for = LITE_RUNTIME;
 
-message JavaType {
+message JvmType {
   enum PrimitiveType {
     // These values correspond to ASM Type sorts
     VOID = 0;
@@ -42,37 +42,37 @@ message JavaType {
   optional int32 array_dimension = 3 [default = 0];
 }
 
-message JavaMethodSignature {
+message JvmMethodSignature {
   required int32 name = 1;
-  required JavaType return_type = 2;
-  repeated JavaType parameter_type = 3;
+  required JvmType return_type = 2;
+  repeated JvmType parameter_type = 3;
 }
 
-message JavaFieldSignature {
+message JvmFieldSignature {
   required int32 name = 1;
-  required JavaType type = 2;
+  required JvmType type = 2;
 
   // True iff this field is a backing field for a class object and is really present as a static
   // field in the outer class, not as an instance field here
   optional bool is_static_in_outer = 3 [default = false];
 }
 
-message JavaPropertySignature {
+message JvmPropertySignature {
   // A property itself is identified either by the field, or by the synthetic method.
   // If the property is annotated, then either field or synthetic_method should be present
-  optional JavaFieldSignature field = 1;
+  optional JvmFieldSignature field = 1;
 
   // Annotations on properties without backing fields are written on a synthetic method with this signature
-  optional JavaMethodSignature synthetic_method = 2;
+  optional JvmMethodSignature synthetic_method = 2;
 
-  optional JavaMethodSignature getter = 3;
-  optional JavaMethodSignature setter = 4;
+  optional JvmMethodSignature getter = 3;
+  optional JvmMethodSignature setter = 4;
 }
 
-extend Callable {
-  optional JavaMethodSignature method_signature = 100;
+extend org.jetbrains.jet.descriptors.serialization.Callable {
+  optional JvmMethodSignature method_signature = 100;
 
-  optional JavaPropertySignature property_signature = 101;
+  optional JvmPropertySignature property_signature = 101;
 
   // Package-less name of the class with the callable's body and annotations, if it differs from the class it's serialized into.
   // E.g. for a class "A/B/C$D" this would be "C$D".
@@ -82,7 +82,7 @@ extend Callable {
   optional int32 impl_class_name = 102;
 }
 
-extend Callable.ValueParameter {
+extend org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter {
   // Index of the corresponding parameter of this method in JVM (counting receiver parameters, enum constructor synthetic parameters, etc.)
   optional int32 index = 100;
 }
diff --git a/core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/BitEncoding.java b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/BitEncoding.java
similarity index 99%
rename from core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/BitEncoding.java
rename to core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/BitEncoding.java
index 208e19638fa..9db1c7d646f 100644
--- a/core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/BitEncoding.java
+++ b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/BitEncoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.jvm;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
similarity index 60%
rename from core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java
rename to core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
index b9d7782c35d..b3e289ed521 100644
--- a/core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java
+++ b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
@@ -1,23 +1,23 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization.java/src/java_descriptors.proto
+// source: core/serialization.jvm/src/jvm_descriptors.proto
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.jvm;
 
-public final class JavaProtoBuf {
-  private JavaProtoBuf() {}
+public final class JvmProtoBuf {
+  private JvmProtoBuf() {}
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistryLite registry) {
-    registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.methodSignature);
-    registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.propertySignature);
-    registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.implClassName);
-    registry.add(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.index);
+    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.methodSignature);
+    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.propertySignature);
+    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.implClassName);
+    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.index);
   }
-  public interface JavaTypeOrBuilder
+  public interface JvmTypeOrBuilder
       extends com.google.protobuf.MessageLiteOrBuilder {
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
      *
      * <pre>
      * One of these should be present
@@ -25,13 +25,13 @@ public final class JavaProtoBuf {
      */
     boolean hasPrimitiveType();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
      *
      * <pre>
      * One of these should be present
      * </pre>
      */
-    org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType getPrimitiveType();
+    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType getPrimitiveType();
 
     // optional int32 class_fq_name = 2;
     /**
@@ -54,28 +54,28 @@ public final class JavaProtoBuf {
     int getArrayDimension();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaType}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmType}
    */
-  public static final class JavaType extends
+  public static final class JvmType extends
       com.google.protobuf.GeneratedMessageLite
-      implements JavaTypeOrBuilder {
-    // Use JavaType.newBuilder() to construct.
-    private JavaType(com.google.protobuf.GeneratedMessageLite.Builder builder) {
+      implements JvmTypeOrBuilder {
+    // Use JvmType.newBuilder() to construct.
+    private JvmType(com.google.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
 
     }
-    private JavaType(boolean noInit) {}
+    private JvmType(boolean noInit) {}
 
-    private static final JavaType defaultInstance;
-    public static JavaType getDefaultInstance() {
+    private static final JvmType defaultInstance;
+    public static JvmType getDefaultInstance() {
       return defaultInstance;
     }
 
-    public JavaType getDefaultInstanceForType() {
+    public JvmType getDefaultInstanceForType() {
       return defaultInstance;
     }
 
-    private JavaType(
+    private JvmType(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -98,7 +98,7 @@ public final class JavaProtoBuf {
             }
             case 8: {
               int rawValue = input.readEnum();
-              org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType value = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType.valueOf(rawValue);
+              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType value = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType.valueOf(rawValue);
               if (value != null) {
                 bitField0_ |= 0x00000001;
                 primitiveType_ = value;
@@ -126,23 +126,23 @@ public final class JavaProtoBuf {
         makeExtensionsImmutable();
       }
     }
-    public static com.google.protobuf.Parser<JavaType> PARSER =
-        new com.google.protobuf.AbstractParser<JavaType>() {
-      public JavaType parsePartialFrom(
+    public static com.google.protobuf.Parser<JvmType> PARSER =
+        new com.google.protobuf.AbstractParser<JvmType>() {
+      public JvmType parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JavaType(input, extensionRegistry);
+        return new JvmType(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<JavaType> getParserForType() {
+    public com.google.protobuf.Parser<JvmType> getParserForType() {
       return PARSER;
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType}
      */
     public enum PrimitiveType
         implements com.google.protobuf.Internal.EnumLite {
@@ -265,15 +265,15 @@ public final class JavaProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType)
     }
 
     private int bitField0_;
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;
     public static final int PRIMITIVE_TYPE_FIELD_NUMBER = 1;
-    private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType primitiveType_;
+    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType primitiveType_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
      *
      * <pre>
      * One of these should be present
@@ -283,13 +283,13 @@ public final class JavaProtoBuf {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
      *
      * <pre>
      * One of these should be present
      * </pre>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType getPrimitiveType() {
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType getPrimitiveType() {
       return primitiveType_;
     }
 
@@ -326,7 +326,7 @@ public final class JavaProtoBuf {
     }
 
     private void initFields() {
-      primitiveType_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType.VOID;
+      primitiveType_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType.VOID;
       classFqName_ = 0;
       arrayDimension_ = 0;
     }
@@ -382,53 +382,53 @@ public final class JavaProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -437,19 +437,19 @@ public final class JavaProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaType}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmType}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaTypeOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.newBuilder()
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType, Builder>
+        implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmTypeOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -462,7 +462,7 @@ public final class JavaProtoBuf {
 
       public Builder clear() {
         super.clear();
-        primitiveType_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType.VOID;
+        primitiveType_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType.VOID;
         bitField0_ = (bitField0_ & ~0x00000001);
         classFqName_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -475,20 +475,20 @@ public final class JavaProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType build() {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType build() {
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType result = new org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType(this);
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -507,8 +507,8 @@ public final class JavaProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance()) return this;
         if (other.hasPrimitiveType()) {
           setPrimitiveType(other.getPrimitiveType());
         }
@@ -529,11 +529,11 @@ public final class JavaProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -544,10 +544,10 @@ public final class JavaProtoBuf {
       }
       private int bitField0_;
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;
-      private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType primitiveType_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType.VOID;
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;
+      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType primitiveType_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType.VOID;
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
        *
        * <pre>
        * One of these should be present
@@ -557,23 +557,23 @@ public final class JavaProtoBuf {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
        *
        * <pre>
        * One of these should be present
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType getPrimitiveType() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType getPrimitiveType() {
         return primitiveType_;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
        *
        * <pre>
        * One of these should be present
        * </pre>
        */
-      public Builder setPrimitiveType(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType value) {
+      public Builder setPrimitiveType(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -583,7 +583,7 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
        *
        * <pre>
        * One of these should be present
@@ -591,7 +591,7 @@ public final class JavaProtoBuf {
        */
       public Builder clearPrimitiveType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        primitiveType_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PrimitiveType.VOID;
+        primitiveType_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PrimitiveType.VOID;
         
         return this;
       }
@@ -662,18 +662,18 @@ public final class JavaProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaType)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmType)
     }
 
     static {
-      defaultInstance = new JavaType(true);
+      defaultInstance = new JvmType(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaType)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmType)
   }
 
-  public interface JavaMethodSignatureOrBuilder
+  public interface JvmMethodSignatureOrBuilder
       extends com.google.protobuf.MessageLiteOrBuilder {
 
     // required int32 name = 1;
@@ -686,54 +686,54 @@ public final class JavaProtoBuf {
      */
     int getName();
 
-    // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;
+    // required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
     boolean hasReturnType();
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getReturnType();
+    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getReturnType();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;
+    // repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    java.util.List<org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType> 
+    java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType> 
         getParameterTypeList();
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getParameterType(int index);
+    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getParameterType(int index);
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
     int getParameterTypeCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaMethodSignature}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
    */
-  public static final class JavaMethodSignature extends
+  public static final class JvmMethodSignature extends
       com.google.protobuf.GeneratedMessageLite
-      implements JavaMethodSignatureOrBuilder {
-    // Use JavaMethodSignature.newBuilder() to construct.
-    private JavaMethodSignature(com.google.protobuf.GeneratedMessageLite.Builder builder) {
+      implements JvmMethodSignatureOrBuilder {
+    // Use JvmMethodSignature.newBuilder() to construct.
+    private JvmMethodSignature(com.google.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
 
     }
-    private JavaMethodSignature(boolean noInit) {}
+    private JvmMethodSignature(boolean noInit) {}
 
-    private static final JavaMethodSignature defaultInstance;
-    public static JavaMethodSignature getDefaultInstance() {
+    private static final JvmMethodSignature defaultInstance;
+    public static JvmMethodSignature getDefaultInstance() {
       return defaultInstance;
     }
 
-    public JavaMethodSignature getDefaultInstanceForType() {
+    public JvmMethodSignature getDefaultInstanceForType() {
       return defaultInstance;
     }
 
-    private JavaMethodSignature(
+    private JvmMethodSignature(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -760,11 +760,11 @@ public final class JavaProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = returnType_.toBuilder();
               }
-              returnType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PARSER, extensionRegistry);
+              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(returnType_);
                 returnType_ = subBuilder.buildPartial();
@@ -774,10 +774,10 @@ public final class JavaProtoBuf {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                parameterType_ = new java.util.ArrayList<org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType>();
+                parameterType_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType>();
                 mutable_bitField0_ |= 0x00000004;
               }
-              parameterType_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PARSER, extensionRegistry));
+              parameterType_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PARSER, extensionRegistry));
               break;
             }
           }
@@ -794,18 +794,18 @@ public final class JavaProtoBuf {
         makeExtensionsImmutable();
       }
     }
-    public static com.google.protobuf.Parser<JavaMethodSignature> PARSER =
-        new com.google.protobuf.AbstractParser<JavaMethodSignature>() {
-      public JavaMethodSignature parsePartialFrom(
+    public static com.google.protobuf.Parser<JvmMethodSignature> PARSER =
+        new com.google.protobuf.AbstractParser<JvmMethodSignature>() {
+      public JvmMethodSignature parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JavaMethodSignature(input, extensionRegistry);
+        return new JvmMethodSignature(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<JavaMethodSignature> getParserForType() {
+    public com.google.protobuf.Parser<JvmMethodSignature> getParserForType() {
       return PARSER;
     }
 
@@ -826,61 +826,61 @@ public final class JavaProtoBuf {
       return name_;
     }
 
-    // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;
+    // required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;
     public static final int RETURN_TYPE_FIELD_NUMBER = 2;
-    private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType returnType_;
+    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType returnType_;
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
     public boolean hasReturnType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getReturnType() {
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getReturnType() {
       return returnType_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;
+    // repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;
     public static final int PARAMETER_TYPE_FIELD_NUMBER = 3;
-    private java.util.List<org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType> parameterType_;
+    private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType> parameterType_;
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    public java.util.List<org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType> getParameterTypeList() {
+    public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType> getParameterTypeList() {
       return parameterType_;
     }
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    public java.util.List<? extends org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaTypeOrBuilder> 
+    public java.util.List<? extends org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmTypeOrBuilder> 
         getParameterTypeOrBuilderList() {
       return parameterType_;
     }
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
     public int getParameterTypeCount() {
       return parameterType_.size();
     }
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getParameterType(int index) {
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getParameterType(int index) {
       return parameterType_.get(index);
     }
     /**
-     * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+     * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder(
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmTypeOrBuilder getParameterTypeOrBuilder(
         int index) {
       return parameterType_.get(index);
     }
 
     private void initFields() {
       name_ = 0;
-      returnType_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+      returnType_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
       parameterType_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -943,53 +943,53 @@ public final class JavaProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -998,19 +998,19 @@ public final class JavaProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaMethodSignature}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignatureOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.newBuilder()
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature, Builder>
+        implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignatureOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1025,7 +1025,7 @@ public final class JavaProtoBuf {
         super.clear();
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
-        returnType_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+        returnType_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
         parameterType_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -1036,20 +1036,20 @@ public final class JavaProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature build() {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature build() {
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature result = new org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature(this);
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1069,8 +1069,8 @@ public final class JavaProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -1106,11 +1106,11 @@ public final class JavaProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1154,24 +1154,24 @@ public final class JavaProtoBuf {
         return this;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;
-      private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType returnType_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+      // required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;
+      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType returnType_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
       public boolean hasReturnType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getReturnType() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getReturnType() {
         return returnType_;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
-      public Builder setReturnType(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType value) {
+      public Builder setReturnType(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1181,23 +1181,23 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
       public Builder setReturnType(
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.Builder builderForValue) {
         returnType_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
-      public Builder mergeReturnType(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType value) {
+      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            returnType_ != org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance()) {
+            returnType_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance()) {
           returnType_ =
-            org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.newBuilder(returnType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.newBuilder(returnType_).mergeFrom(value).buildPartial();
         } else {
           returnType_ = value;
         }
@@ -1206,48 +1206,48 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType return_type = 2;</code>
        */
       public Builder clearReturnType() {
-        returnType_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+        returnType_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;
-      private java.util.List<org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType> parameterType_ =
+      // repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;
+      private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType> parameterType_ =
         java.util.Collections.emptyList();
       private void ensureParameterTypeIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          parameterType_ = new java.util.ArrayList<org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType>(parameterType_);
+          parameterType_ = new java.util.ArrayList<org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType>(parameterType_);
           bitField0_ |= 0x00000004;
          }
       }
 
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public java.util.List<org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType> getParameterTypeList() {
+      public java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType> getParameterTypeList() {
         return java.util.Collections.unmodifiableList(parameterType_);
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public int getParameterTypeCount() {
         return parameterType_.size();
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getParameterType(int index) {
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getParameterType(int index) {
         return parameterType_.get(index);
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder setParameterType(
-          int index, org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1257,19 +1257,19 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder setParameterType(
-          int index, org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.Builder builderForValue) {
         ensureParameterTypeIsMutable();
         parameterType_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
-      public Builder addParameterType(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType value) {
+      public Builder addParameterType(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1279,10 +1279,10 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder addParameterType(
-          int index, org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType value) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1292,37 +1292,37 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder addParameterType(
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.Builder builderForValue) {
         ensureParameterTypeIsMutable();
         parameterType_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder addParameterType(
-          int index, org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.Builder builderForValue) {
         ensureParameterTypeIsMutable();
         parameterType_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder addAllParameterType(
-          java.lang.Iterable<? extends org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType> values) {
+          java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType> values) {
         ensureParameterTypeIsMutable();
         super.addAll(values, parameterType_);
 
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder clearParameterType() {
         parameterType_ = java.util.Collections.emptyList();
@@ -1331,7 +1331,7 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3;</code>
+       * <code>repeated .org.jetbrains.kotlin.serialization.jvm.JvmType parameter_type = 3;</code>
        */
       public Builder removeParameterType(int index) {
         ensureParameterTypeIsMutable();
@@ -1340,18 +1340,18 @@ public final class JavaProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaMethodSignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
     }
 
     static {
-      defaultInstance = new JavaMethodSignature(true);
+      defaultInstance = new JvmMethodSignature(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaMethodSignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
   }
 
-  public interface JavaFieldSignatureOrBuilder
+  public interface JvmFieldSignatureOrBuilder
       extends com.google.protobuf.MessageLiteOrBuilder {
 
     // required int32 name = 1;
@@ -1364,15 +1364,15 @@ public final class JavaProtoBuf {
      */
     int getName();
 
-    // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;
+    // required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
     boolean hasType();
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getType();
+    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getType();
 
     // optional bool is_static_in_outer = 3 [default = false];
     /**
@@ -1395,28 +1395,28 @@ public final class JavaProtoBuf {
     boolean getIsStaticInOuter();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaFieldSignature}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
    */
-  public static final class JavaFieldSignature extends
+  public static final class JvmFieldSignature extends
       com.google.protobuf.GeneratedMessageLite
-      implements JavaFieldSignatureOrBuilder {
-    // Use JavaFieldSignature.newBuilder() to construct.
-    private JavaFieldSignature(com.google.protobuf.GeneratedMessageLite.Builder builder) {
+      implements JvmFieldSignatureOrBuilder {
+    // Use JvmFieldSignature.newBuilder() to construct.
+    private JvmFieldSignature(com.google.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
 
     }
-    private JavaFieldSignature(boolean noInit) {}
+    private JvmFieldSignature(boolean noInit) {}
 
-    private static final JavaFieldSignature defaultInstance;
-    public static JavaFieldSignature getDefaultInstance() {
+    private static final JvmFieldSignature defaultInstance;
+    public static JvmFieldSignature getDefaultInstance() {
       return defaultInstance;
     }
 
-    public JavaFieldSignature getDefaultInstanceForType() {
+    public JvmFieldSignature getDefaultInstanceForType() {
       return defaultInstance;
     }
 
-    private JavaFieldSignature(
+    private JvmFieldSignature(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -1443,11 +1443,11 @@ public final class JavaProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = type_.toBuilder();
               }
-              type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.PARSER, extensionRegistry);
+              type_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(type_);
                 type_ = subBuilder.buildPartial();
@@ -1471,18 +1471,18 @@ public final class JavaProtoBuf {
         makeExtensionsImmutable();
       }
     }
-    public static com.google.protobuf.Parser<JavaFieldSignature> PARSER =
-        new com.google.protobuf.AbstractParser<JavaFieldSignature>() {
-      public JavaFieldSignature parsePartialFrom(
+    public static com.google.protobuf.Parser<JvmFieldSignature> PARSER =
+        new com.google.protobuf.AbstractParser<JvmFieldSignature>() {
+      public JvmFieldSignature parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JavaFieldSignature(input, extensionRegistry);
+        return new JvmFieldSignature(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<JavaFieldSignature> getParserForType() {
+    public com.google.protobuf.Parser<JvmFieldSignature> getParserForType() {
       return PARSER;
     }
 
@@ -1503,19 +1503,19 @@ public final class JavaProtoBuf {
       return name_;
     }
 
-    // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;
+    // required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;
     public static final int TYPE_FIELD_NUMBER = 2;
-    private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType type_;
+    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType type_;
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+     * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getType() {
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getType() {
       return type_;
     }
 
@@ -1547,7 +1547,7 @@ public final class JavaProtoBuf {
 
     private void initFields() {
       name_ = 0;
-      type_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+      type_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
       isStaticInOuter_ = false;
     }
     private byte memoizedIsInitialized = -1;
@@ -1610,53 +1610,53 @@ public final class JavaProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1665,19 +1665,19 @@ public final class JavaProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaFieldSignature}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignatureOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.newBuilder()
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature, Builder>
+        implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignatureOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1692,7 +1692,7 @@ public final class JavaProtoBuf {
         super.clear();
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000001);
-        type_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+        type_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
         isStaticInOuter_ = false;
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -1703,20 +1703,20 @@ public final class JavaProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature build() {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature build() {
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature result = new org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature(this);
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1735,8 +1735,8 @@ public final class JavaProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -1765,11 +1765,11 @@ public final class JavaProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1813,24 +1813,24 @@ public final class JavaProtoBuf {
         return this;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;
-      private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType type_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+      // required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;
+      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType type_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType getType() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType getType() {
         return type_;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
-      public Builder setType(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType value) {
+      public Builder setType(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1840,23 +1840,23 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
       public Builder setType(
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.Builder builderForValue) {
         type_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
-      public Builder mergeType(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType value) {
+      public Builder mergeType(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            type_ != org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance()) {
+            type_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance()) {
           type_ =
-            org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.newBuilder(type_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.newBuilder(type_).mergeFrom(value).buildPartial();
         } else {
           type_ = value;
         }
@@ -1865,10 +1865,10 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2;</code>
+       * <code>required .org.jetbrains.kotlin.serialization.jvm.JvmType type = 2;</code>
        */
       public Builder clearType() {
-        type_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaType.getDefaultInstance();
+        type_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmType.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
@@ -1927,23 +1927,23 @@ public final class JavaProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaFieldSignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
     }
 
     static {
-      defaultInstance = new JavaFieldSignature(true);
+      defaultInstance = new JvmFieldSignature(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaFieldSignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
   }
 
-  public interface JavaPropertySignatureOrBuilder
+  public interface JvmPropertySignatureOrBuilder
       extends com.google.protobuf.MessageLiteOrBuilder {
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
@@ -1952,18 +1952,18 @@ public final class JavaProtoBuf {
      */
     boolean hasField();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
      * If the property is annotated, then either field or synthetic_method should be present
      * </pre>
      */
-    org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature getField();
+    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getField();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
@@ -1971,57 +1971,57 @@ public final class JavaProtoBuf {
      */
     boolean hasSyntheticMethod();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
      * </pre>
      */
-    org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getSyntheticMethod();
+    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
     boolean hasGetter();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getGetter();
+    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getGetter();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
     boolean hasSetter();
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
-    org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getSetter();
+    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSetter();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaPropertySignature}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
    */
-  public static final class JavaPropertySignature extends
+  public static final class JvmPropertySignature extends
       com.google.protobuf.GeneratedMessageLite
-      implements JavaPropertySignatureOrBuilder {
-    // Use JavaPropertySignature.newBuilder() to construct.
-    private JavaPropertySignature(com.google.protobuf.GeneratedMessageLite.Builder builder) {
+      implements JvmPropertySignatureOrBuilder {
+    // Use JvmPropertySignature.newBuilder() to construct.
+    private JvmPropertySignature(com.google.protobuf.GeneratedMessageLite.Builder builder) {
       super(builder);
 
     }
-    private JavaPropertySignature(boolean noInit) {}
+    private JvmPropertySignature(boolean noInit) {}
 
-    private static final JavaPropertySignature defaultInstance;
-    public static JavaPropertySignature getDefaultInstance() {
+    private static final JvmPropertySignature defaultInstance;
+    public static JvmPropertySignature getDefaultInstance() {
       return defaultInstance;
     }
 
-    public JavaPropertySignature getDefaultInstanceForType() {
+    public JvmPropertySignature getDefaultInstanceForType() {
       return defaultInstance;
     }
 
-    private JavaPropertySignature(
+    private JvmPropertySignature(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
@@ -2043,11 +2043,11 @@ public final class JavaProtoBuf {
               break;
             }
             case 10: {
-              org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = field_.toBuilder();
               }
-              field_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.PARSER, extensionRegistry);
+              field_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(field_);
                 field_ = subBuilder.buildPartial();
@@ -2056,11 +2056,11 @@ public final class JavaProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = syntheticMethod_.toBuilder();
               }
-              syntheticMethod_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry);
+              syntheticMethod_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(syntheticMethod_);
                 syntheticMethod_ = subBuilder.buildPartial();
@@ -2069,11 +2069,11 @@ public final class JavaProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = getter_.toBuilder();
               }
-              getter_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry);
+              getter_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(getter_);
                 getter_ = subBuilder.buildPartial();
@@ -2082,11 +2082,11 @@ public final class JavaProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = setter_.toBuilder();
               }
-              setter_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry);
+              setter_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(setter_);
                 setter_ = subBuilder.buildPartial();
@@ -2105,27 +2105,27 @@ public final class JavaProtoBuf {
         makeExtensionsImmutable();
       }
     }
-    public static com.google.protobuf.Parser<JavaPropertySignature> PARSER =
-        new com.google.protobuf.AbstractParser<JavaPropertySignature>() {
-      public JavaPropertySignature parsePartialFrom(
+    public static com.google.protobuf.Parser<JvmPropertySignature> PARSER =
+        new com.google.protobuf.AbstractParser<JvmPropertySignature>() {
+      public JvmPropertySignature parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new JavaPropertySignature(input, extensionRegistry);
+        return new JvmPropertySignature(input, extensionRegistry);
       }
     };
 
     @java.lang.Override
-    public com.google.protobuf.Parser<JavaPropertySignature> getParserForType() {
+    public com.google.protobuf.Parser<JvmPropertySignature> getParserForType() {
       return PARSER;
     }
 
     private int bitField0_;
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
     public static final int FIELD_FIELD_NUMBER = 1;
-    private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature field_;
+    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature field_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
@@ -2136,22 +2136,22 @@ public final class JavaProtoBuf {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
      *
      * <pre>
      * A property itself is identified either by the field, or by the synthetic method.
      * If the property is annotated, then either field or synthetic_method should be present
      * </pre>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature getField() {
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getField() {
       return field_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
     public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2;
-    private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature syntheticMethod_;
+    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature syntheticMethod_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
@@ -2161,53 +2161,53 @@ public final class JavaProtoBuf {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
      *
      * <pre>
      * Annotations on properties without backing fields are written on a synthetic method with this signature
      * </pre>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getSyntheticMethod() {
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
       return syntheticMethod_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
     public static final int GETTER_FIELD_NUMBER = 3;
-    private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getter_;
+    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getter_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
     public boolean hasGetter() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getGetter() {
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getGetter() {
       return getter_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;
+    // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
     public static final int SETTER_FIELD_NUMBER = 4;
-    private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature setter_;
+    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature setter_;
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
     public boolean hasSetter() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+     * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
      */
-    public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getSetter() {
+    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSetter() {
       return setter_;
     }
 
     private void initFields() {
-      field_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.getDefaultInstance();
-      syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
-      getter_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
-      setter_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+      syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -2292,53 +2292,53 @@ public final class JavaProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2347,19 +2347,19 @@ public final class JavaProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaPropertySignature}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignatureOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature.newBuilder()
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature, Builder>
+        implements org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignatureOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2372,13 +2372,13 @@ public final class JavaProtoBuf {
 
       public Builder clear() {
         super.clear();
-        field_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.getDefaultInstance();
+        field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
-        syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+        syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
-        getter_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+        getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
-        setter_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+        setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -2387,20 +2387,20 @@ public final class JavaProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature build() {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature result = buildPartial();
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature build() {
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature result = new org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature(this);
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature buildPartial() {
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2423,8 +2423,8 @@ public final class JavaProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature other) {
+        if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance()) return this;
         if (other.hasField()) {
           mergeField(other.getField());
         }
@@ -2472,11 +2472,11 @@ public final class JavaProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature parsedMessage = null;
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2487,10 +2487,10 @@ public final class JavaProtoBuf {
       }
       private int bitField0_;
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;
-      private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature field_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
@@ -2501,25 +2501,25 @@ public final class JavaProtoBuf {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
        * If the property is annotated, then either field or synthetic_method should be present
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature getField() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getField() {
         return field_;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
        * If the property is annotated, then either field or synthetic_method should be present
        * </pre>
        */
-      public Builder setField(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature value) {
+      public Builder setField(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2529,7 +2529,7 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
@@ -2537,25 +2537,25 @@ public final class JavaProtoBuf {
        * </pre>
        */
       public Builder setField(
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.Builder builderForValue) {
         field_ = builderForValue.build();
 
         bitField0_ |= 0x00000001;
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
        * If the property is annotated, then either field or synthetic_method should be present
        * </pre>
        */
-      public Builder mergeField(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature value) {
+      public Builder mergeField(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature value) {
         if (((bitField0_ & 0x00000001) == 0x00000001) &&
-            field_ != org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.getDefaultInstance()) {
+            field_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance()) {
           field_ =
-            org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial();
         } else {
           field_ = value;
         }
@@ -2564,7 +2564,7 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;</code>
        *
        * <pre>
        * A property itself is identified either by the field, or by the synthetic method.
@@ -2572,16 +2572,16 @@ public final class JavaProtoBuf {
        * </pre>
        */
       public Builder clearField() {
-        field_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaFieldSignature.getDefaultInstance();
+        field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;
-      private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
@@ -2591,23 +2591,23 @@ public final class JavaProtoBuf {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getSyntheticMethod() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
         return syntheticMethod_;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
-      public Builder setSyntheticMethod(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature value) {
+      public Builder setSyntheticMethod(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2617,31 +2617,31 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
       public Builder setSyntheticMethod(
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         syntheticMethod_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
-      public Builder mergeSyntheticMethod(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature value) {
+      public Builder mergeSyntheticMethod(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            syntheticMethod_ != org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance()) {
+            syntheticMethod_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
           syntheticMethod_ =
-            org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial();
         } else {
           syntheticMethod_ = value;
         }
@@ -2650,37 +2650,37 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;</code>
        *
        * <pre>
        * Annotations on properties without backing fields are written on a synthetic method with this signature
        * </pre>
        */
       public Builder clearSyntheticMethod() {
-        syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+        syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;
-      private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getter_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
       public boolean hasGetter() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getGetter() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getGetter() {
         return getter_;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
-      public Builder setGetter(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature value) {
+      public Builder setGetter(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2690,23 +2690,23 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
       public Builder setGetter(
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         getter_ = builderForValue.build();
 
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
-      public Builder mergeGetter(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature value) {
+      public Builder mergeGetter(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (((bitField0_ & 0x00000004) == 0x00000004) &&
-            getter_ != org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance()) {
+            getter_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
           getter_ =
-            org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial();
         } else {
           getter_ = value;
         }
@@ -2715,33 +2715,33 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;</code>
        */
       public Builder clearGetter() {
-        getter_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+        getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;
-      private org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature setter_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
       public boolean hasSetter() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
-      public org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature getSetter() {
+      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSetter() {
         return setter_;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
-      public Builder setSetter(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature value) {
+      public Builder setSetter(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2751,23 +2751,23 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
       public Builder setSetter(
-          org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         setter_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
-      public Builder mergeSetter(org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature value) {
+      public Builder mergeSetter(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            setter_ != org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance()) {
+            setter_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
           setter_ =
-            org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial();
         } else {
           setter_ = value;
         }
@@ -2776,24 +2776,24 @@ public final class JavaProtoBuf {
         return this;
       }
       /**
-       * <code>optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4;</code>
+       * <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;</code>
        */
       public Builder clearSetter() {
-        setter_ = org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance();
+        setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaPropertySignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
     }
 
     static {
-      defaultInstance = new JavaPropertySignature(true);
+      defaultInstance = new JvmPropertySignature(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaPropertySignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
   }
 
   public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
@@ -2803,11 +2803,11 @@ public final class JavaProtoBuf {
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
       org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
-      org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature> methodSignature = com.google.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature> methodSignature = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
         org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaMethodSignature.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
         null,
         100,
         com.google.protobuf.WireFormat.FieldType.MESSAGE);
@@ -2818,11 +2818,11 @@ public final class JavaProtoBuf {
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
       org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
-      org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature> propertySignature = com.google.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature> propertySignature = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
         org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.JavaProtoBuf.JavaPropertySignature.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
         null,
         101,
         com.google.protobuf.WireFormat.FieldType.MESSAGE);
diff --git a/core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBufUtil.java b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java
similarity index 80%
rename from core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBufUtil.java
rename to core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java
index 382e8e711de..68e37439811 100644
--- a/core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBufUtil.java
+++ b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * 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.
@@ -14,19 +14,21 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.jvm;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.descriptors.serialization.ClassData;
+import org.jetbrains.jet.descriptors.serialization.PackageData;
 
-public class JavaProtoBufUtil {
-    private JavaProtoBufUtil() {
+public class JvmProtoBufUtil {
+    private JvmProtoBufUtil() {
     }
 
     @NotNull
     public static ExtensionRegistryLite getExtensionRegistry() {
         ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-        JavaProtoBuf.registerAllExtensions(registry);
+        JvmProtoBuf.registerAllExtensions(registry);
         return registry;
     }
 
diff --git a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
index 4601c889f4f..d7d819ca319 100644
--- a/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
@@ -51,7 +51,7 @@ public data class ProtoPath(
 public val PROTO_PATHS: List<ProtoPath> = listOf(
         ProtoPath("core/serialization/src/descriptors.proto", "core/serialization/src"),
         ProtoPath("core/serialization/src/builtins.proto", "core/serialization/src"),
-        ProtoPath("core/serialization.java/src/java_descriptors.proto", "core/serialization.java/src")
+        ProtoPath("core/serialization.jvm/src/jvm_descriptors.proto", "core/serialization.jvm/src")
 )
 
 fun main(args: Array<String>) {
diff --git a/idea/idea-analysis/idea-analysis.iml b/idea/idea-analysis/idea-analysis.iml
index 36d78e44244..296c22d492f 100644
--- a/idea/idea-analysis/idea-analysis.iml
+++ b/idea/idea-analysis/idea-analysis.iml
@@ -16,7 +16,7 @@
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="library" name="intellij-core-analysis" level="project" />
     <orderEntry type="module-library">
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt
index e6c15c228e1..06be9ff5f44 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt
@@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.impl.compiled.ClassFileStubBuilder
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassFinder
 import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassDataFinder
@@ -64,13 +64,13 @@ public class KotlinClsStubBuilder : ClsStubBuilder() {
         }
         return when (header.kind) {
             KotlinClassHeader.Kind.PACKAGE_FACADE -> {
-                val packageData = JavaProtoBufUtil.readPackageDataFrom(annotationData)
+                val packageData = JvmProtoBufUtil.readPackageDataFrom(annotationData)
                 val context = components.createContext(packageData.getNameResolver(), packageFqName)
                 createPackageFacadeFileStub(packageData.getPackageProto(), packageFqName, context)
             }
 
             KotlinClassHeader.Kind.CLASS -> {
-                val classData = JavaProtoBufUtil.readClassDataFrom(annotationData)
+                val classData = JvmProtoBufUtil.readClassDataFrom(annotationData)
                 val context = components.createContext(classData.getNameResolver(), packageFqName)
                 createTopLevelClassStub(classId, classData.getClassProto(), context)
             }
@@ -88,4 +88,4 @@ public class KotlinClsStubBuilder : ClsStubBuilder() {
     class object {
         val LOG = Logger.getInstance(javaClass<KotlinClsStubBuilder>())
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
index a1ee72e0dcf..7e477eed6ab 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.decompiler.textBuilder
 
 import org.jetbrains.jet.lang.resolve.name.ClassId
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor
 import org.jetbrains.jet.lang.resolve.kotlin.*
@@ -59,7 +59,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
             LOG.error("Could not read annotation data for $packageFqName from ${binaryClassForPackageClass?.getClassId()}")
             return Collections.emptyList()
         }
-        val packageData = JavaProtoBufUtil.readPackageDataFrom(annotationData)
+        val packageData = JvmProtoBufUtil.readPackageDataFrom(annotationData)
         val membersScope = DeserializedPackageMemberScope(
                 createDummyPackageFragment(packageFqName),
                 packageData.getPackageProto(),
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt
index a26b6886eb7..f70283dc251 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt
@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
 import org.jetbrains.jet.descriptors.serialization.ClassData
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import com.intellij.openapi.diagnostic.Logger
 
 class LocalClassFinder(
@@ -61,7 +61,7 @@ class LocalClassDataFinder(
             log.error("Annotation data missing for ${binaryClass.getClassId()}")
             return null
         }
-        return JavaProtoBufUtil.readClassDataFrom(data)
+        return JvmProtoBufUtil.readClassDataFrom(data)
     }
 }
 
@@ -69,4 +69,4 @@ private val JavaClass.classId: ClassId
     get() {
         val outer = getOuterClass()
         return if (outer == null) ClassId.topLevel(getFqName()!!) else outer.classId.createNestedClassId(getName())
-    }
\ No newline at end of file
+    }
diff --git a/idea/idea.iml b/idea/idea.iml
index fd93a3176e1..0ccf19fdafd 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -37,7 +37,7 @@
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="eval4j" />
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt
index 1c6f388b497..3aa48c2e2a0 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt
@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.debugger
 import com.intellij.psi.search.FilenameIndex
 import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.jet.renderer.DescriptorRenderer
 import com.intellij.openapi.diagnostic.Logger
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
@@ -92,8 +92,8 @@ fun findPackagePartInternalNameForLibraryFile(elementAt: JetElement): String? {
     }
 
     val proto = deserializedDescriptor.proto
-    if (proto.hasExtension(JavaProtoBuf.implClassName)) {
-        val name = deserializedDescriptor.nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName)!!)
+    if (proto.hasExtension(JvmProtoBuf.implClassName)) {
+        val name = deserializedDescriptor.nameResolver.getName(proto.getExtension(JvmProtoBuf.implClassName)!!)
         return JvmClassName.byFqNameWithoutInnerClasses(packageFqName.child(name)).getInternalName()
     }
 
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml
index d96c403f498..a4e8a5a1756 100644
--- a/jps-plugin/jps-plugin.iml
+++ b/jps-plugin/jps-plugin.iml
@@ -17,10 +17,9 @@
     <orderEntry type="module" module-name="backend" scope="TEST" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
index 05cc268cc43..50440dc36e5 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
@@ -24,7 +24,7 @@ import com.intellij.util.io.IOUtil
 import java.io.DataInput
 import org.jetbrains.jet.lang.resolve.name.FqName
 import com.intellij.util.io.DataExternalizer
-import org.jetbrains.jet.descriptors.serialization.BitEncoding
+import org.jetbrains.kotlin.serialization.jvm.BitEncoding
 import java.util.Arrays
 import org.jetbrains.org.objectweb.asm.*
 import com.intellij.util.io.EnumeratorStringDescriptor
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
index f5cbc3d3be1..215ee7895d4 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
@@ -28,8 +28,8 @@ import com.google.common.hash.Hashing
 import com.intellij.openapi.util.io.FileUtil
 import com.google.common.collect.Sets
 import java.util.HashSet
-import org.jetbrains.jet.descriptors.serialization.BitEncoding
-import org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf
+import org.jetbrains.kotlin.serialization.jvm.BitEncoding
+import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf
 import com.google.protobuf.ExtensionRegistry
 import java.io.ByteArrayInputStream
 import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf
@@ -158,7 +158,7 @@ fun classFileToString(classFile: File): String {
 
 fun getExtensionRegistry(): ExtensionRegistry {
     val registry = ExtensionRegistry.newInstance()!!
-    DebugJavaProtoBuf.registerAllExtensions(registry)
+    DebugJvmProtoBuf.registerAllExtensions(registry)
     return registry
 }