diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 1aea1e62a68..2ab94ce02cf 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -29,9 +29,9 @@ import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; 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; +import org.jetbrains.kotlin.serialization.ClassData; +import org.jetbrains.kotlin.serialization.DescriptorSerializer; +import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -70,7 +70,7 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*; -import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver; +import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.classDescriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index fc0dbdf671d..9c8dfcb65ba 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.context.PackageContext; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.codeFragmentUtil.CodeFragmentUtilPackage; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java index 8de3bf801f1..e26f52c2a85 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java @@ -19,12 +19,12 @@ 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.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.kotlin.serialization.deserialization.NameResolver; +import org.jetbrains.kotlin.serialization.ProtoBuf; +import org.jetbrains.kotlin.serialization.SerializerExtension; +import org.jetbrains.kotlin.serialization.StringTable; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.kotlin.SignatureDeserializer; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index 2ec8eb0da56..05553e30824 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -35,12 +35,12 @@ import org.jetbrains.kotlin.codegen.context.PackageContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.config.IncrementalCompilation; 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; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPropertyDescriptor; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor; +import org.jetbrains.kotlin.serialization.DescriptorSerializer; +import org.jetbrains.kotlin.serialization.PackageData; +import org.jetbrains.kotlin.serialization.ProtoBuf; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; @@ -66,7 +66,7 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses; import static org.jetbrains.kotlin.codegen.AsmUtil.method; -import static org.jetbrains.jet.descriptors.serialization.NameSerializationUtil.createNameResolver; +import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver; import static org.jetbrains.jet.lang.resolve.java.AsmTypes.K_PACKAGE_IMPL_TYPE; import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index 244be1f4d45..9625a835f8c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPropertyDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index ccf480d1416..1cfa78a65da 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -27,7 +27,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.codegen.state.JetTypeMapper; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedSimpleFunctionDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; 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 84125246e41..22566f57ae2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.codegen.context.PackageContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; 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.kotlin.serialization.ProtoBuf; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index bc6396f1b8a..a7a89dd9f72 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index ea12c3989f7..480da4c24dd 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -20,7 +20,7 @@ import java.io.File import com.intellij.openapi.util.Disposer import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.descriptors.serialization.* +import org.jetbrains.kotlin.serialization.* import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.name.Name import java.io.ByteArrayOutputStream 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 4f146f74a9a..7dd0ea45429 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 @@ -23,7 +23,7 @@ import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetFile; 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 f04c780b320..3fc06f1b966 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 @@ -26,8 +26,8 @@ import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl 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.deserialization.descriptors.DeserializedPackageMemberScope +import org.jetbrains.kotlin.serialization.* import org.jetbrains.kotlin.serialization.jvm.* import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents +import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents public class IncrementalPackageFragmentProvider( sourceFiles: Collection, diff --git a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt index f8434b29b84..613e2fb620a 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt @@ -26,9 +26,9 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl import java.util.ArrayList import org.jetbrains.kotlin.utils.Printer import org.jetbrains.jet.lang.resolve.java.structure.JavaNamedElement -import org.jetbrains.jet.descriptors.serialization.ProtoBuf -import org.jetbrains.jet.descriptors.serialization.TypeDeserializer -import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext +import org.jetbrains.kotlin.serialization.ProtoBuf +import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer +import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.DescriptorUtils import java.util.HashMap diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugBuiltInsProtoBuf.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugBuiltInsProtoBuf.java deleted file mode 100644 index afa75b3cc80..00000000000 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugBuiltInsProtoBuf.java +++ /dev/null @@ -1,107 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: core/serialization/src/builtins.debug.proto - -package org.jetbrains.jet.descriptors.serialization; - -public final class DebugBuiltInsProtoBuf { - private DebugBuiltInsProtoBuf() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registry.add(org.jetbrains.jet.descriptors.serialization.DebugBuiltInsProtoBuf.className); - registry.add(org.jetbrains.jet.descriptors.serialization.DebugBuiltInsProtoBuf.classAnnotation); - registry.add(org.jetbrains.jet.descriptors.serialization.DebugBuiltInsProtoBuf.callableAnnotation); - registry.add(org.jetbrains.jet.descriptors.serialization.DebugBuiltInsProtoBuf.parameterAnnotation); - } - public static final int CLASS_NAME_FIELD_NUMBER = 150; - /** - * extend .org.jetbrains.jet.descriptors.serialization.Package { ... } - */ - public static final - com.google.protobuf.GeneratedMessage.GeneratedExtension< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package, - java.util.List> className = com.google.protobuf.GeneratedMessage - .newFileScopedGeneratedExtension( - java.lang.Integer.class, - null); - public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150; - /** - * extend .org.jetbrains.jet.descriptors.serialization.Class { ... } - */ - public static final - com.google.protobuf.GeneratedMessage.GeneratedExtension< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, - java.util.List> classAnnotation = com.google.protobuf.GeneratedMessage - .newFileScopedGeneratedExtension( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.class, - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance()); - public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150; - /** - * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... } - */ - public static final - com.google.protobuf.GeneratedMessage.GeneratedExtension< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, - java.util.List> callableAnnotation = com.google.protobuf.GeneratedMessage - .newFileScopedGeneratedExtension( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.class, - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance()); - public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150; - /** - * extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... } - */ - public static final - com.google.protobuf.GeneratedMessage.GeneratedExtension< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, - java.util.List> parameterAnnotation = com.google.protobuf.GeneratedMessage - .newFileScopedGeneratedExtension( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.class, - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance()); - - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; - static { - java.lang.String[] descriptorData = { - "\n+core/serialization/src/builtins.debug." + - "proto\022+org.jetbrains.jet.descriptors.ser" + - "ialization\032.core/serialization/src/descr" + - "iptors.debug.proto:M\n\nclass_name\0224.org.j" + - "etbrains.jet.descriptors.serialization.P" + - "ackage\030\226\001 \003(\005B\002\020\001:\206\001\n\020class_annotation\0222" + - ".org.jetbrains.jet.descriptors.serializa" + - "tion.Class\030\226\001 \003(\01327.org.jetbrains.jet.de" + - "scriptors.serialization.Annotation:\214\001\n\023c" + - "allable_annotation\0225.org.jetbrains.jet.d", - "escriptors.serialization.Callable\030\226\001 \003(\013" + - "27.org.jetbrains.jet.descriptors.seriali" + - "zation.Annotation:\234\001\n\024parameter_annotati" + - "on\022D.org.jetbrains.jet.descriptors.seria" + - "lization.Callable.ValueParameter\030\226\001 \003(\0132" + - "7.org.jetbrains.jet.descriptors.serializ" + - "ation.AnnotationB\027B\025DebugBuiltInsProtoBu" + - "f" - }; - 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; - className.internalInit(descriptor.getExtensions().get(0)); - classAnnotation.internalInit(descriptor.getExtensions().get(1)); - callableAnnotation.internalInit(descriptor.getExtensions().get(2)); - parameterAnnotation.internalInit(descriptor.getExtensions().get(3)); - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor(), - }, assigner); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index cf3743b9c90..5e2ed13a092 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt index 86c287a6fa0..28cd526582b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt @@ -17,10 +17,10 @@ package org.jetbrains.jet.jvm.compiler import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedMemberScope +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberScope import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import java.util.Collections -import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer +import org.jetbrains.kotlin.serialization.DescriptorSerializer import com.intellij.testFramework.UsefulTestCase import java.util.ArrayList import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java index d0cb359c5e6..1b4e744497a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.descriptors.serialization.ClassData; +import org.jetbrains.kotlin.serialization.ClassData; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java index 438fc7010e7..26c8978b969 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; 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; +import org.jetbrains.kotlin.serialization.deserialization.NameResolver; +import org.jetbrains.kotlin.serialization.PackageData; +import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java similarity index 65% rename from compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java rename to compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java index d82bee83fb2..3bd963ecd0f 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: core/serialization/src/descriptors.debug.proto -package org.jetbrains.jet.descriptors.serialization; +package org.jetbrains.kotlin.serialization; public final class DebugProtoBuf { private DebugProtoBuf() {} @@ -9,7 +9,7 @@ public final class DebugProtoBuf { com.google.protobuf.ExtensionRegistry registry) { } /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Modality} + * Protobuf enum {@code org.jetbrains.kotlin.serialization.Modality} */ public enum Modality implements com.google.protobuf.ProtocolMessageEnum { @@ -82,7 +82,7 @@ public final class DebugProtoBuf { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(0); + return org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(0); } private static final Modality[] VALUES = values(); @@ -104,11 +104,11 @@ public final class DebugProtoBuf { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Modality) + // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Modality) } /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Visibility} + * Protobuf enum {@code org.jetbrains.kotlin.serialization.Visibility} */ public enum Visibility implements com.google.protobuf.ProtocolMessageEnum { @@ -216,7 +216,7 @@ public final class DebugProtoBuf { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(1); + return org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(1); } private static final Visibility[] VALUES = values(); @@ -238,7 +238,7 @@ public final class DebugProtoBuf { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Visibility) + // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Visibility) } public interface StringTableOrBuilder @@ -265,7 +265,7 @@ public final class DebugProtoBuf { getStringBytes(int index); } /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.StringTable} + * Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable} */ public static final class StringTable extends com.google.protobuf.GeneratedMessage @@ -340,14 +340,14 @@ public final class DebugProtoBuf { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_fieldAccessorTable + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable.Builder.class); + org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -443,53 +443,53 @@ public final class DebugProtoBuf { return super.writeReplace(); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable 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.DebugProtoBuf.StringTable parseFrom(byte[] data) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable 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.DebugProtoBuf.StringTable parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable 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.DebugProtoBuf.StringTable parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable parseDelimitedFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable 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.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -498,7 +498,7 @@ public final class DebugProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -510,24 +510,24 @@ public final class DebugProtoBuf { return builder; } /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.StringTable} + * Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTableOrBuilder { + implements org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_fieldAccessorTable + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable.Builder.class); + org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder.class); } - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable.newBuilder() + // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -558,23 +558,23 @@ public final class DebugProtoBuf { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor; } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getDefaultInstanceForType() { + return org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable result = buildPartial(); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable build() { + org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable(this); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable buildPartial() { + org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) == 0x00000001)) { string_ = new com.google.protobuf.UnmodifiableLazyStringList( @@ -587,16 +587,16 @@ public final class DebugProtoBuf { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable)other); + if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable) { + return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable other) { + if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance()) return this; if (!other.string_.isEmpty()) { if (string_.isEmpty()) { string_ = other.string_; @@ -619,11 +619,11 @@ public final class DebugProtoBuf { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable parsedMessage = null; + org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.StringTable) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -727,7 +727,7 @@ public final class DebugProtoBuf { return this; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.StringTable) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.StringTable) } static { @@ -735,39 +735,39 @@ public final class DebugProtoBuf { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.StringTable) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.StringTable) } public interface QualifiedNameTableOrBuilder extends com.google.protobuf.MessageOrBuilder { - // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - java.util.List + java.util.List getQualifiedNameList(); /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index); + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index); /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ int getQualifiedNameCount(); /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - java.util.List + java.util.List getQualifiedNameOrBuilderList(); /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( int index); } /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable} + * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable} */ public static final class QualifiedNameTable extends com.google.protobuf.GeneratedMessage @@ -819,10 +819,10 @@ public final class DebugProtoBuf { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - qualifiedName_ = new java.util.ArrayList(); + qualifiedName_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - qualifiedName_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry)); + qualifiedName_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry)); break; } } @@ -842,14 +842,14 @@ public final class DebugProtoBuf { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -898,18 +898,18 @@ public final class DebugProtoBuf { */ int getShortName(); - // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ boolean hasKind(); /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind(); + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind(); } /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName} + * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName} */ public static final class QualifiedName extends com.google.protobuf.GeneratedMessage @@ -971,7 +971,7 @@ public final class DebugProtoBuf { } case 24: { int rawValue = input.readEnum(); - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue); + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(3, rawValue); } else { @@ -994,14 +994,14 @@ public final class DebugProtoBuf { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1020,7 +1020,7 @@ public final class DebugProtoBuf { } /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind} + * Protobuf enum {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind} */ public enum Kind implements com.google.protobuf.ProtocolMessageEnum { @@ -1076,7 +1076,7 @@ public final class DebugProtoBuf { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDescriptor().getEnumTypes().get(0); + return org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDescriptor().getEnumTypes().get(0); } private static final Kind[] VALUES = values(); @@ -1098,7 +1098,7 @@ public final class DebugProtoBuf { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind) + // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind) } private int bitField0_; @@ -1142,26 +1142,26 @@ public final class DebugProtoBuf { return shortName_; } - // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; public static final int KIND_FIELD_NUMBER = 3; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_; + private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_; /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ public boolean hasKind() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { return kind_; } private void initFields() { parentQualifiedName_ = -1; shortName_ = 0; - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -1221,53 +1221,53 @@ public final class DebugProtoBuf { return super.writeReplace(); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName 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.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName 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.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName 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.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName 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.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1276,7 +1276,7 @@ public final class DebugProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1288,24 +1288,24 @@ public final class DebugProtoBuf { return builder; } /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName} + * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder { + implements org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); } - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.newBuilder() + // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1329,7 +1329,7 @@ public final class DebugProtoBuf { bitField0_ = (bitField0_ & ~0x00000001); shortName_ = 0; bitField0_ = (bitField0_ & ~0x00000002); - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -1340,23 +1340,23 @@ public final class DebugProtoBuf { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor; } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance(); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() { + return org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance(); } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial(); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName build() { + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName(this); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName buildPartial() { + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1377,16 +1377,16 @@ public final class DebugProtoBuf { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName)other); + if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) { + return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName other) { + if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this; if (other.hasParentQualifiedName()) { setParentQualifiedName(other.getParentQualifiedName()); } @@ -1412,11 +1412,11 @@ public final class DebugProtoBuf { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null; + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1509,24 +1509,24 @@ public final class DebugProtoBuf { return this; } - // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ public boolean hasKind() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { return kind_; } /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ - public Builder setKind(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value) { + public Builder setKind(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value) { if (value == null) { throw new NullPointerException(); } @@ -1536,16 +1536,16 @@ public final class DebugProtoBuf { return this; } /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ public Builder clearKind() { bitField0_ = (bitField0_ & ~0x00000004); - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; onChanged(); return this; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName) } static { @@ -1553,41 +1553,41 @@ public final class DebugProtoBuf { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName) } - // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; public static final int QUALIFIED_NAME_FIELD_NUMBER = 1; - private java.util.List qualifiedName_; + private java.util.List qualifiedName_; /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List getQualifiedNameList() { + public java.util.List getQualifiedNameList() { return qualifiedName_; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List + public java.util.List getQualifiedNameOrBuilderList() { return qualifiedName_; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public int getQualifiedNameCount() { return qualifiedName_.size(); } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { return qualifiedName_.get(index); } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( int index) { return qualifiedName_.get(index); } @@ -1641,53 +1641,53 @@ public final class DebugProtoBuf { return super.writeReplace(); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable 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.DebugProtoBuf.QualifiedNameTable parseFrom(byte[] data) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable 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.DebugProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable 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.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable 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.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1696,7 +1696,7 @@ public final class DebugProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1708,24 +1708,24 @@ public final class DebugProtoBuf { return builder; } /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable} + * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder { + implements org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); } - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder() + // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1761,23 +1761,23 @@ public final class DebugProtoBuf { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor; } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getDefaultInstanceForType() { + return org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable result = buildPartial(); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable build() { + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable(this); + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable buildPartial() { + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable(this); int from_bitField0_ = bitField0_; if (qualifiedNameBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1793,16 +1793,16 @@ public final class DebugProtoBuf { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable)other); + if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable) { + return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable other) { + if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) return this; if (qualifiedNameBuilder_ == null) { if (!other.qualifiedName_.isEmpty()) { if (qualifiedName_.isEmpty()) { @@ -1847,11 +1847,11 @@ public final class DebugProtoBuf { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parsedMessage = null; + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1862,23 +1862,23 @@ public final class DebugProtoBuf { } private int bitField0_; - // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - private java.util.List qualifiedName_ = + // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + private java.util.List qualifiedName_ = java.util.Collections.emptyList(); private void ensureQualifiedNameIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - qualifiedName_ = new java.util.ArrayList(qualifiedName_); + qualifiedName_ = new java.util.ArrayList(qualifiedName_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> qualifiedNameBuilder_; + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> qualifiedNameBuilder_; /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List getQualifiedNameList() { + public java.util.List getQualifiedNameList() { if (qualifiedNameBuilder_ == null) { return java.util.Collections.unmodifiableList(qualifiedName_); } else { @@ -1886,7 +1886,7 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public int getQualifiedNameCount() { if (qualifiedNameBuilder_ == null) { @@ -1896,9 +1896,9 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { if (qualifiedNameBuilder_ == null) { return qualifiedName_.get(index); } else { @@ -1906,10 +1906,10 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder setQualifiedName( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { if (qualifiedNameBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1923,10 +1923,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder setQualifiedName( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { if (qualifiedNameBuilder_ == null) { ensureQualifiedNameIsMutable(); qualifiedName_.set(index, builderForValue.build()); @@ -1937,9 +1937,9 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public Builder addQualifiedName(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + public Builder addQualifiedName(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { if (qualifiedNameBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1953,10 +1953,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder addQualifiedName( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { if (qualifiedNameBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -1970,10 +1970,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder addQualifiedName( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { if (qualifiedNameBuilder_ == null) { ensureQualifiedNameIsMutable(); qualifiedName_.add(builderForValue.build()); @@ -1984,10 +1984,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder addQualifiedName( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { if (qualifiedNameBuilder_ == null) { ensureQualifiedNameIsMutable(); qualifiedName_.add(index, builderForValue.build()); @@ -1998,10 +1998,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder addAllQualifiedName( - java.lang.Iterable values) { + java.lang.Iterable values) { if (qualifiedNameBuilder_ == null) { ensureQualifiedNameIsMutable(); super.addAll(values, qualifiedName_); @@ -2012,7 +2012,7 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder clearQualifiedName() { if (qualifiedNameBuilder_ == null) { @@ -2025,7 +2025,7 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder removeQualifiedName(int index) { if (qualifiedNameBuilder_ == null) { @@ -2038,16 +2038,16 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder getQualifiedNameBuilder( + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder getQualifiedNameBuilder( int index) { return getQualifiedNameFieldBuilder().getBuilder(index); } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( int index) { if (qualifiedNameBuilder_ == null) { return qualifiedName_.get(index); } else { @@ -2055,9 +2055,9 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List + public java.util.List getQualifiedNameOrBuilderList() { if (qualifiedNameBuilder_ != null) { return qualifiedNameBuilder_.getMessageOrBuilderList(); @@ -2066,33 +2066,33 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder() { + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder() { return getQualifiedNameFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder( + public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder( int index) { return getQualifiedNameFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); + index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); } /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List + public java.util.List getQualifiedNameBuilderList() { return getQualifiedNameFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> getQualifiedNameFieldBuilder() { if (qualifiedNameBuilder_ == null) { qualifiedNameBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder>( + org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder>( qualifiedName_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -2102,7 +2102,7 @@ public final class DebugProtoBuf { return qualifiedNameBuilder_; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable) } static { @@ -2110,7 +2110,7 @@ public final class DebugProtoBuf { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable) } public interface AnnotationOrBuilder @@ -2134,33 +2134,33 @@ public final class DebugProtoBuf { */ int getId(); - // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2; + // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; /** - * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; */ - java.util.List + java.util.List getArgumentList(); /** - * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index); + org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index); /** - * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; */ int getArgumentCount(); /** - * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; */ - java.util.List + java.util.List getArgumentOrBuilderList(); /** - * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder( + org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder( int index); } /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation} + * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation} */ public static final class Annotation extends com.google.protobuf.GeneratedMessage @@ -2217,10 +2217,10 @@ public final class DebugProtoBuf { } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - argument_ = new java.util.ArrayList(); + argument_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - argument_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.PARSER, extensionRegistry)); + argument_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.PARSER, extensionRegistry)); break; } } @@ -2240,14 +2240,14 @@ public final class DebugProtoBuf { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_fieldAccessorTable + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Builder.class); + org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2286,22 +2286,22 @@ public final class DebugProtoBuf { */ int getNameId(); - // required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2; + // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2; /** - * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2; + * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2; */ boolean hasValue(); /** - * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2; + * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2; */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value getValue(); + org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getValue(); /** - * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2; + * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2; */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder(); + org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder(); } /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument} + * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument} */ public static final class Argument extends com.google.protobuf.GeneratedMessage @@ -2357,11 +2357,11 @@ public final class DebugProtoBuf { break; } case 18: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder subBuilder = null; + org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry); + value_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -2383,14 +2383,14 @@ public final class DebugProtoBuf { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_descriptor; + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_fieldAccessorTable + return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder.class); + org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -2411,9 +2411,9 @@ public final class DebugProtoBuf { public interface ValueOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1; + // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1; /** - * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1; + * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1; * * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2423,7 +2423,7 @@ public final class DebugProtoBuf {
          */
         boolean hasType();
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2431,7 +2431,7 @@ public final class DebugProtoBuf {
          * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
          * 

          */
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType();
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType();
 
         // optional sint64 int_value = 2;
         /**
@@ -2517,47 +2517,47 @@ public final class DebugProtoBuf {
          */
         int getEnumValueId();
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+        // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
         boolean hasAnnotation();
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation getAnnotation();
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation();
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder();
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder();
 
-        // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+        // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        java.util.List 
+        java.util.List 
             getArrayElementList();
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index);
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index);
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
         int getArrayElementCount();
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        java.util.List 
+        java.util.List 
             getArrayElementOrBuilderList();
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
             int index);
       }
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
        */
       public static final class Value extends
           com.google.protobuf.GeneratedMessage
@@ -2609,7 +2609,7 @@ public final class DebugProtoBuf {
                 }
                 case 8: {
                   int rawValue = input.readEnum();
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
                   if (value == null) {
                     unknownFields.mergeVarintField(1, rawValue);
                   } else {
@@ -2649,11 +2649,11 @@ public final class DebugProtoBuf {
                   break;
                 }
                 case 66: {
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Builder subBuilder = null;
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder subBuilder = null;
                   if (((bitField0_ & 0x00000080) == 0x00000080)) {
                     subBuilder = annotation_.toBuilder();
                   }
-                  annotation_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.PARSER, extensionRegistry);
+                  annotation_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.PARSER, extensionRegistry);
                   if (subBuilder != null) {
                     subBuilder.mergeFrom(annotation_);
                     annotation_ = subBuilder.buildPartial();
@@ -2663,10 +2663,10 @@ public final class DebugProtoBuf {
                 }
                 case 74: {
                   if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                    arrayElement_ = new java.util.ArrayList();
+                    arrayElement_ = new java.util.ArrayList();
                     mutable_bitField0_ |= 0x00000100;
                   }
-                  arrayElement_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry));
+                  arrayElement_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry));
                   break;
                 }
               }
@@ -2686,14 +2686,14 @@ public final class DebugProtoBuf {
         }
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_fieldAccessorTable
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder.class);
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder.class);
         }
 
         public static com.google.protobuf.Parser PARSER =
@@ -2712,7 +2712,7 @@ public final class DebugProtoBuf {
         }
 
         /**
-         * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type}
+         * Protobuf enum {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type}
          */
         public enum Type
             implements com.google.protobuf.ProtocolMessageEnum {
@@ -2867,7 +2867,7 @@ public final class DebugProtoBuf {
           }
           public static final com.google.protobuf.Descriptors.EnumDescriptor
               getDescriptor() {
-            return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDescriptor().getEnumTypes().get(0);
+            return org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDescriptor().getEnumTypes().get(0);
           }
 
           private static final Type[] VALUES = values();
@@ -2889,15 +2889,15 @@ public final class DebugProtoBuf {
             this.value = value;
           }
 
-          // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type)
+          // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type)
         }
 
         private int bitField0_;
-        // optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+        // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
         public static final int TYPE_FIELD_NUMBER = 1;
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type type_;
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type type_;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2909,7 +2909,7 @@ public final class DebugProtoBuf {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2917,7 +2917,7 @@ public final class DebugProtoBuf {
          * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType() {
           return type_;
         }
 
@@ -3041,73 +3041,73 @@ public final class DebugProtoBuf {
           return enumValueId_;
         }
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+        // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
         public static final int ANNOTATION_FIELD_NUMBER = 8;
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation annotation_;
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation annotation_;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
         public boolean hasAnnotation() {
           return ((bitField0_ & 0x00000080) == 0x00000080);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation getAnnotation() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation() {
           return annotation_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder() {
           return annotation_;
         }
 
-        // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+        // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
         public static final int ARRAY_ELEMENT_FIELD_NUMBER = 9;
-        private java.util.List arrayElement_;
+        private java.util.List arrayElement_;
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        public java.util.List getArrayElementList() {
+        public java.util.List getArrayElementList() {
           return arrayElement_;
         }
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        public java.util.List 
+        public java.util.List 
             getArrayElementOrBuilderList() {
           return arrayElement_;
         }
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
         public int getArrayElementCount() {
           return arrayElement_.size();
         }
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
           return arrayElement_.get(index);
         }
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
             int index) {
           return arrayElement_.get(index);
         }
 
         private void initFields() {
-          type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
+          type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
           intValue_ = 0L;
           floatValue_ = 0F;
           doubleValue_ = 0D;
           stringValue_ = 0;
           classId_ = 0;
           enumValueId_ = 0;
-          annotation_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+          annotation_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
           arrayElement_ = java.util.Collections.emptyList();
         }
         private byte memoizedIsInitialized = -1;
@@ -3218,53 +3218,53 @@ public final class DebugProtoBuf {
           return super.writeReplace();
         }
 
-        public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             com.google.protobuf.ByteString data)
             throws com.google.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data);
         }
-        public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value 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.DebugProtoBuf.Annotation.Argument.Value parseFrom(byte[] data)
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(byte[] data)
             throws com.google.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data);
         }
-        public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value 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.DebugProtoBuf.Annotation.Argument.Value parseFrom(java.io.InputStream input)
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(java.io.InputStream input)
             throws java.io.IOException {
           return PARSER.parseFrom(input);
         }
-        public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value 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.DebugProtoBuf.Annotation.Argument.Value parseDelimitedFrom(java.io.InputStream input)
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseDelimitedFrom(java.io.InputStream input)
             throws java.io.IOException {
           return PARSER.parseDelimitedFrom(input);
         }
-        public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value parseDelimitedFrom(
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value 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.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             com.google.protobuf.CodedInputStream input)
             throws java.io.IOException {
           return PARSER.parseFrom(input);
         }
-        public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
@@ -3273,7 +3273,7 @@ public final class DebugProtoBuf {
 
         public static Builder newBuilder() { return Builder.create(); }
         public Builder newBuilderForType() { return newBuilder(); }
-        public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value prototype) {
+        public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value prototype) {
           return newBuilder().mergeFrom(prototype);
         }
         public Builder toBuilder() { return newBuilder(this); }
@@ -3285,24 +3285,24 @@ public final class DebugProtoBuf {
           return builder;
         }
         /**
-         * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value}
+         * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
          */
         public static final class Builder extends
             com.google.protobuf.GeneratedMessage.Builder
-           implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder {
+           implements org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder {
           public static final com.google.protobuf.Descriptors.Descriptor
               getDescriptor() {
-            return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_descriptor;
+            return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
           }
 
           protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
               internalGetFieldAccessorTable() {
-            return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_fieldAccessorTable
+            return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable
                 .ensureFieldAccessorsInitialized(
-                    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder.class);
+                    org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder.class);
           }
 
-          // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.newBuilder()
+          // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.newBuilder()
           private Builder() {
             maybeForceBuilderInitialization();
           }
@@ -3324,7 +3324,7 @@ public final class DebugProtoBuf {
 
           public Builder clear() {
             super.clear();
-            type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
+            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
             bitField0_ = (bitField0_ & ~0x00000001);
             intValue_ = 0L;
             bitField0_ = (bitField0_ & ~0x00000002);
@@ -3339,7 +3339,7 @@ public final class DebugProtoBuf {
             enumValueId_ = 0;
             bitField0_ = (bitField0_ & ~0x00000040);
             if (annotationBuilder_ == null) {
-              annotation_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+              annotation_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
             } else {
               annotationBuilder_.clear();
             }
@@ -3359,23 +3359,23 @@ public final class DebugProtoBuf {
 
           public com.google.protobuf.Descriptors.Descriptor
               getDescriptorForType() {
-            return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_descriptor;
+            return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
           }
 
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value getDefaultInstanceForType() {
-            return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getDefaultInstanceForType() {
+            return org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
           }
 
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value build() {
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value result = buildPartial();
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value build() {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value result = buildPartial();
             if (!result.isInitialized()) {
               throw newUninitializedMessageException(result);
             }
             return result;
           }
 
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value buildPartial() {
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value(this);
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value buildPartial() {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value(this);
             int from_bitField0_ = bitField0_;
             int to_bitField0_ = 0;
             if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3429,16 +3429,16 @@ public final class DebugProtoBuf {
           }
 
           public Builder mergeFrom(com.google.protobuf.Message other) {
-            if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value) {
-              return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value)other);
+            if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value) {
+              return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value)other);
             } else {
               super.mergeFrom(other);
               return this;
             }
           }
 
-          public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value other) {
-            if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance()) return this;
+          public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value other) {
+            if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance()) return this;
             if (other.hasType()) {
               setType(other.getType());
             }
@@ -3513,11 +3513,11 @@ public final class DebugProtoBuf {
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value parsedMessage = null;
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parsedMessage = null;
             try {
               parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
             } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value) e.getUnfinishedMessage();
+              parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value) e.getUnfinishedMessage();
               throw e;
             } finally {
               if (parsedMessage != null) {
@@ -3528,10 +3528,10 @@ public final class DebugProtoBuf {
           }
           private int bitField0_;
 
-          // optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
-          private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
+          // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+          private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3543,7 +3543,7 @@ public final class DebugProtoBuf {
             return ((bitField0_ & 0x00000001) == 0x00000001);
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3551,11 +3551,11 @@ public final class DebugProtoBuf {
            * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
            * 

            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType() {
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType() {
             return type_;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3563,7 +3563,7 @@ public final class DebugProtoBuf {
            * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
            * 

            */
-          public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type value) {
+          public Builder setType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3573,7 +3573,7 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3583,7 +3583,7 @@ public final class DebugProtoBuf {
            */
           public Builder clearType() {
             bitField0_ = (bitField0_ & ~0x00000001);
-            type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
+            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
             onChanged();
             return this;
           }
@@ -3834,20 +3834,20 @@ public final class DebugProtoBuf {
             return this;
           }
 
-          // optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
-          private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation annotation_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+          // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+          private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation annotation_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
           private com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
           public boolean hasAnnotation() {
             return ((bitField0_ & 0x00000080) == 0x00000080);
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation getAnnotation() {
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation() {
             if (annotationBuilder_ == null) {
               return annotation_;
             } else {
@@ -3855,9 +3855,9 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
-          public Builder setAnnotation(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation value) {
+          public Builder setAnnotation(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
             if (annotationBuilder_ == null) {
               if (value == null) {
                 throw new NullPointerException();
@@ -3871,10 +3871,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
           public Builder setAnnotation(
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
             if (annotationBuilder_ == null) {
               annotation_ = builderForValue.build();
               onChanged();
@@ -3885,14 +3885,14 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
-          public Builder mergeAnnotation(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation value) {
+          public Builder mergeAnnotation(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
             if (annotationBuilder_ == null) {
               if (((bitField0_ & 0x00000080) == 0x00000080) &&
-                  annotation_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance()) {
+                  annotation_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance()) {
                 annotation_ =
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
               } else {
                 annotation_ = value;
               }
@@ -3904,11 +3904,11 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
           public Builder clearAnnotation() {
             if (annotationBuilder_ == null) {
-              annotation_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+              annotation_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
               onChanged();
             } else {
               annotationBuilder_.clear();
@@ -3917,17 +3917,17 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Builder getAnnotationBuilder() {
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder getAnnotationBuilder() {
             bitField0_ |= 0x00000080;
             onChanged();
             return getAnnotationFieldBuilder().getBuilder();
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder() {
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder() {
             if (annotationBuilder_ != null) {
               return annotationBuilder_.getMessageOrBuilder();
             } else {
@@ -3935,14 +3935,14 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
           private com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.AnnotationOrBuilder> 
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> 
               getAnnotationFieldBuilder() {
             if (annotationBuilder_ == null) {
               annotationBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.AnnotationOrBuilder>(
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder>(
                       annotation_,
                       getParentForChildren(),
                       isClean());
@@ -3951,23 +3951,23 @@ public final class DebugProtoBuf {
             return annotationBuilder_;
           }
 
-          // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
-          private java.util.List arrayElement_ =
+          // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+          private java.util.List arrayElement_ =
             java.util.Collections.emptyList();
           private void ensureArrayElementIsMutable() {
             if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-              arrayElement_ = new java.util.ArrayList(arrayElement_);
+              arrayElement_ = new java.util.ArrayList(arrayElement_);
               bitField0_ |= 0x00000100;
              }
           }
 
           private com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> arrayElementBuilder_;
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> arrayElementBuilder_;
 
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public java.util.List getArrayElementList() {
+          public java.util.List getArrayElementList() {
             if (arrayElementBuilder_ == null) {
               return java.util.Collections.unmodifiableList(arrayElement_);
             } else {
@@ -3975,7 +3975,7 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public int getArrayElementCount() {
             if (arrayElementBuilder_ == null) {
@@ -3985,9 +3985,9 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
             if (arrayElementBuilder_ == null) {
               return arrayElement_.get(index);
             } else {
@@ -3995,10 +3995,10 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder setArrayElement(
-              int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+              int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
             if (arrayElementBuilder_ == null) {
               if (value == null) {
                 throw new NullPointerException();
@@ -4012,10 +4012,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder setArrayElement(
-              int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             if (arrayElementBuilder_ == null) {
               ensureArrayElementIsMutable();
               arrayElement_.set(index, builderForValue.build());
@@ -4026,9 +4026,9 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public Builder addArrayElement(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+          public Builder addArrayElement(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
             if (arrayElementBuilder_ == null) {
               if (value == null) {
                 throw new NullPointerException();
@@ -4042,10 +4042,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+              int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
             if (arrayElementBuilder_ == null) {
               if (value == null) {
                 throw new NullPointerException();
@@ -4059,10 +4059,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             if (arrayElementBuilder_ == null) {
               ensureArrayElementIsMutable();
               arrayElement_.add(builderForValue.build());
@@ -4073,10 +4073,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             if (arrayElementBuilder_ == null) {
               ensureArrayElementIsMutable();
               arrayElement_.add(index, builderForValue.build());
@@ -4087,10 +4087,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder addAllArrayElement(
-              java.lang.Iterable values) {
+              java.lang.Iterable values) {
             if (arrayElementBuilder_ == null) {
               ensureArrayElementIsMutable();
               super.addAll(values, arrayElement_);
@@ -4101,7 +4101,7 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder clearArrayElement() {
             if (arrayElementBuilder_ == null) {
@@ -4114,7 +4114,7 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder removeArrayElement(int index) {
             if (arrayElementBuilder_ == null) {
@@ -4127,16 +4127,16 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder getArrayElementBuilder(
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder getArrayElementBuilder(
               int index) {
             return getArrayElementFieldBuilder().getBuilder(index);
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
               int index) {
             if (arrayElementBuilder_ == null) {
               return arrayElement_.get(index);  } else {
@@ -4144,9 +4144,9 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public java.util.List 
+          public java.util.List 
                getArrayElementOrBuilderList() {
             if (arrayElementBuilder_ != null) {
               return arrayElementBuilder_.getMessageOrBuilderList();
@@ -4155,33 +4155,33 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder addArrayElementBuilder() {
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder addArrayElementBuilder() {
             return getArrayElementFieldBuilder().addBuilder(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder addArrayElementBuilder(
+          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder addArrayElementBuilder(
               int index) {
             return getArrayElementFieldBuilder().addBuilder(
-                index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
+                index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public java.util.List 
+          public java.util.List 
                getArrayElementBuilderList() {
             return getArrayElementFieldBuilder().getBuilderList();
           }
           private com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> 
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> 
               getArrayElementFieldBuilder() {
             if (arrayElementBuilder_ == null) {
               arrayElementBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder>(
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder>(
                       arrayElement_,
                       ((bitField0_ & 0x00000100) == 0x00000100),
                       getParentForChildren(),
@@ -4191,7 +4191,7 @@ public final class DebugProtoBuf {
             return arrayElementBuilder_;
           }
 
-          // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value)
+          // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
         }
 
         static {
@@ -4199,7 +4199,7 @@ public final class DebugProtoBuf {
           defaultInstance.initFields();
         }
 
-        // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value)
+        // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
       }
 
       private int bitField0_;
@@ -4227,31 +4227,31 @@ public final class DebugProtoBuf {
         return nameId_;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+      // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
       public static final int VALUE_FIELD_NUMBER = 2;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value value_;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value_;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value getValue() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getValue() {
         return value_;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder() {
         return value_;
       }
 
       private void initFields() {
         nameId_ = 0;
-        value_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+        value_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -4312,53 +4312,53 @@ public final class DebugProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument 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.DebugProtoBuf.Annotation.Argument parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument 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.DebugProtoBuf.Annotation.Argument parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument 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.DebugProtoBuf.Annotation.Argument parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument 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.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -4367,7 +4367,7 @@ public final class DebugProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -4379,24 +4379,24 @@ public final class DebugProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
-         implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder {
+         implements org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_fieldAccessorTable
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder.class);
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder.class);
         }
 
-        // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.newBuilder()
+        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -4420,7 +4420,7 @@ public final class DebugProtoBuf {
           nameId_ = 0;
           bitField0_ = (bitField0_ & ~0x00000001);
           if (valueBuilder_ == null) {
-            value_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+            value_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
           } else {
             valueBuilder_.clear();
           }
@@ -4434,23 +4434,23 @@ public final class DebugProtoBuf {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument build() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument result = buildPartial();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument build() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument(this);
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument buildPartial() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4471,16 +4471,16 @@ public final class DebugProtoBuf {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument) {
-            return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument)other);
+          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument) {
+            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument other) {
+          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance()) return this;
           if (other.hasNameId()) {
             setNameId(other.getNameId());
           }
@@ -4511,11 +4511,11 @@ public final class DebugProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument parsedMessage = null;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -4575,20 +4575,20 @@ public final class DebugProtoBuf {
           return this;
         }
 
-        // required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+        // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> valueBuilder_;
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> valueBuilder_;
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value getValue() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getValue() {
           if (valueBuilder_ == null) {
             return value_;
           } else {
@@ -4596,9 +4596,9 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
-        public Builder setValue(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+        public Builder setValue(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
           if (valueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4612,10 +4612,10 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
         public Builder setValue(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
             onChanged();
@@ -4626,14 +4626,14 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
-        public Builder mergeValue(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+        public Builder mergeValue(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) == 0x00000002) &&
-                value_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance()) {
+                value_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance()) {
               value_ =
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.newBuilder(value_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.newBuilder(value_).mergeFrom(value).buildPartial();
             } else {
               value_ = value;
             }
@@ -4645,11 +4645,11 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
         public Builder clearValue() {
           if (valueBuilder_ == null) {
-            value_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+            value_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
             onChanged();
           } else {
             valueBuilder_.clear();
@@ -4658,17 +4658,17 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder getValueBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder getValueBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getValueFieldBuilder().getBuilder();
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder() {
           if (valueBuilder_ != null) {
             return valueBuilder_.getMessageOrBuilder();
           } else {
@@ -4676,14 +4676,14 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> 
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> 
             getValueFieldBuilder() {
           if (valueBuilder_ == null) {
             valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder>(
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder>(
                     value_,
                     getParentForChildren(),
                     isClean());
@@ -4692,7 +4692,7 @@ public final class DebugProtoBuf {
           return valueBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation.Argument)
       }
 
       static {
@@ -4700,7 +4700,7 @@ public final class DebugProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation.Argument)
     }
 
     private int bitField0_;
@@ -4728,38 +4728,38 @@ public final class DebugProtoBuf {
       return id_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+    // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
     public static final int ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List argument_;
+    private java.util.List argument_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    public java.util.List getArgumentList() {
+    public java.util.List getArgumentList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getArgumentOrBuilderList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
     public int getArgumentCount() {
       return argument_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index) {
       return argument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
         int index) {
       return argument_.get(index);
     }
@@ -4825,53 +4825,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation 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.DebugProtoBuf.Annotation parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation 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.DebugProtoBuf.Annotation parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation 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.DebugProtoBuf.Annotation parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation 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.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4880,7 +4880,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -4892,24 +4892,24 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
-       implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.AnnotationOrBuilder {
+       implements org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -4947,23 +4947,23 @@ public final class DebugProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation build() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation result = buildPartial();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation build() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation(this);
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation buildPartial() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4985,16 +4985,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation other) {
+        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -5046,11 +5046,11 @@ public final class DebugProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation parsedMessage = null;
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -5110,23 +5110,23 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
-      private java.util.List argument_ =
+      // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+      private java.util.List argument_ =
         java.util.Collections.emptyList();
       private void ensureArgumentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          argument_ = new java.util.ArrayList(argument_);
+          argument_ = new java.util.ArrayList(argument_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder> argumentBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder> argumentBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public java.util.List getArgumentList() {
+      public java.util.List getArgumentList() {
         if (argumentBuilder_ == null) {
           return java.util.Collections.unmodifiableList(argument_);
         } else {
@@ -5134,7 +5134,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public int getArgumentCount() {
         if (argumentBuilder_ == null) {
@@ -5144,9 +5144,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index) {
         if (argumentBuilder_ == null) {
           return argument_.get(index);
         } else {
@@ -5154,10 +5154,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5171,10 +5171,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.set(index, builderForValue.build());
@@ -5185,9 +5185,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public Builder addArgument(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument value) {
+      public Builder addArgument(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5201,10 +5201,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5218,10 +5218,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.add(builderForValue.build());
@@ -5232,10 +5232,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.add(index, builderForValue.build());
@@ -5246,10 +5246,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder addAllArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           super.addAll(values, argument_);
@@ -5260,7 +5260,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder clearArgument() {
         if (argumentBuilder_ == null) {
@@ -5273,7 +5273,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder removeArgument(int index) {
         if (argumentBuilder_ == null) {
@@ -5286,16 +5286,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder getArgumentBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder getArgumentBuilder(
           int index) {
         return getArgumentFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
           int index) {
         if (argumentBuilder_ == null) {
           return argument_.get(index);  } else {
@@ -5303,9 +5303,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getArgumentOrBuilderList() {
         if (argumentBuilder_ != null) {
           return argumentBuilder_.getMessageOrBuilderList();
@@ -5314,33 +5314,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder addArgumentBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder addArgumentBuilder() {
         return getArgumentFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder addArgumentBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder addArgumentBuilder(
           int index) {
         return getArgumentFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getArgumentBuilderList() {
         return getArgumentFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder> 
           getArgumentFieldBuilder() {
         if (argumentBuilder_ == null) {
           argumentBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder>(
                   argument_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -5350,7 +5350,7 @@ public final class DebugProtoBuf {
         return argumentBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Annotation)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation)
     }
 
     static {
@@ -5358,49 +5358,49 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Annotation)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation)
   }
 
   public interface TypeOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
 
-    // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+    // required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
     boolean hasConstructor();
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor getConstructor();
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+    // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getArgumentList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument getArgument(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
     int getArgumentCount();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getArgumentOrBuilderList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
         int index);
 
     // optional bool nullable = 3 [default = false];
@@ -5435,9 +5435,9 @@ public final class DebugProtoBuf {
      */
     int getFlexibleTypeCapabilitiesId();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+    // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -5447,7 +5447,7 @@ public final class DebugProtoBuf {
      */
     boolean hasFlexibleUpperBound();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -5455,9 +5455,9 @@ public final class DebugProtoBuf {
      * to represent flexible types is too many wasted bytes.
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getFlexibleUpperBound();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getFlexibleUpperBound();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -5465,10 +5465,10 @@ public final class DebugProtoBuf {
      * to represent flexible types is too many wasted bytes.
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
    */
   public static final class Type extends
       com.google.protobuf.GeneratedMessage
@@ -5519,11 +5519,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 10: {
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = constructor_.toBuilder();
               }
-              constructor_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.PARSER, extensionRegistry);
+              constructor_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(constructor_);
                 constructor_ = subBuilder.buildPartial();
@@ -5533,10 +5533,10 @@ public final class DebugProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                argument_ = new java.util.ArrayList();
+                argument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              argument_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.PARSER, extensionRegistry));
+              argument_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.PARSER, extensionRegistry));
               break;
             }
             case 24: {
@@ -5550,11 +5550,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 42: {
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = flexibleUpperBound_.toBuilder();
               }
-              flexibleUpperBound_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              flexibleUpperBound_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(flexibleUpperBound_);
                 flexibleUpperBound_ = subBuilder.buildPartial();
@@ -5579,14 +5579,14 @@ public final class DebugProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor;
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder.class);
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder.class);
     }
 
     public static com.google.protobuf.Parser PARSER =
@@ -5607,15 +5607,15 @@ public final class DebugProtoBuf {
     public interface ConstructorOrBuilder
         extends com.google.protobuf.MessageOrBuilder {
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+      // optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+       * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
        */
       boolean hasKind();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+       * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind getKind();
 
       // required int32 id = 2;
       /**
@@ -5636,7 +5636,7 @@ public final class DebugProtoBuf {
       int getId();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Constructor}
      */
     public static final class Constructor extends
         com.google.protobuf.GeneratedMessage
@@ -5688,7 +5688,7 @@ public final class DebugProtoBuf {
               }
               case 8: {
                 int rawValue = input.readEnum();
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.valueOf(rawValue);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind value = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind.valueOf(rawValue);
                 if (value == null) {
                   unknownFields.mergeVarintField(1, rawValue);
                 } else {
@@ -5716,14 +5716,14 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Builder.class);
       }
 
       public static com.google.protobuf.Parser PARSER =
@@ -5742,7 +5742,7 @@ public final class DebugProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind}
+       * Protobuf enum {@code org.jetbrains.kotlin.serialization.Type.Constructor.Kind}
        */
       public enum Kind
           implements com.google.protobuf.ProtocolMessageEnum {
@@ -5798,7 +5798,7 @@ public final class DebugProtoBuf {
         }
         public static final com.google.protobuf.Descriptors.EnumDescriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDescriptor().getEnumTypes().get(0);
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.getDescriptor().getEnumTypes().get(0);
         }
 
         private static final Kind[] VALUES = values();
@@ -5820,23 +5820,23 @@ public final class DebugProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Type.Constructor.Kind)
       }
 
       private int bitField0_;
-      // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+      // optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
       public static final int KIND_FIELD_NUMBER = 1;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind kind_;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind kind_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+       * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+       * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind getKind() {
         return kind_;
       }
 
@@ -5865,7 +5865,7 @@ public final class DebugProtoBuf {
       }
 
       private void initFields() {
-        kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS;
+        kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS;
         id_ = 0;
       }
       private byte memoizedIsInitialized = -1;
@@ -5919,53 +5919,53 @@ public final class DebugProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor 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.DebugProtoBuf.Type.Constructor parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor 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.DebugProtoBuf.Type.Constructor parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor 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.DebugProtoBuf.Type.Constructor parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor 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.DebugProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -5974,7 +5974,7 @@ public final class DebugProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -5986,24 +5986,24 @@ public final class DebugProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Constructor}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
-         implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder {
+         implements org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ConstructorOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder.class);
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Builder.class);
         }
 
-        // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.newBuilder()
+        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -6023,7 +6023,7 @@ public final class DebugProtoBuf {
 
         public Builder clear() {
           super.clear();
-          kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS;
+          kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS;
           bitField0_ = (bitField0_ & ~0x00000001);
           id_ = 0;
           bitField0_ = (bitField0_ & ~0x00000002);
@@ -6036,23 +6036,23 @@ public final class DebugProtoBuf {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_descriptor;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor build() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor result = buildPartial();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor build() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor(this);
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor buildPartial() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6069,16 +6069,16 @@ public final class DebugProtoBuf {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor) {
-            return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor)other);
+          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor) {
+            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor other) {
+          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance()) return this;
           if (other.hasKind()) {
             setKind(other.getKind());
           }
@@ -6101,11 +6101,11 @@ public final class DebugProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parsedMessage = null;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -6116,24 +6116,24 @@ public final class DebugProtoBuf {
         }
         private int bitField0_;
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS;
+        // optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+         * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
          */
         public boolean hasKind() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+         * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind getKind() {
           return kind_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+         * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
          */
-        public Builder setKind(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind value) {
+        public Builder setKind(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -6143,11 +6143,11 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+         * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
          */
         public Builder clearKind() {
           bitField0_ = (bitField0_ & ~0x00000001);
-          kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS;
+          kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS;
           onChanged();
           return this;
         }
@@ -6201,7 +6201,7 @@ public final class DebugProtoBuf {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type.Constructor)
       }
 
       static {
@@ -6209,38 +6209,38 @@ public final class DebugProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type.Constructor)
     }
 
     public interface ArgumentOrBuilder
         extends com.google.protobuf.MessageOrBuilder {
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+      // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
        */
       boolean hasProjection();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection getProjection();
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+      // required .org.jetbrains.kotlin.serialization.Type type = 2;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
       boolean hasType();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Argument}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
      */
     public static final class Argument extends
         com.google.protobuf.GeneratedMessage
@@ -6292,7 +6292,7 @@ public final class DebugProtoBuf {
               }
               case 8: {
                 int rawValue = input.readEnum();
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.valueOf(rawValue);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection value = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.valueOf(rawValue);
                 if (value == null) {
                   unknownFields.mergeVarintField(1, rawValue);
                 } else {
@@ -6302,11 +6302,11 @@ public final class DebugProtoBuf {
                 break;
               }
               case 18: {
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) == 0x00000002)) {
                   subBuilder = type_.toBuilder();
                 }
-                type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+                type_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(type_);
                   type_ = subBuilder.buildPartial();
@@ -6328,14 +6328,14 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder.class);
       }
 
       public static com.google.protobuf.Parser PARSER =
@@ -6354,7 +6354,7 @@ public final class DebugProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection}
+       * Protobuf enum {@code org.jetbrains.kotlin.serialization.Type.Argument.Projection}
        */
       public enum Projection
           implements com.google.protobuf.ProtocolMessageEnum {
@@ -6419,7 +6419,7 @@ public final class DebugProtoBuf {
         }
         public static final com.google.protobuf.Descriptors.EnumDescriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDescriptor().getEnumTypes().get(0);
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDescriptor().getEnumTypes().get(0);
         }
 
         private static final Projection[] VALUES = values();
@@ -6441,51 +6441,51 @@ public final class DebugProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Type.Argument.Projection)
       }
 
       private int bitField0_;
-      // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+      // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
       public static final int PROJECTION_FIELD_NUMBER = 1;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection projection_;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection projection_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
        */
       public boolean hasProjection() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() {
         return projection_;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+      // required .org.jetbrains.kotlin.serialization.Type type = 2;
       public static final int TYPE_FIELD_NUMBER = 2;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
         return type_;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
         return type_;
       }
 
       private void initFields() {
-        projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
-        type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+        projection_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
+        type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -6542,53 +6542,53 @@ public final class DebugProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument 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.DebugProtoBuf.Type.Argument parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument 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.DebugProtoBuf.Type.Argument parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument 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.DebugProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument 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.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -6597,7 +6597,7 @@ public final class DebugProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -6609,24 +6609,24 @@ public final class DebugProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Argument}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
-         implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder {
+         implements org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder.class);
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder.class);
         }
 
-        // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.newBuilder()
+        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -6647,10 +6647,10 @@ public final class DebugProtoBuf {
 
         public Builder clear() {
           super.clear();
-          projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
+          projection_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
           bitField0_ = (bitField0_ & ~0x00000001);
           if (typeBuilder_ == null) {
-            type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
           } else {
             typeBuilder_.clear();
           }
@@ -6664,23 +6664,23 @@ public final class DebugProtoBuf {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument build() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument result = buildPartial();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument build() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument(this);
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument buildPartial() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6701,16 +6701,16 @@ public final class DebugProtoBuf {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument) {
-            return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument)other);
+          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument) {
+            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument other) {
+          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()) return this;
           if (other.hasProjection()) {
             setProjection(other.getProjection());
           }
@@ -6737,11 +6737,11 @@ public final class DebugProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parsedMessage = null;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -6752,24 +6752,24 @@ public final class DebugProtoBuf {
         }
         private int bitField0_;
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
+        // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
          */
         public boolean hasProjection() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() {
           return projection_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
          */
-        public Builder setProjection(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection value) {
+        public Builder setProjection(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -6779,29 +6779,29 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
          */
         public Builder clearProjection() {
           bitField0_ = (bitField0_ & ~0x00000001);
-          projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
+          projection_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
           onChanged();
           return this;
         }
 
-        // required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+        // required .org.jetbrains.kotlin.serialization.Type type = 2;
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
         public boolean hasType() {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
           if (typeBuilder_ == null) {
             return type_;
           } else {
@@ -6809,9 +6809,9 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
-        public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+        public Builder setType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
           if (typeBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -6825,10 +6825,10 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
         public Builder setType(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
           if (typeBuilder_ == null) {
             type_ = builderForValue.build();
             onChanged();
@@ -6839,14 +6839,14 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
-        public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+        public Builder mergeType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
           if (typeBuilder_ == null) {
             if (((bitField0_ & 0x00000002) == 0x00000002) &&
-                type_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+                type_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
               type_ =
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
             } else {
               type_ = value;
             }
@@ -6858,11 +6858,11 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
         public Builder clearType() {
           if (typeBuilder_ == null) {
-            type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
             onChanged();
           } else {
             typeBuilder_.clear();
@@ -6871,17 +6871,17 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getTypeFieldBuilder().getBuilder();
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
           if (typeBuilder_ != null) {
             return typeBuilder_.getMessageOrBuilder();
           } else {
@@ -6889,14 +6889,14 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> 
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
             getTypeFieldBuilder() {
           if (typeBuilder_ == null) {
             typeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>(
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
                     type_,
                     getParentForChildren(),
                     isClean());
@@ -6905,7 +6905,7 @@ public final class DebugProtoBuf {
           return typeBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type.Argument)
       }
 
       static {
@@ -6913,64 +6913,64 @@ public final class DebugProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type.Argument)
     }
 
     private int bitField0_;
-    // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+    // required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
     public static final int CONSTRUCTOR_FIELD_NUMBER = 1;
-    private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor constructor_;
+    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor constructor_;
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
     public boolean hasConstructor() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor getConstructor() {
       return constructor_;
     }
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder() {
       return constructor_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+    // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
     public static final int ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List argument_;
+    private java.util.List argument_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    public java.util.List getArgumentList() {
+    public java.util.List getArgumentList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getArgumentOrBuilderList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
     public int getArgumentCount() {
       return argument_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument getArgument(int index) {
       return argument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
         int index) {
       return argument_.get(index);
     }
@@ -7019,11 +7019,11 @@ public final class DebugProtoBuf {
       return flexibleTypeCapabilitiesId_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+    // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
     public static final int FLEXIBLE_UPPER_BOUND_FIELD_NUMBER = 5;
-    private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type flexibleUpperBound_;
+    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type flexibleUpperBound_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -7035,7 +7035,7 @@ public final class DebugProtoBuf {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -7043,11 +7043,11 @@ public final class DebugProtoBuf {
      * to represent flexible types is too many wasted bytes.
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getFlexibleUpperBound() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getFlexibleUpperBound() {
       return flexibleUpperBound_;
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -7055,16 +7055,16 @@ public final class DebugProtoBuf {
      * to represent flexible types is too many wasted bytes.
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder() {
       return flexibleUpperBound_;
     }
 
     private void initFields() {
-      constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
+      constructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
       argument_ = java.util.Collections.emptyList();
       nullable_ = false;
       flexibleTypeCapabilitiesId_ = 0;
-      flexibleUpperBound_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      flexibleUpperBound_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -7154,53 +7154,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type 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.DebugProtoBuf.Type parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type 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.DebugProtoBuf.Type parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type 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.DebugProtoBuf.Type parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type 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.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7209,7 +7209,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -7221,24 +7221,24 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
-       implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder {
+       implements org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -7262,7 +7262,7 @@ public final class DebugProtoBuf {
       public Builder clear() {
         super.clear();
         if (constructorBuilder_ == null) {
-          constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
+          constructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
         } else {
           constructorBuilder_.clear();
         }
@@ -7278,7 +7278,7 @@ public final class DebugProtoBuf {
         flexibleTypeCapabilitiesId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
         if (flexibleUpperBoundBuilder_ == null) {
-          flexibleUpperBound_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          flexibleUpperBound_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           flexibleUpperBoundBuilder_.clear();
         }
@@ -7292,23 +7292,23 @@ public final class DebugProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type build() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type result = buildPartial();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type build() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Type result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type(this);
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type buildPartial() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Type result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Type(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -7350,16 +7350,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Type) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Type)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type other) {
+        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) return this;
         if (other.hasConstructor()) {
           mergeConstructor(other.getConstructor());
         }
@@ -7430,11 +7430,11 @@ public final class DebugProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parsedMessage = null;
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Type) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -7445,20 +7445,20 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
+      // required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor constructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder> constructorBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ConstructorOrBuilder> constructorBuilder_;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
       public boolean hasConstructor() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor getConstructor() {
         if (constructorBuilder_ == null) {
           return constructor_;
         } else {
@@ -7466,9 +7466,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
-      public Builder setConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor value) {
+      public Builder setConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor value) {
         if (constructorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7482,10 +7482,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
       public Builder setConstructor(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Builder builderForValue) {
         if (constructorBuilder_ == null) {
           constructor_ = builderForValue.build();
           onChanged();
@@ -7496,14 +7496,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
-      public Builder mergeConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor value) {
+      public Builder mergeConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor value) {
         if (constructorBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              constructor_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance()) {
+              constructor_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance()) {
             constructor_ =
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.newBuilder(constructor_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.newBuilder(constructor_).mergeFrom(value).buildPartial();
           } else {
             constructor_ = value;
           }
@@ -7515,11 +7515,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
       public Builder clearConstructor() {
         if (constructorBuilder_ == null) {
-          constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
+          constructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance();
           onChanged();
         } else {
           constructorBuilder_.clear();
@@ -7528,17 +7528,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder getConstructorBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Builder getConstructorBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getConstructorFieldBuilder().getBuilder();
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder() {
         if (constructorBuilder_ != null) {
           return constructorBuilder_.getMessageOrBuilder();
         } else {
@@ -7546,14 +7546,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ConstructorOrBuilder> 
           getConstructorFieldBuilder() {
         if (constructorBuilder_ == null) {
           constructorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ConstructorOrBuilder>(
                   constructor_,
                   getParentForChildren(),
                   isClean());
@@ -7562,23 +7562,23 @@ public final class DebugProtoBuf {
         return constructorBuilder_;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
-      private java.util.List argument_ =
+      // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+      private java.util.List argument_ =
         java.util.Collections.emptyList();
       private void ensureArgumentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          argument_ = new java.util.ArrayList(argument_);
+          argument_ = new java.util.ArrayList(argument_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> argumentBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> argumentBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public java.util.List getArgumentList() {
+      public java.util.List getArgumentList() {
         if (argumentBuilder_ == null) {
           return java.util.Collections.unmodifiableList(argument_);
         } else {
@@ -7586,7 +7586,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public int getArgumentCount() {
         if (argumentBuilder_ == null) {
@@ -7596,9 +7596,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument getArgument(int index) {
         if (argumentBuilder_ == null) {
           return argument_.get(index);
         } else {
@@ -7606,10 +7606,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7623,10 +7623,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.set(index, builderForValue.build());
@@ -7637,9 +7637,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public Builder addArgument(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) {
+      public Builder addArgument(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7653,10 +7653,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7670,10 +7670,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.add(builderForValue.build());
@@ -7684,10 +7684,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.add(index, builderForValue.build());
@@ -7698,10 +7698,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder addAllArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           super.addAll(values, argument_);
@@ -7712,7 +7712,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder clearArgument() {
         if (argumentBuilder_ == null) {
@@ -7725,7 +7725,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder removeArgument(int index) {
         if (argumentBuilder_ == null) {
@@ -7738,16 +7738,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder getArgumentBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder getArgumentBuilder(
           int index) {
         return getArgumentFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
           int index) {
         if (argumentBuilder_ == null) {
           return argument_.get(index);  } else {
@@ -7755,9 +7755,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getArgumentOrBuilderList() {
         if (argumentBuilder_ != null) {
           return argumentBuilder_.getMessageOrBuilderList();
@@ -7766,33 +7766,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder() {
         return getArgumentFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder(
           int index) {
         return getArgumentFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getArgumentBuilderList() {
         return getArgumentFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> 
           getArgumentFieldBuilder() {
         if (argumentBuilder_ == null) {
           argumentBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder>(
                   argument_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -7892,12 +7892,12 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type flexibleUpperBound_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type flexibleUpperBound_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> flexibleUpperBoundBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> flexibleUpperBoundBuilder_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -7909,7 +7909,7 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -7917,7 +7917,7 @@ public final class DebugProtoBuf {
        * to represent flexible types is too many wasted bytes.
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getFlexibleUpperBound() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getFlexibleUpperBound() {
         if (flexibleUpperBoundBuilder_ == null) {
           return flexibleUpperBound_;
         } else {
@@ -7925,7 +7925,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -7933,7 +7933,7 @@ public final class DebugProtoBuf {
        * to represent flexible types is too many wasted bytes.
        * 

        */
-      public Builder setFlexibleUpperBound(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+      public Builder setFlexibleUpperBound(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (flexibleUpperBoundBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7947,7 +7947,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -7956,7 +7956,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder setFlexibleUpperBound(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (flexibleUpperBoundBuilder_ == null) {
           flexibleUpperBound_ = builderForValue.build();
           onChanged();
@@ -7967,7 +7967,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -7975,12 +7975,12 @@ public final class DebugProtoBuf {
        * to represent flexible types is too many wasted bytes.
        * 

        */
-      public Builder mergeFlexibleUpperBound(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeFlexibleUpperBound(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (flexibleUpperBoundBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
-              flexibleUpperBound_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              flexibleUpperBound_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
             flexibleUpperBound_ =
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(flexibleUpperBound_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(flexibleUpperBound_).mergeFrom(value).buildPartial();
           } else {
             flexibleUpperBound_ = value;
           }
@@ -7992,7 +7992,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -8002,7 +8002,7 @@ public final class DebugProtoBuf {
        */
       public Builder clearFlexibleUpperBound() {
         if (flexibleUpperBoundBuilder_ == null) {
-          flexibleUpperBound_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          flexibleUpperBound_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           flexibleUpperBoundBuilder_.clear();
@@ -8011,7 +8011,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -8019,13 +8019,13 @@ public final class DebugProtoBuf {
        * to represent flexible types is too many wasted bytes.
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getFlexibleUpperBoundBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getFlexibleUpperBoundBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getFlexibleUpperBoundFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -8033,7 +8033,7 @@ public final class DebugProtoBuf {
        * to represent flexible types is too many wasted bytes.
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder() {
         if (flexibleUpperBoundBuilder_ != null) {
           return flexibleUpperBoundBuilder_.getMessageOrBuilder();
         } else {
@@ -8041,7 +8041,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -8050,11 +8050,11 @@ public final class DebugProtoBuf {
        * 

        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
           getFlexibleUpperBoundFieldBuilder() {
         if (flexibleUpperBoundBuilder_ == null) {
           flexibleUpperBoundBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
                   flexibleUpperBound_,
                   getParentForChildren(),
                   isClean());
@@ -8063,7 +8063,7 @@ public final class DebugProtoBuf {
         return flexibleUpperBoundBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type)
     }
 
     static {
@@ -8071,7 +8071,7 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type)
   }
 
   public interface TypeParameterOrBuilder
@@ -8115,43 +8115,43 @@ public final class DebugProtoBuf {
      */
     boolean getReified();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+    // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
      */
     boolean hasVariance();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance getVariance();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+    // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    java.util.List 
+    java.util.List 
         getUpperBoundList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUpperBound(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
     int getUpperBoundCount();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    java.util.List 
+    java.util.List 
         getUpperBoundOrBuilderList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.TypeParameter}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
    */
   public static final class TypeParameter extends
       com.google.protobuf.GeneratedMessage
@@ -8218,7 +8218,7 @@ public final class DebugProtoBuf {
             }
             case 32: {
               int rawValue = input.readEnum();
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.valueOf(rawValue);
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance value = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(4, rawValue);
               } else {
@@ -8229,10 +8229,10 @@ public final class DebugProtoBuf {
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                upperBound_ = new java.util.ArrayList();
+                upperBound_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              upperBound_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry));
+              upperBound_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
           }
@@ -8252,14 +8252,14 @@ public final class DebugProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor;
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder.class);
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder.class);
     }
 
     public static com.google.protobuf.Parser PARSER =
@@ -8278,7 +8278,7 @@ public final class DebugProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.TypeParameter.Variance}
      */
     public enum Variance
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -8343,7 +8343,7 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Variance[] VALUES = values();
@@ -8365,7 +8365,7 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.TypeParameter.Variance)
     }
 
     private int bitField0_;
@@ -8425,54 +8425,54 @@ public final class DebugProtoBuf {
       return reified_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+    // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
     public static final int VARIANCE_FIELD_NUMBER = 4;
-    private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance variance_;
+    private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance variance_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
      */
     public boolean hasVariance() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() {
       return variance_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+    // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
     public static final int UPPER_BOUND_FIELD_NUMBER = 5;
-    private java.util.List upperBound_;
+    private java.util.List upperBound_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    public java.util.List getUpperBoundList() {
+    public java.util.List getUpperBoundList() {
       return upperBound_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getUpperBoundOrBuilderList() {
       return upperBound_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
     public int getUpperBoundCount() {
       return upperBound_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUpperBound(int index) {
       return upperBound_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
         int index) {
       return upperBound_.get(index);
     }
@@ -8481,7 +8481,7 @@ public final class DebugProtoBuf {
       id_ = 0;
       name_ = 0;
       reified_ = false;
-      variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
+      variance_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
       upperBound_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -8566,53 +8566,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter 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.DebugProtoBuf.TypeParameter parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter 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.DebugProtoBuf.TypeParameter parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter 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.DebugProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter 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.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -8621,7 +8621,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -8633,24 +8633,24 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.TypeParameter}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
-       implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder {
+       implements org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -8677,7 +8677,7 @@ public final class DebugProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         reified_ = false;
         bitField0_ = (bitField0_ & ~0x00000004);
-        variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
+        variance_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
         bitField0_ = (bitField0_ & ~0x00000008);
         if (upperBoundBuilder_ == null) {
           upperBound_ = java.util.Collections.emptyList();
@@ -8694,23 +8694,23 @@ public final class DebugProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter build() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter result = buildPartial();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter build() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter(this);
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter buildPartial() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -8744,16 +8744,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter other) {
+        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -8818,11 +8818,11 @@ public final class DebugProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parsedMessage = null;
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -8948,24 +8948,24 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
+      // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
        */
       public boolean hasVariance() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() {
         return variance_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
        */
-      public Builder setVariance(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance value) {
+      public Builder setVariance(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -8975,32 +8975,32 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
        */
       public Builder clearVariance() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
+        variance_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
         onChanged();
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
-      private java.util.List upperBound_ =
+      // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+      private java.util.List upperBound_ =
         java.util.Collections.emptyList();
       private void ensureUpperBoundIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          upperBound_ = new java.util.ArrayList(upperBound_);
+          upperBound_ = new java.util.ArrayList(upperBound_);
           bitField0_ |= 0x00000010;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> upperBoundBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> upperBoundBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public java.util.List getUpperBoundList() {
+      public java.util.List getUpperBoundList() {
         if (upperBoundBuilder_ == null) {
           return java.util.Collections.unmodifiableList(upperBound_);
         } else {
@@ -9008,7 +9008,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public int getUpperBoundCount() {
         if (upperBoundBuilder_ == null) {
@@ -9018,9 +9018,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUpperBound(int index) {
         if (upperBoundBuilder_ == null) {
           return upperBound_.get(index);
         } else {
@@ -9028,10 +9028,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder setUpperBound(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (upperBoundBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9045,10 +9045,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder setUpperBound(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (upperBoundBuilder_ == null) {
           ensureUpperBoundIsMutable();
           upperBound_.set(index, builderForValue.build());
@@ -9059,9 +9059,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public Builder addUpperBound(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+      public Builder addUpperBound(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (upperBoundBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9075,10 +9075,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (upperBoundBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9092,10 +9092,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (upperBoundBuilder_ == null) {
           ensureUpperBoundIsMutable();
           upperBound_.add(builderForValue.build());
@@ -9106,10 +9106,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (upperBoundBuilder_ == null) {
           ensureUpperBoundIsMutable();
           upperBound_.add(index, builderForValue.build());
@@ -9120,10 +9120,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder addAllUpperBound(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (upperBoundBuilder_ == null) {
           ensureUpperBoundIsMutable();
           super.addAll(values, upperBound_);
@@ -9134,7 +9134,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder clearUpperBound() {
         if (upperBoundBuilder_ == null) {
@@ -9147,7 +9147,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder removeUpperBound(int index) {
         if (upperBoundBuilder_ == null) {
@@ -9160,16 +9160,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getUpperBoundBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getUpperBoundBuilder(
           int index) {
         return getUpperBoundFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
           int index) {
         if (upperBoundBuilder_ == null) {
           return upperBound_.get(index);  } else {
@@ -9177,9 +9177,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getUpperBoundOrBuilderList() {
         if (upperBoundBuilder_ != null) {
           return upperBoundBuilder_.getMessageOrBuilderList();
@@ -9188,33 +9188,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder() {
         return getUpperBoundFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder(
           int index) {
         return getUpperBoundFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getUpperBoundBuilderList() {
         return getUpperBoundFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
           getUpperBoundFieldBuilder() {
         if (upperBoundBuilder_ == null) {
           upperBoundBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
                   upperBound_,
                   ((bitField0_ & 0x00000010) == 0x00000010),
                   getParentForChildren(),
@@ -9224,7 +9224,7 @@ public final class DebugProtoBuf {
         return upperBoundBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeParameter)
     }
 
     static {
@@ -9232,7 +9232,7 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeParameter)
   }
 
   public interface ClassOrBuilder extends
@@ -9304,9 +9304,9 @@ public final class DebugProtoBuf {
      */
     int getFqName();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+    // optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
@@ -9314,70 +9314,70 @@ public final class DebugProtoBuf {
      */
     boolean hasClassObject();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject getClassObject();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
     int getTypeParameterCount();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index);
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+    // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    java.util.List 
+    java.util.List 
         getSupertypeList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getSupertype(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
     int getSupertypeCount();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    java.util.List 
+    java.util.List 
         getSupertypeOrBuilderList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
         int index);
 
     // repeated int32 nested_class_name = 7;
@@ -9409,29 +9409,29 @@ public final class DebugProtoBuf {
      */
     int getNestedClassName(int index);
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+    // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    java.util.List 
+    java.util.List 
         getMemberList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
     int getMemberCount();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    java.util.List 
+    java.util.List 
         getMemberOrBuilderList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
         int index);
 
     // repeated int32 enum_entry = 12;
@@ -9448,9 +9448,9 @@ public final class DebugProtoBuf {
      */
     int getEnumEntry(int index);
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+    // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
@@ -9458,30 +9458,30 @@ public final class DebugProtoBuf {
      */
     boolean hasPrimaryConstructor();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
    */
   public static final class Class extends
       com.google.protobuf.GeneratedMessage.ExtendableMessage<
         Class> implements ClassOrBuilder {
     // Use Class.newBuilder() to construct.
-    private Class(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Class(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -9541,11 +9541,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = classObject_.toBuilder();
               }
-              classObject_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.PARSER, extensionRegistry);
+              classObject_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(classObject_);
                 classObject_ = subBuilder.buildPartial();
@@ -9555,18 +9555,18 @@ public final class DebugProtoBuf {
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                supertype_ = new java.util.ArrayList();
+                supertype_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              supertype_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry));
+              supertype_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
             case 56: {
@@ -9592,10 +9592,10 @@ public final class DebugProtoBuf {
             }
             case 90: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                member_ = new java.util.ArrayList();
+                member_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry));
+              member_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry));
               break;
             }
             case 96: {
@@ -9620,11 +9620,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 106: {
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = primaryConstructor_.toBuilder();
               }
-              primaryConstructor_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry);
+              primaryConstructor_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(primaryConstructor_);
                 primaryConstructor_ = subBuilder.buildPartial();
@@ -9661,14 +9661,14 @@ public final class DebugProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor;
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder.class);
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder.class);
     }
 
     public static com.google.protobuf.Parser PARSER =
@@ -9687,7 +9687,7 @@ public final class DebugProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Class.Kind}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Class.Kind}
      */
     public enum Kind
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -9796,7 +9796,7 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Kind[] VALUES = values();
@@ -9818,15 +9818,15 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Class.Kind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Class.Kind)
     }
 
     public interface ClassObjectOrBuilder
         extends com.google.protobuf.MessageOrBuilder {
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+      // optional .org.jetbrains.kotlin.serialization.Class data = 1;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -9835,26 +9835,26 @@ public final class DebugProtoBuf {
        */
       boolean hasData();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
        * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
        * 

        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getData();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
        * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
        * 

        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.ClassObject}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.ClassObject}
      */
     public static final class ClassObject extends
         com.google.protobuf.GeneratedMessage
@@ -9905,11 +9905,11 @@ public final class DebugProtoBuf {
                 break;
               }
               case 10: {
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) == 0x00000001)) {
                   subBuilder = data_.toBuilder();
                 }
-                data_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry);
+                data_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(data_);
                   data_ = subBuilder.buildPartial();
@@ -9931,14 +9931,14 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.Builder.class);
       }
 
       public static com.google.protobuf.Parser PARSER =
@@ -9957,11 +9957,11 @@ public final class DebugProtoBuf {
       }
 
       private int bitField0_;
-      // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+      // optional .org.jetbrains.kotlin.serialization.Class data = 1;
       public static final int DATA_FIELD_NUMBER = 1;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class data_;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Class data_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -9972,30 +9972,30 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
        * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getData() {
         return data_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
        * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder() {
         return data_;
       }
 
       private void initFields() {
-        data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance();
+        data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -10043,53 +10043,53 @@ public final class DebugProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject 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.DebugProtoBuf.Class.ClassObject parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject 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.DebugProtoBuf.Class.ClassObject parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject 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.DebugProtoBuf.Class.ClassObject parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject 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.DebugProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -10098,7 +10098,7 @@ public final class DebugProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -10110,24 +10110,24 @@ public final class DebugProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.ClassObject}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.ClassObject}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
-         implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder {
+         implements org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder.class);
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.Builder.class);
         }
 
-        // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.newBuilder()
+        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -10149,7 +10149,7 @@ public final class DebugProtoBuf {
         public Builder clear() {
           super.clear();
           if (dataBuilder_ == null) {
-            data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance();
+            data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance();
           } else {
             dataBuilder_.clear();
           }
@@ -10163,23 +10163,23 @@ public final class DebugProtoBuf {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_descriptor;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject build() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject result = buildPartial();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject build() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject(this);
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject buildPartial() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -10196,16 +10196,16 @@ public final class DebugProtoBuf {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject) {
-            return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject)other);
+          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject) {
+            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject other) {
+          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance()) return this;
           if (other.hasData()) {
             mergeData(other.getData());
           }
@@ -10227,11 +10227,11 @@ public final class DebugProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parsedMessage = null;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -10242,12 +10242,12 @@ public final class DebugProtoBuf {
         }
         private int bitField0_;
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance();
+        // optional .org.jetbrains.kotlin.serialization.Class data = 1;
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Class data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance();
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder> dataBuilder_;
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> dataBuilder_;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -10258,14 +10258,14 @@ public final class DebugProtoBuf {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
          * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getData() {
           if (dataBuilder_ == null) {
             return data_;
           } else {
@@ -10273,14 +10273,14 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
          * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
          * 

          */
-        public Builder setData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class value) {
+        public Builder setData(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
           if (dataBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10294,7 +10294,7 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -10302,7 +10302,7 @@ public final class DebugProtoBuf {
          * 

          */
         public Builder setData(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
           if (dataBuilder_ == null) {
             data_ = builderForValue.build();
             onChanged();
@@ -10313,19 +10313,19 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
          * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
          * 

          */
-        public Builder mergeData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class value) {
+        public Builder mergeData(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
           if (dataBuilder_ == null) {
             if (((bitField0_ & 0x00000001) == 0x00000001) &&
-                data_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance()) {
+                data_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance()) {
               data_ =
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.newBuilder(data_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.newBuilder(data_).mergeFrom(value).buildPartial();
             } else {
               data_ = value;
             }
@@ -10337,7 +10337,7 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -10346,7 +10346,7 @@ public final class DebugProtoBuf {
          */
         public Builder clearData() {
           if (dataBuilder_ == null) {
-            data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance();
+            data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance();
             onChanged();
           } else {
             dataBuilder_.clear();
@@ -10355,27 +10355,27 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
          * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder getDataBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getDataBuilder() {
           bitField0_ |= 0x00000001;
           onChanged();
           return getDataFieldBuilder().getBuilder();
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
          * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder() {
           if (dataBuilder_ != null) {
             return dataBuilder_.getMessageOrBuilder();
           } else {
@@ -10383,7 +10383,7 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -10391,11 +10391,11 @@ public final class DebugProtoBuf {
          * 

          */
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder> 
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> 
             getDataFieldBuilder() {
           if (dataBuilder_ == null) {
             dataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder>(
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>(
                     data_,
                     getParentForChildren(),
                     isClean());
@@ -10404,7 +10404,7 @@ public final class DebugProtoBuf {
           return dataBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class.ClassObject)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class.ClassObject)
       }
 
       static {
@@ -10412,15 +10412,15 @@ public final class DebugProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class.ClassObject)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class.ClassObject)
     }
 
     public interface PrimaryConstructorOrBuilder
         extends com.google.protobuf.MessageOrBuilder {
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+      // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
@@ -10429,26 +10429,26 @@ public final class DebugProtoBuf {
        */
       boolean hasData();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
        * Otherwise it's default and can be created manually upon deserialization
        * 

        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getData();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
        * Otherwise it's default and can be created manually upon deserialization
        * 

        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.PrimaryConstructor}
      */
     public static final class PrimaryConstructor extends
         com.google.protobuf.GeneratedMessage
@@ -10499,11 +10499,11 @@ public final class DebugProtoBuf {
                 break;
               }
               case 10: {
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) == 0x00000001)) {
                   subBuilder = data_.toBuilder();
                 }
-                data_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry);
+                data_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(data_);
                   data_ = subBuilder.buildPartial();
@@ -10525,14 +10525,14 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class);
       }
 
       public static com.google.protobuf.Parser PARSER =
@@ -10551,11 +10551,11 @@ public final class DebugProtoBuf {
       }
 
       private int bitField0_;
-      // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+      // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
       public static final int DATA_FIELD_NUMBER = 1;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable data_;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable data_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
@@ -10566,30 +10566,30 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
        * Otherwise it's default and can be created manually upon deserialization
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getData() {
         return data_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
        * Otherwise it's default and can be created manually upon deserialization
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() {
         return data_;
       }
 
       private void initFields() {
-        data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance();
+        data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -10637,53 +10637,53 @@ public final class DebugProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor 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.DebugProtoBuf.Class.PrimaryConstructor parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor 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.DebugProtoBuf.Class.PrimaryConstructor parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor 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.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor 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.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -10692,7 +10692,7 @@ public final class DebugProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -10704,24 +10704,24 @@ public final class DebugProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.PrimaryConstructor}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.Builder
-         implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder {
+         implements org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class);
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class);
         }
 
-        // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder()
+        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -10743,7 +10743,7 @@ public final class DebugProtoBuf {
         public Builder clear() {
           super.clear();
           if (dataBuilder_ == null) {
-            data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance();
+            data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
           } else {
             dataBuilder_.clear();
           }
@@ -10757,23 +10757,23 @@ public final class DebugProtoBuf {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor build() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor result = buildPartial();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor build() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor(this);
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor buildPartial() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -10790,16 +10790,16 @@ public final class DebugProtoBuf {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor) {
-            return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor)other);
+          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor) {
+            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor other) {
+          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) return this;
           if (other.hasData()) {
             mergeData(other.getData());
           }
@@ -10821,11 +10821,11 @@ public final class DebugProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parsedMessage = null;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -10836,12 +10836,12 @@ public final class DebugProtoBuf {
         }
         private int bitField0_;
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance();
+        // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> dataBuilder_;
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> dataBuilder_;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
@@ -10852,14 +10852,14 @@ public final class DebugProtoBuf {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
          * Otherwise it's default and can be created manually upon deserialization
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getData() {
           if (dataBuilder_ == null) {
             return data_;
           } else {
@@ -10867,14 +10867,14 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
          * Otherwise it's default and can be created manually upon deserialization
          * 

          */
-        public Builder setData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) {
+        public Builder setData(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
           if (dataBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -10888,7 +10888,7 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
@@ -10896,7 +10896,7 @@ public final class DebugProtoBuf {
          * 

          */
         public Builder setData(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
           if (dataBuilder_ == null) {
             data_ = builderForValue.build();
             onChanged();
@@ -10907,19 +10907,19 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
          * Otherwise it's default and can be created manually upon deserialization
          * 

          */
-        public Builder mergeData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) {
+        public Builder mergeData(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
           if (dataBuilder_ == null) {
             if (((bitField0_ & 0x00000001) == 0x00000001) &&
-                data_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()) {
+                data_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance()) {
               data_ =
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.newBuilder(data_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.newBuilder(data_).mergeFrom(value).buildPartial();
             } else {
               data_ = value;
             }
@@ -10931,7 +10931,7 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
@@ -10940,7 +10940,7 @@ public final class DebugProtoBuf {
          */
         public Builder clearData() {
           if (dataBuilder_ == null) {
-            data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance();
+            data_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
             onChanged();
           } else {
             dataBuilder_.clear();
@@ -10949,27 +10949,27 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
          * Otherwise it's default and can be created manually upon deserialization
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getDataBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder getDataBuilder() {
           bitField0_ |= 0x00000001;
           onChanged();
           return getDataFieldBuilder().getBuilder();
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
          * Otherwise it's default and can be created manually upon deserialization
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() {
           if (dataBuilder_ != null) {
             return dataBuilder_.getMessageOrBuilder();
           } else {
@@ -10977,7 +10977,7 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
@@ -10985,11 +10985,11 @@ public final class DebugProtoBuf {
          * 

          */
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> 
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
             getDataFieldBuilder() {
           if (dataBuilder_ == null) {
             dataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>(
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>(
                     data_,
                     getParentForChildren(),
                     isClean());
@@ -10998,7 +10998,7 @@ public final class DebugProtoBuf {
           return dataBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class.PrimaryConstructor)
       }
 
       static {
@@ -11006,7 +11006,7 @@ public final class DebugProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class.PrimaryConstructor)
     }
 
     private int bitField0_;
@@ -11115,11 +11115,11 @@ public final class DebugProtoBuf {
       return fqName_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+    // optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
     public static final int CLASS_OBJECT_FIELD_NUMBER = 4;
-    private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject classObject_;
+    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject classObject_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
@@ -11129,94 +11129,94 @@ public final class DebugProtoBuf {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject getClassObject() {
       return classObject_;
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder() {
       return classObject_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 5;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+    // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
     public static final int SUPERTYPE_FIELD_NUMBER = 6;
-    private java.util.List supertype_;
+    private java.util.List supertype_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    public java.util.List getSupertypeList() {
+    public java.util.List getSupertypeList() {
       return supertype_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getSupertypeOrBuilderList() {
       return supertype_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
     public int getSupertypeCount() {
       return supertype_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getSupertype(int index) {
       return supertype_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
         int index) {
       return supertype_.get(index);
     }
@@ -11259,38 +11259,38 @@ public final class DebugProtoBuf {
       return nestedClassName_.get(index);
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+    // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
     public static final int MEMBER_FIELD_NUMBER = 11;
-    private java.util.List member_;
+    private java.util.List member_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    public java.util.List getMemberList() {
+    public java.util.List getMemberList() {
       return member_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    public java.util.List 
+    public java.util.List 
         getMemberOrBuilderList() {
       return member_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
     public int getMemberCount() {
       return member_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index) {
       return member_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
         int index) {
       return member_.get(index);
     }
@@ -11318,11 +11318,11 @@ public final class DebugProtoBuf {
       return enumEntry_.get(index);
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+    // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
     public static final int PRIMARY_CONSTRUCTOR_FIELD_NUMBER = 13;
-    private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_;
+    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
@@ -11332,23 +11332,23 @@ public final class DebugProtoBuf {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
       return primaryConstructor_;
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() {
       return primaryConstructor_;
     }
 
@@ -11356,13 +11356,13 @@ public final class DebugProtoBuf {
       flags_ = 0;
       extraVisibility_ = "";
       fqName_ = 0;
-      classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
+      classObject_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
       typeParameter_ = java.util.Collections.emptyList();
       supertype_ = java.util.Collections.emptyList();
       nestedClassName_ = java.util.Collections.emptyList();
       member_ = java.util.Collections.emptyList();
       enumEntry_ = java.util.Collections.emptyList();
-      primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+      primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -11415,7 +11415,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       com.google.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -11520,53 +11520,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class 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.DebugProtoBuf.Class parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class 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.DebugProtoBuf.Class parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class 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.DebugProtoBuf.Class parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class 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.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -11575,7 +11575,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -11587,24 +11587,24 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, Builder> implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -11636,7 +11636,7 @@ public final class DebugProtoBuf {
         fqName_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (classObjectBuilder_ == null) {
-          classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
+          classObject_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
         } else {
           classObjectBuilder_.clear();
         }
@@ -11664,7 +11664,7 @@ public final class DebugProtoBuf {
         enumEntry_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000100);
         if (primaryConstructorBuilder_ == null) {
-          primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+          primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
         } else {
           primaryConstructorBuilder_.clear();
         }
@@ -11678,23 +11678,23 @@ public final class DebugProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class build() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class result = buildPartial();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class build() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Class result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class(this);
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class buildPartial() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Class result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Class(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -11768,16 +11768,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Class) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Class)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class other) {
+        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -11944,11 +11944,11 @@ public final class DebugProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parsedMessage = null;
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Class) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -12159,12 +12159,12 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject classObject_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder> classObjectBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder> classObjectBuilder_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
@@ -12174,13 +12174,13 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject getClassObject() {
         if (classObjectBuilder_ == null) {
           return classObject_;
         } else {
@@ -12188,13 +12188,13 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
-      public Builder setClassObject(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject value) {
+      public Builder setClassObject(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject value) {
         if (classObjectBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12208,14 +12208,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
       public Builder setClassObject(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.Builder builderForValue) {
         if (classObjectBuilder_ == null) {
           classObject_ = builderForValue.build();
           onChanged();
@@ -12226,18 +12226,18 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
-      public Builder mergeClassObject(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject value) {
+      public Builder mergeClassObject(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject value) {
         if (classObjectBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              classObject_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance()) {
+              classObject_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance()) {
             classObject_ =
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.newBuilder(classObject_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.newBuilder(classObject_).mergeFrom(value).buildPartial();
           } else {
             classObject_ = value;
           }
@@ -12249,7 +12249,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
@@ -12257,7 +12257,7 @@ public final class DebugProtoBuf {
        */
       public Builder clearClassObject() {
         if (classObjectBuilder_ == null) {
-          classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
+          classObject_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance();
           onChanged();
         } else {
           classObjectBuilder_.clear();
@@ -12266,25 +12266,25 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder getClassObjectBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.Builder getClassObjectBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getClassObjectFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder() {
         if (classObjectBuilder_ != null) {
           return classObjectBuilder_.getMessageOrBuilder();
         } else {
@@ -12292,18 +12292,18 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder> 
           getClassObjectFieldBuilder() {
         if (classObjectBuilder_ == null) {
           classObjectBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder>(
                   classObject_,
                   getParentForChildren(),
                   isClean());
@@ -12312,23 +12312,23 @@ public final class DebugProtoBuf {
         return classObjectBuilder_;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
-      private java.util.List typeParameter_ =
+      // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000010;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         if (typeParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(typeParameter_);
         } else {
@@ -12336,7 +12336,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public int getTypeParameterCount() {
         if (typeParameterBuilder_ == null) {
@@ -12346,9 +12346,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);
         } else {
@@ -12356,10 +12356,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12373,10 +12373,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.set(index, builderForValue.build());
@@ -12387,9 +12387,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public Builder addTypeParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12403,10 +12403,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12420,10 +12420,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(builderForValue.build());
@@ -12434,10 +12434,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(index, builderForValue.build());
@@ -12448,10 +12448,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           super.addAll(values, typeParameter_);
@@ -12462,7 +12462,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder clearTypeParameter() {
         if (typeParameterBuilder_ == null) {
@@ -12475,7 +12475,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder removeTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
@@ -12488,16 +12488,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
           int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);  } else {
@@ -12505,9 +12505,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterOrBuilderList() {
         if (typeParameterBuilder_ != null) {
           return typeParameterBuilder_.getMessageOrBuilderList();
@@ -12516,33 +12516,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
         return getTypeParameterFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterBuilderList() {
         return getTypeParameterFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
           getTypeParameterFieldBuilder() {
         if (typeParameterBuilder_ == null) {
           typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
                   typeParameter_,
                   ((bitField0_ & 0x00000010) == 0x00000010),
                   getParentForChildren(),
@@ -12552,23 +12552,23 @@ public final class DebugProtoBuf {
         return typeParameterBuilder_;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
-      private java.util.List supertype_ =
+      // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+      private java.util.List supertype_ =
         java.util.Collections.emptyList();
       private void ensureSupertypeIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          supertype_ = new java.util.ArrayList(supertype_);
+          supertype_ = new java.util.ArrayList(supertype_);
           bitField0_ |= 0x00000020;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> supertypeBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> supertypeBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public java.util.List getSupertypeList() {
+      public java.util.List getSupertypeList() {
         if (supertypeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(supertype_);
         } else {
@@ -12576,7 +12576,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public int getSupertypeCount() {
         if (supertypeBuilder_ == null) {
@@ -12586,9 +12586,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getSupertype(int index) {
         if (supertypeBuilder_ == null) {
           return supertype_.get(index);
         } else {
@@ -12596,10 +12596,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder setSupertype(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (supertypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12613,10 +12613,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder setSupertype(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (supertypeBuilder_ == null) {
           ensureSupertypeIsMutable();
           supertype_.set(index, builderForValue.build());
@@ -12627,9 +12627,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public Builder addSupertype(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+      public Builder addSupertype(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (supertypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12643,10 +12643,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder addSupertype(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (supertypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12660,10 +12660,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder addSupertype(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (supertypeBuilder_ == null) {
           ensureSupertypeIsMutable();
           supertype_.add(builderForValue.build());
@@ -12674,10 +12674,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder addSupertype(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (supertypeBuilder_ == null) {
           ensureSupertypeIsMutable();
           supertype_.add(index, builderForValue.build());
@@ -12688,10 +12688,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder addAllSupertype(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (supertypeBuilder_ == null) {
           ensureSupertypeIsMutable();
           super.addAll(values, supertype_);
@@ -12702,7 +12702,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder clearSupertype() {
         if (supertypeBuilder_ == null) {
@@ -12715,7 +12715,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder removeSupertype(int index) {
         if (supertypeBuilder_ == null) {
@@ -12728,16 +12728,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getSupertypeBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getSupertypeBuilder(
           int index) {
         return getSupertypeFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
           int index) {
         if (supertypeBuilder_ == null) {
           return supertype_.get(index);  } else {
@@ -12745,9 +12745,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getSupertypeOrBuilderList() {
         if (supertypeBuilder_ != null) {
           return supertypeBuilder_.getMessageOrBuilderList();
@@ -12756,33 +12756,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder() {
         return getSupertypeFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder(
           int index) {
         return getSupertypeFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getSupertypeBuilderList() {
         return getSupertypeFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
           getSupertypeFieldBuilder() {
         if (supertypeBuilder_ == null) {
           supertypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
                   supertype_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
@@ -12893,23 +12893,23 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
-      private java.util.List member_ =
+      // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
+      private java.util.List member_ =
         java.util.Collections.emptyList();
       private void ensureMemberIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          member_ = new java.util.ArrayList(member_);
+          member_ = new java.util.ArrayList(member_);
           bitField0_ |= 0x00000080;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public java.util.List getMemberList() {
+      public java.util.List getMemberList() {
         if (memberBuilder_ == null) {
           return java.util.Collections.unmodifiableList(member_);
         } else {
@@ -12917,7 +12917,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public int getMemberCount() {
         if (memberBuilder_ == null) {
@@ -12927,9 +12927,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index) {
         if (memberBuilder_ == null) {
           return member_.get(index);
         } else {
@@ -12937,10 +12937,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder setMember(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
         if (memberBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12954,10 +12954,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder setMember(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
         if (memberBuilder_ == null) {
           ensureMemberIsMutable();
           member_.set(index, builderForValue.build());
@@ -12968,9 +12968,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public Builder addMember(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) {
+      public Builder addMember(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
         if (memberBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12984,10 +12984,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder addMember(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
         if (memberBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13001,10 +13001,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder addMember(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
         if (memberBuilder_ == null) {
           ensureMemberIsMutable();
           member_.add(builderForValue.build());
@@ -13015,10 +13015,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder addMember(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
         if (memberBuilder_ == null) {
           ensureMemberIsMutable();
           member_.add(index, builderForValue.build());
@@ -13029,10 +13029,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder addAllMember(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (memberBuilder_ == null) {
           ensureMemberIsMutable();
           super.addAll(values, member_);
@@ -13043,7 +13043,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder clearMember() {
         if (memberBuilder_ == null) {
@@ -13056,7 +13056,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder removeMember(int index) {
         if (memberBuilder_ == null) {
@@ -13069,16 +13069,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder(
           int index) {
         return getMemberFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
           int index) {
         if (memberBuilder_ == null) {
           return member_.get(index);  } else {
@@ -13086,9 +13086,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public java.util.List 
+      public java.util.List 
            getMemberOrBuilderList() {
         if (memberBuilder_ != null) {
           return memberBuilder_.getMessageOrBuilderList();
@@ -13097,33 +13097,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() {
         return getMemberFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder(
           int index) {
         return getMemberFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public java.util.List 
+      public java.util.List 
            getMemberBuilderList() {
         return getMemberFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
           getMemberFieldBuilder() {
         if (memberBuilder_ == null) {
           memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>(
                   member_,
                   ((bitField0_ & 0x00000080) == 0x00000080),
                   getParentForChildren(),
@@ -13199,12 +13199,12 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> primaryConstructorBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> primaryConstructorBuilder_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
@@ -13214,13 +13214,13 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
         if (primaryConstructorBuilder_ == null) {
           return primaryConstructor_;
         } else {
@@ -13228,13 +13228,13 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
-      public Builder setPrimaryConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor value) {
+      public Builder setPrimaryConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor value) {
         if (primaryConstructorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13248,14 +13248,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
       public Builder setPrimaryConstructor(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder builderForValue) {
         if (primaryConstructorBuilder_ == null) {
           primaryConstructor_ = builderForValue.build();
           onChanged();
@@ -13266,18 +13266,18 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
-      public Builder mergePrimaryConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor value) {
+      public Builder mergePrimaryConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor value) {
         if (primaryConstructorBuilder_ == null) {
           if (((bitField0_ & 0x00000200) == 0x00000200) &&
-              primaryConstructor_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
+              primaryConstructor_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
             primaryConstructor_ =
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
           } else {
             primaryConstructor_ = value;
           }
@@ -13289,7 +13289,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
@@ -13297,7 +13297,7 @@ public final class DebugProtoBuf {
        */
       public Builder clearPrimaryConstructor() {
         if (primaryConstructorBuilder_ == null) {
-          primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+          primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
           onChanged();
         } else {
           primaryConstructorBuilder_.clear();
@@ -13306,25 +13306,25 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder getPrimaryConstructorBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder getPrimaryConstructorBuilder() {
         bitField0_ |= 0x00000200;
         onChanged();
         return getPrimaryConstructorFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() {
         if (primaryConstructorBuilder_ != null) {
           return primaryConstructorBuilder_.getMessageOrBuilder();
         } else {
@@ -13332,18 +13332,18 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> 
           getPrimaryConstructorFieldBuilder() {
         if (primaryConstructorBuilder_ == null) {
           primaryConstructorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder>(
                   primaryConstructor_,
                   getParentForChildren(),
                   isClean());
@@ -13352,7 +13352,7 @@ public final class DebugProtoBuf {
         return primaryConstructorBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class)
     }
 
     static {
@@ -13360,46 +13360,46 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class)
   }
 
   public interface PackageOrBuilder extends
       com.google.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+    // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    java.util.List 
+    java.util.List 
         getMemberList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
     int getMemberCount();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    java.util.List 
+    java.util.List 
         getMemberOrBuilderList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Package}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
    */
   public static final class Package extends
       com.google.protobuf.GeneratedMessage.ExtendableMessage<
         Package> implements PackageOrBuilder {
     // Use Package.newBuilder() to construct.
-    private Package(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Package(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -13445,10 +13445,10 @@ public final class DebugProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                member_ = new java.util.ArrayList();
+                member_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry));
+              member_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry));
               break;
             }
           }
@@ -13468,14 +13468,14 @@ public final class DebugProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor;
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.Builder.class);
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder.class);
     }
 
     public static com.google.protobuf.Parser PARSER =
@@ -13493,38 +13493,38 @@ public final class DebugProtoBuf {
       return PARSER;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+    // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
     public static final int MEMBER_FIELD_NUMBER = 1;
-    private java.util.List member_;
+    private java.util.List member_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    public java.util.List getMemberList() {
+    public java.util.List getMemberList() {
       return member_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getMemberOrBuilderList() {
       return member_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
     public int getMemberCount() {
       return member_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index) {
       return member_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
         int index) {
       return member_.get(index);
     }
@@ -13555,7 +13555,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       com.google.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       for (int i = 0; i < member_.size(); i++) {
         output.writeMessage(1, member_.get(i));
@@ -13587,53 +13587,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package 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.DebugProtoBuf.Package parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package 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.DebugProtoBuf.Package parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package 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.DebugProtoBuf.Package parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package 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.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -13642,7 +13642,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -13654,24 +13654,24 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Package}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package, Builder> implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.PackageOrBuilder {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -13707,23 +13707,23 @@ public final class DebugProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package build() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package result = buildPartial();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package build() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Package result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package(this);
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package buildPartial() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Package result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Package(this);
         int from_bitField0_ = bitField0_;
         if (memberBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -13739,16 +13739,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Package) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Package)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package other) {
+        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance()) return this;
         if (memberBuilder_ == null) {
           if (!other.member_.isEmpty()) {
             if (member_.isEmpty()) {
@@ -13798,11 +13798,11 @@ public final class DebugProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parsedMessage = null;
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Package) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -13813,23 +13813,23 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
-      private java.util.List member_ =
+      // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
+      private java.util.List member_ =
         java.util.Collections.emptyList();
       private void ensureMemberIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          member_ = new java.util.ArrayList(member_);
+          member_ = new java.util.ArrayList(member_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public java.util.List getMemberList() {
+      public java.util.List getMemberList() {
         if (memberBuilder_ == null) {
           return java.util.Collections.unmodifiableList(member_);
         } else {
@@ -13837,7 +13837,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public int getMemberCount() {
         if (memberBuilder_ == null) {
@@ -13847,9 +13847,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getMember(int index) {
         if (memberBuilder_ == null) {
           return member_.get(index);
         } else {
@@ -13857,10 +13857,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder setMember(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
         if (memberBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13874,10 +13874,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder setMember(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
         if (memberBuilder_ == null) {
           ensureMemberIsMutable();
           member_.set(index, builderForValue.build());
@@ -13888,9 +13888,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public Builder addMember(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) {
+      public Builder addMember(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
         if (memberBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13904,10 +13904,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder addMember(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) {
         if (memberBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13921,10 +13921,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder addMember(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
         if (memberBuilder_ == null) {
           ensureMemberIsMutable();
           member_.add(builderForValue.build());
@@ -13935,10 +13935,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder addMember(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) {
         if (memberBuilder_ == null) {
           ensureMemberIsMutable();
           member_.add(index, builderForValue.build());
@@ -13949,10 +13949,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder addAllMember(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (memberBuilder_ == null) {
           ensureMemberIsMutable();
           super.addAll(values, member_);
@@ -13963,7 +13963,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder clearMember() {
         if (memberBuilder_ == null) {
@@ -13976,7 +13976,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder removeMember(int index) {
         if (memberBuilder_ == null) {
@@ -13989,16 +13989,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder(
           int index) {
         return getMemberFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder(
           int index) {
         if (memberBuilder_ == null) {
           return member_.get(index);  } else {
@@ -14006,9 +14006,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getMemberOrBuilderList() {
         if (memberBuilder_ != null) {
           return memberBuilder_.getMessageOrBuilderList();
@@ -14017,33 +14017,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() {
         return getMemberFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder(
           int index) {
         return getMemberFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getMemberBuilderList() {
         return getMemberFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> 
           getMemberFieldBuilder() {
         if (memberBuilder_ == null) {
           memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>(
                   member_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -14053,7 +14053,7 @@ public final class DebugProtoBuf {
         return memberBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Package)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Package)
     }
 
     static {
@@ -14061,7 +14061,7 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Package)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Package)
   }
 
   public interface CallableOrBuilder extends
@@ -14165,44 +14165,44 @@ public final class DebugProtoBuf {
      */
     int getSetterFlags();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
     int getTypeParameterCount();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index);
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+    // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
     boolean hasReceiverType();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
 
     // required int32 name = 6;
     /**
@@ -14222,26 +14222,26 @@ public final class DebugProtoBuf {
      */
     int getName();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+    // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    java.util.List 
+    java.util.List 
         getValueParameterList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index);
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
@@ -14249,46 +14249,46 @@ public final class DebugProtoBuf {
      */
     int getValueParameterCount();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    java.util.List 
+    java.util.List 
         getValueParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index);
 
-    // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+    // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
     boolean hasReturnType();
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType();
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
-    org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
+    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable}
    */
   public static final class Callable extends
       com.google.protobuf.GeneratedMessage.ExtendableMessage<
         Callable> implements CallableOrBuilder {
     // Use Callable.newBuilder() to construct.
-    private Callable(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Callable(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -14344,18 +14344,18 @@ public final class DebugProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 42: {
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = receiverType_.toBuilder();
               }
-              receiverType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(receiverType_);
                 receiverType_ = subBuilder.buildPartial();
@@ -14370,18 +14370,18 @@ public final class DebugProtoBuf {
             }
             case 58: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                valueParameter_ = new java.util.ArrayList();
+                valueParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              valueParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry));
+              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry));
               break;
             }
             case 66: {
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000040) == 0x00000040)) {
                 subBuilder = returnType_.toBuilder();
               }
-              returnType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(returnType_);
                 returnType_ = subBuilder.buildPartial();
@@ -14419,14 +14419,14 @@ public final class DebugProtoBuf {
     }
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor;
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor;
     }
 
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable
+      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder.class);
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder.class);
     }
 
     public static com.google.protobuf.Parser PARSER =
@@ -14445,7 +14445,7 @@ public final class DebugProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Callable.MemberKind}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Callable.MemberKind}
      */
     public enum MemberKind
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -14527,7 +14527,7 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final MemberKind[] VALUES = values();
@@ -14549,11 +14549,11 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Callable.MemberKind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Callable.MemberKind)
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Callable.CallableKind}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Callable.CallableKind}
      */
     public enum CallableKind
         implements com.google.protobuf.ProtocolMessageEnum {
@@ -14635,7 +14635,7 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDescriptor().getEnumTypes().get(1);
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDescriptor().getEnumTypes().get(1);
       }
 
       private static final CallableKind[] VALUES = values();
@@ -14657,7 +14657,7 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Callable.CallableKind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Callable.CallableKind)
     }
 
     public interface ValueParameterOrBuilder extends
@@ -14704,42 +14704,42 @@ public final class DebugProtoBuf {
        */
       int getName();
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+      // required .org.jetbrains.kotlin.serialization.Type type = 3;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
       boolean hasType();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+      // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
       boolean hasVarargElementType();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder();
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable.ValueParameter}
      */
     public static final class ValueParameter extends
         com.google.protobuf.GeneratedMessage.ExtendableMessage<
           ValueParameter> implements ValueParameterOrBuilder {
       // Use ValueParameter.newBuilder() to construct.
-      private ValueParameter(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+      private ValueParameter(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
         super(builder);
         this.unknownFields = builder.getUnknownFields();
       }
@@ -14794,11 +14794,11 @@ public final class DebugProtoBuf {
                 break;
               }
               case 26: {
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000004) == 0x00000004)) {
                   subBuilder = type_.toBuilder();
                 }
-                type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+                type_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(type_);
                   type_ = subBuilder.buildPartial();
@@ -14807,11 +14807,11 @@ public final class DebugProtoBuf {
                 break;
               }
               case 34: {
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000008) == 0x00000008)) {
                   subBuilder = varargElementType_.toBuilder();
                 }
-                varargElementType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+                varargElementType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(varargElementType_);
                   varargElementType_ = subBuilder.buildPartial();
@@ -14833,14 +14833,14 @@ public final class DebugProtoBuf {
       }
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder.class);
       }
 
       public static com.google.protobuf.Parser PARSER =
@@ -14911,55 +14911,55 @@ public final class DebugProtoBuf {
         return name_;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+      // required .org.jetbrains.kotlin.serialization.Type type = 3;
       public static final int TYPE_FIELD_NUMBER = 3;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
         return type_;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
         return type_;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+      // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
       public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type varargElementType_;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type varargElementType_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
       public boolean hasVarargElementType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType() {
         return varargElementType_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
         return varargElementType_;
       }
 
       private void initFields() {
         flags_ = 0;
         name_ = 0;
-        type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
-        varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+        type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+        varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -14996,7 +14996,7 @@ public final class DebugProtoBuf {
                           throws java.io.IOException {
         getSerializedSize();
         com.google.protobuf.GeneratedMessage
-          .ExtendableMessage.ExtensionWriter extensionWriter =
+          .ExtendableMessage.ExtensionWriter extensionWriter =
             newExtensionWriter();
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           output.writeInt32(1, flags_);
@@ -15049,53 +15049,53 @@ public final class DebugProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter 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.DebugProtoBuf.Callable.ValueParameter parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter 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.DebugProtoBuf.Callable.ValueParameter parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter 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.DebugProtoBuf.Callable.ValueParameter parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter 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.DebugProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -15104,7 +15104,7 @@ public final class DebugProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -15116,24 +15116,24 @@ public final class DebugProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable.ValueParameter}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessage.ExtendableBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, Builder> implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder {
         public static final com.google.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor;
         }
 
         protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder.class);
+                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder.class);
         }
 
-        // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.newBuilder()
+        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -15160,13 +15160,13 @@ public final class DebugProtoBuf {
           name_ = 0;
           bitField0_ = (bitField0_ & ~0x00000002);
           if (typeBuilder_ == null) {
-            type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
           } else {
             typeBuilder_.clear();
           }
           bitField0_ = (bitField0_ & ~0x00000004);
           if (varargElementTypeBuilder_ == null) {
-            varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+            varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
           } else {
             varargElementTypeBuilder_.clear();
           }
@@ -15180,23 +15180,23 @@ public final class DebugProtoBuf {
 
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor;
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter build() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter result = buildPartial();
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter build() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter(this);
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter buildPartial() {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -15229,16 +15229,16 @@ public final class DebugProtoBuf {
         }
 
         public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter) {
-            return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter)other);
+          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter) {
+            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter other) {
+          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance()) return this;
           if (other.hasFlags()) {
             setFlags(other.getFlags());
           }
@@ -15286,11 +15286,11 @@ public final class DebugProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parsedMessage = null;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -15407,20 +15407,20 @@ public final class DebugProtoBuf {
           return this;
         }
 
-        // required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+        // required .org.jetbrains.kotlin.serialization.Type type = 3;
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
         public boolean hasType() {
           return ((bitField0_ & 0x00000004) == 0x00000004);
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
           if (typeBuilder_ == null) {
             return type_;
           } else {
@@ -15428,9 +15428,9 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
-        public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+        public Builder setType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
           if (typeBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -15444,10 +15444,10 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
         public Builder setType(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
           if (typeBuilder_ == null) {
             type_ = builderForValue.build();
             onChanged();
@@ -15458,14 +15458,14 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
-        public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+        public Builder mergeType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
           if (typeBuilder_ == null) {
             if (((bitField0_ & 0x00000004) == 0x00000004) &&
-                type_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+                type_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
               type_ =
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
             } else {
               type_ = value;
             }
@@ -15477,11 +15477,11 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
         public Builder clearType() {
           if (typeBuilder_ == null) {
-            type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
             onChanged();
           } else {
             typeBuilder_.clear();
@@ -15490,17 +15490,17 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() {
           bitField0_ |= 0x00000004;
           onChanged();
           return getTypeFieldBuilder().getBuilder();
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
           if (typeBuilder_ != null) {
             return typeBuilder_.getMessageOrBuilder();
           } else {
@@ -15508,14 +15508,14 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> 
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
             getTypeFieldBuilder() {
           if (typeBuilder_ == null) {
             typeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>(
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
                     type_,
                     getParentForChildren(),
                     isClean());
@@ -15524,20 +15524,20 @@ public final class DebugProtoBuf {
           return typeBuilder_;
         }
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
-        private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+        // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> varargElementTypeBuilder_;
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> varargElementTypeBuilder_;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
         public boolean hasVarargElementType() {
           return ((bitField0_ & 0x00000008) == 0x00000008);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType() {
           if (varargElementTypeBuilder_ == null) {
             return varargElementType_;
           } else {
@@ -15545,9 +15545,9 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
-        public Builder setVarargElementType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+        public Builder setVarargElementType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
           if (varargElementTypeBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -15561,10 +15561,10 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
         public Builder setVarargElementType(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
           if (varargElementTypeBuilder_ == null) {
             varargElementType_ = builderForValue.build();
             onChanged();
@@ -15575,14 +15575,14 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
-        public Builder mergeVarargElementType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+        public Builder mergeVarargElementType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
           if (varargElementTypeBuilder_ == null) {
             if (((bitField0_ & 0x00000008) == 0x00000008) &&
-                varargElementType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+                varargElementType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
               varargElementType_ =
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
             } else {
               varargElementType_ = value;
             }
@@ -15594,11 +15594,11 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
         public Builder clearVarargElementType() {
           if (varargElementTypeBuilder_ == null) {
-            varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+            varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
             onChanged();
           } else {
             varargElementTypeBuilder_.clear();
@@ -15607,17 +15607,17 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getVarargElementTypeBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getVarargElementTypeBuilder() {
           bitField0_ |= 0x00000008;
           onChanged();
           return getVarargElementTypeFieldBuilder().getBuilder();
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
-        public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
+        public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
           if (varargElementTypeBuilder_ != null) {
             return varargElementTypeBuilder_.getMessageOrBuilder();
           } else {
@@ -15625,14 +15625,14 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
         private com.google.protobuf.SingleFieldBuilder<
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> 
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
             getVarargElementTypeFieldBuilder() {
           if (varargElementTypeBuilder_ == null) {
             varargElementTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>(
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
                     varargElementType_,
                     getParentForChildren(),
                     isClean());
@@ -15641,7 +15641,7 @@ public final class DebugProtoBuf {
           return varargElementTypeBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Callable.ValueParameter)
       }
 
       static {
@@ -15649,7 +15649,7 @@ public final class DebugProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable.ValueParameter)
     }
 
     private int bitField0_;
@@ -15796,61 +15796,61 @@ public final class DebugProtoBuf {
       return setterFlags_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+    // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
     public static final int RECEIVER_TYPE_FIELD_NUMBER = 5;
-    private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type receiverType_;
+    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type receiverType_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
     public boolean hasReceiverType() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType() {
       return receiverType_;
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
       return receiverType_;
     }
 
@@ -15878,32 +15878,32 @@ public final class DebugProtoBuf {
       return name_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+    // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
     public static final int VALUE_PARAMETER_FIELD_NUMBER = 7;
-    private java.util.List valueParameter_;
+    private java.util.List valueParameter_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    public java.util.List getValueParameterList() {
+    public java.util.List getValueParameterList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getValueParameterOrBuilderList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
@@ -15913,46 +15913,46 @@ public final class DebugProtoBuf {
       return valueParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) {
       return valueParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index) {
       return valueParameter_.get(index);
     }
 
-    // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+    // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
     public static final int RETURN_TYPE_FIELD_NUMBER = 8;
-    private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type returnType_;
+    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_;
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
     public boolean hasReturnType() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType() {
       return returnType_;
     }
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
-    public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
+    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
       return returnType_;
     }
 
@@ -15962,10 +15962,10 @@ public final class DebugProtoBuf {
       getterFlags_ = 0;
       setterFlags_ = 0;
       typeParameter_ = java.util.Collections.emptyList();
-      receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
       name_ = 0;
       valueParameter_ = java.util.Collections.emptyList();
-      returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -16014,7 +16014,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       com.google.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -16102,53 +16102,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable 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.DebugProtoBuf.Callable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable 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.DebugProtoBuf.Callable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable 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.DebugProtoBuf.Callable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable 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.DebugProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -16157,7 +16157,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -16169,24 +16169,24 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, Builder> implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor;
       }
 
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder.class);
+                org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder.class);
       }
 
-      // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.newBuilder()
+      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -16225,7 +16225,7 @@ public final class DebugProtoBuf {
           typeParameterBuilder_.clear();
         }
         if (receiverTypeBuilder_ == null) {
-          receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           receiverTypeBuilder_.clear();
         }
@@ -16239,7 +16239,7 @@ public final class DebugProtoBuf {
           valueParameterBuilder_.clear();
         }
         if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           returnTypeBuilder_.clear();
         }
@@ -16253,23 +16253,23 @@ public final class DebugProtoBuf {
 
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor;
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable build() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable result = buildPartial();
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable build() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable(this);
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable buildPartial() {
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -16332,16 +16332,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable) {
-          return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable)other);
+        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable) {
+          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable other) {
+        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -16464,11 +16464,11 @@ public final class DebugProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parsedMessage = null;
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -16756,23 +16756,23 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
-      private java.util.List typeParameter_ =
+      // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000010;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         if (typeParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(typeParameter_);
         } else {
@@ -16780,7 +16780,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public int getTypeParameterCount() {
         if (typeParameterBuilder_ == null) {
@@ -16790,9 +16790,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);
         } else {
@@ -16800,10 +16800,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16817,10 +16817,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.set(index, builderForValue.build());
@@ -16831,9 +16831,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public Builder addTypeParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16847,10 +16847,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16864,10 +16864,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(builderForValue.build());
@@ -16878,10 +16878,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(index, builderForValue.build());
@@ -16892,10 +16892,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           super.addAll(values, typeParameter_);
@@ -16906,7 +16906,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder clearTypeParameter() {
         if (typeParameterBuilder_ == null) {
@@ -16919,7 +16919,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder removeTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
@@ -16932,16 +16932,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
           int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);  } else {
@@ -16949,9 +16949,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterOrBuilderList() {
         if (typeParameterBuilder_ != null) {
           return typeParameterBuilder_.getMessageOrBuilderList();
@@ -16960,33 +16960,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
         return getTypeParameterFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterBuilderList() {
         return getTypeParameterFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
           getTypeParameterFieldBuilder() {
         if (typeParameterBuilder_ == null) {
           typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
                   typeParameter_,
                   ((bitField0_ & 0x00000010) == 0x00000010),
                   getParentForChildren(),
@@ -16996,20 +16996,20 @@ public final class DebugProtoBuf {
         return typeParameterBuilder_;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
       public boolean hasReceiverType() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType() {
         if (receiverTypeBuilder_ == null) {
           return receiverType_;
         } else {
@@ -17017,9 +17017,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
-      public Builder setReceiverType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+      public Builder setReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (receiverTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17033,10 +17033,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
       public Builder setReceiverType(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (receiverTypeBuilder_ == null) {
           receiverType_ = builderForValue.build();
           onChanged();
@@ -17047,14 +17047,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
-      public Builder mergeReceiverType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (receiverTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000020) == 0x00000020) &&
-              receiverType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              receiverType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
             receiverType_ =
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
           } else {
             receiverType_ = value;
           }
@@ -17066,11 +17066,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
       public Builder clearReceiverType() {
         if (receiverTypeBuilder_ == null) {
-          receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           receiverTypeBuilder_.clear();
@@ -17079,17 +17079,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
         return getReceiverTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
         if (receiverTypeBuilder_ != null) {
           return receiverTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -17097,14 +17097,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
           getReceiverTypeFieldBuilder() {
         if (receiverTypeBuilder_ == null) {
           receiverTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
                   receiverType_,
                   getParentForChildren(),
                   isClean());
@@ -17162,27 +17162,27 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
-      private java.util.List valueParameter_ =
+      // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+      private java.util.List valueParameter_ =
         java.util.Collections.emptyList();
       private void ensureValueParameterIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          valueParameter_ = new java.util.ArrayList(valueParameter_);
+          valueParameter_ = new java.util.ArrayList(valueParameter_);
           bitField0_ |= 0x00000080;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder> valueParameterBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder> valueParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public java.util.List getValueParameterList() {
+      public java.util.List getValueParameterList() {
         if (valueParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(valueParameter_);
         } else {
@@ -17190,7 +17190,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
@@ -17204,13 +17204,13 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) {
         if (valueParameterBuilder_ == null) {
           return valueParameter_.get(index);
         } else {
@@ -17218,14 +17218,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder setValueParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17239,14 +17239,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder setValueParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.set(index, builderForValue.build());
@@ -17257,13 +17257,13 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public Builder addValueParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) {
+      public Builder addValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17277,14 +17277,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder addValueParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17298,14 +17298,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder addValueParameter(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.add(builderForValue.build());
@@ -17316,14 +17316,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder addValueParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.add(index, builderForValue.build());
@@ -17334,14 +17334,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder addAllValueParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           super.addAll(values, valueParameter_);
@@ -17352,7 +17352,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
@@ -17369,7 +17369,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
@@ -17386,24 +17386,24 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder getValueParameterBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder getValueParameterBuilder(
           int index) {
         return getValueParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
           int index) {
         if (valueParameterBuilder_ == null) {
           return valueParameter_.get(index);  } else {
@@ -17411,13 +17411,13 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getValueParameterOrBuilderList() {
         if (valueParameterBuilder_ != null) {
           return valueParameterBuilder_.getMessageOrBuilderList();
@@ -17426,45 +17426,45 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder() {
         return getValueParameterFieldBuilder().addBuilder(
-            org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance());
+            org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder(
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder(
           int index) {
         return getValueParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getValueParameterBuilderList() {
         return getValueParameterFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder> 
           getValueParameterFieldBuilder() {
         if (valueParameterBuilder_ == null) {
           valueParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder>(
                   valueParameter_,
                   ((bitField0_ & 0x00000080) == 0x00000080),
                   getParentForChildren(),
@@ -17474,20 +17474,20 @@ public final class DebugProtoBuf {
         return valueParameterBuilder_;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
-      private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
+      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
       public boolean hasReturnType() {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType() {
         if (returnTypeBuilder_ == null) {
           return returnType_;
         } else {
@@ -17495,9 +17495,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
-      public Builder setReturnType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+      public Builder setReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (returnTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17511,10 +17511,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
       public Builder setReturnType(
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
         if (returnTypeBuilder_ == null) {
           returnType_ = builderForValue.build();
           onChanged();
@@ -17525,14 +17525,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
-      public Builder mergeReturnType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
         if (returnTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000100) == 0x00000100) &&
-              returnType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              returnType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
             returnType_ =
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
           } else {
             returnType_ = value;
           }
@@ -17544,11 +17544,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
       public Builder clearReturnType() {
         if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           returnTypeBuilder_.clear();
@@ -17557,17 +17557,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() {
         bitField0_ |= 0x00000100;
         onChanged();
         return getReturnTypeFieldBuilder().getBuilder();
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
-      public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
+      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
         if (returnTypeBuilder_ != null) {
           return returnTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -17575,14 +17575,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
       private com.google.protobuf.SingleFieldBuilder<
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
           getReturnTypeFieldBuilder() {
         if (returnTypeBuilder_ == null) {
           returnTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
                   returnType_,
                   getParentForChildren(),
                   isClean());
@@ -17591,7 +17591,7 @@ public final class DebugProtoBuf {
         return returnTypeBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Callable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Callable)
     }
 
     static {
@@ -17599,89 +17599,89 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Callable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable)
   }
 
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor;
+    internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -17692,208 +17692,201 @@ public final class DebugProtoBuf {
   static {
     java.lang.String[] descriptorData = {
       "\n.core/serialization/src/descriptors.deb" +
-      "ug.proto\022+org.jetbrains.jet.descriptors." +
-      "serialization\"\035\n\013StringTable\022\016\n\006string\030\001" +
-      " \003(\t\"\317\002\n\022QualifiedNameTable\022e\n\016qualified" +
-      "_name\030\001 \003(\0132M.org.jetbrains.jet.descript" +
-      "ors.serialization.QualifiedNameTable.Qua" +
-      "lifiedName\032\321\001\n\rQualifiedName\022!\n\025parent_q" +
-      "ualified_name\030\001 \001(\005:\002-1\022\022\n\nshort_name\030\002 " +
-      "\002(\005\022i\n\004kind\030\003 \001(\0162R.org.jetbrains.jet.de" +
-      "scriptors.serialization.QualifiedNameTab",
-      "le.QualifiedName.Kind:\007PACKAGE\"\036\n\004Kind\022\t" +
-      "\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\"\212\006\n\nAnnotation\022\n\n" +
-      "\002id\030\001 \002(\005\022R\n\010argument\030\002 \003(\0132@.org.jetbra" +
-      "ins.jet.descriptors.serialization.Annota" +
-      "tion.Argument\032\233\005\n\010Argument\022\017\n\007name_id\030\001 " +
-      "\002(\005\022U\n\005value\030\002 \002(\0132F.org.jetbrains.jet.d" +
-      "escriptors.serialization.Annotation.Argu" +
-      "ment.Value\032\246\004\n\005Value\022Y\n\004type\030\001 \001(\0162K.org" +
-      ".jetbrains.jet.descriptors.serialization" +
-      ".Annotation.Argument.Value.Type\022\021\n\tint_v",
-      "alue\030\002 \001(\022\022\023\n\013float_value\030\003 \001(\002\022\024\n\014doubl" +
-      "e_value\030\004 \001(\001\022\024\n\014string_value\030\005 \001(\005\022\020\n\010c" +
-      "lass_id\030\006 \001(\005\022\025\n\renum_value_id\030\007 \001(\005\022K\n\n" +
-      "annotation\030\010 \001(\01327.org.jetbrains.jet.des" +
-      "criptors.serialization.Annotation\022]\n\rarr" +
-      "ay_element\030\t \003(\0132F.org.jetbrains.jet.des" +
-      "criptors.serialization.Annotation.Argume" +
-      "nt.Value\"\230\001\n\004Type\022\010\n\004BYTE\020\000\022\010\n\004CHAR\020\001\022\t\n" +
-      "\005SHORT\020\002\022\007\n\003INT\020\003\022\010\n\004LONG\020\004\022\t\n\005FLOAT\020\005\022\n" +
-      "\n\006DOUBLE\020\006\022\013\n\007BOOLEAN\020\007\022\n\n\006STRING\020\010\022\t\n\005C",
-      "LASS\020\t\022\010\n\004ENUM\020\n\022\016\n\nANNOTATION\020\013\022\t\n\005ARRA" +
-      "Y\020\014\"\253\005\n\004Type\022R\n\013constructor\030\001 \002(\0132=.org." +
-      "jetbrains.jet.descriptors.serialization." +
-      "Type.Constructor\022L\n\010argument\030\002 \003(\0132:.org" +
-      ".jetbrains.jet.descriptors.serialization" +
-      ".Type.Argument\022\027\n\010nullable\030\003 \001(\010:\005false\022" +
-      "%\n\035flexible_type_capabilities_id\030\004 \001(\005\022O" +
-      "\n\024flexible_upper_bound\030\005 \001(\01321.org.jetbr" +
-      "ains.jet.descriptors.serialization.Type\032" +
-      "\231\001\n\013Constructor\022W\n\004kind\030\001 \001(\0162B.org.jetb",
-      "rains.jet.descriptors.serialization.Type" +
-      ".Constructor.Kind:\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004" +
-      "Kind\022\t\n\005CLASS\020\000\022\022\n\016TYPE_PARAMETER\020\001\032\323\001\n\010" +
-      "Argument\022^\n\nprojection\030\001 \001(\0162E.org.jetbr" +
-      "ains.jet.descriptors.serialization.Type." +
-      "Argument.Projection:\003INV\022?\n\004type\030\002 \002(\01321" +
-      ".org.jetbrains.jet.descriptors.serializa" +
-      "tion.Type\"&\n\nProjection\022\006\n\002IN\020\000\022\007\n\003OUT\020\001" +
-      "\022\007\n\003INV\020\002\"\213\002\n\rTypeParameter\022\n\n\002id\030\001 \002(\005\022" +
-      "\014\n\004name\030\002 \002(\005\022\026\n\007reified\030\003 \001(\010:\005false\022Z\n",
-      "\010variance\030\004 \001(\0162C.org.jetbrains.jet.desc" +
-      "riptors.serialization.TypeParameter.Vari" +
-      "ance:\003INV\022F\n\013upper_bound\030\005 \003(\01321.org.jet" +
-      "brains.jet.descriptors.serialization.Typ" +
-      "e\"$\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"" +
-      "\263\006\n\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\030\n\020extra_vis" +
-      "ibility\030\002 \001(\t\022\017\n\007fq_name\030\003 \002(\005\022T\n\014class_" +
-      "object\030\004 \001(\0132>.org.jetbrains.jet.descrip" +
-      "tors.serialization.Class.ClassObject\022R\n\016" +
-      "type_parameter\030\005 \003(\0132:.org.jetbrains.jet",
-      ".descriptors.serialization.TypeParameter" +
-      "\022D\n\tsupertype\030\006 \003(\01321.org.jetbrains.jet." +
-      "descriptors.serialization.Type\022\031\n\021nested" +
-      "_class_name\030\007 \003(\005\022E\n\006member\030\013 \003(\01325.org." +
-      "jetbrains.jet.descriptors.serialization." +
-      "Callable\022\022\n\nenum_entry\030\014 \003(\005\022b\n\023primary_" +
-      "constructor\030\r \001(\0132E.org.jetbrains.jet.de" +
-      "scriptors.serialization.Class.PrimaryCon" +
-      "structor\032O\n\013ClassObject\022@\n\004data\030\001 \001(\01322." +
-      "org.jetbrains.jet.descriptors.serializat",
-      "ion.Class\032Y\n\022PrimaryConstructor\022C\n\004data\030" +
-      "\001 \001(\01325.org.jetbrains.jet.descriptors.se" +
-      "rialization.Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022" +
-      "\t\n\005TRAIT\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY" +
-      "\020\003\022\024\n\020ANNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014" +
-      "CLASS_OBJECT\020\006*\005\010d\020\310\001\"W\n\007Package\022E\n\006memb" +
-      "er\030\001 \003(\01325.org.jetbrains.jet.descriptors" +
-      ".serialization.Callable*\005\010d\020\310\001\"\220\006\n\010Calla" +
-      "ble\022\r\n\005flags\030\001 \001(\005\022\030\n\020extra_visibility\030\002" +
-      " \001(\t\022\024\n\014getter_flags\030\t \001(\005\022\024\n\014setter_fla",
-      "gs\030\n \001(\005\022R\n\016type_parameter\030\004 \003(\0132:.org.j" +
-      "etbrains.jet.descriptors.serialization.T" +
-      "ypeParameter\022H\n\rreceiver_type\030\005 \001(\01321.or" +
-      "g.jetbrains.jet.descriptors.serializatio" +
-      "n.Type\022\014\n\004name\030\006 \002(\005\022]\n\017value_parameter\030" +
-      "\007 \003(\0132D.org.jetbrains.jet.descriptors.se" +
-      "rialization.Callable.ValueParameter\022F\n\013r" +
-      "eturn_type\030\010 \002(\01321.org.jetbrains.jet.des" +
-      "criptors.serialization.Type\032\305\001\n\016ValuePar" +
-      "ameter\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\022?\n\004t",
-      "ype\030\003 \002(\01321.org.jetbrains.jet.descriptor" +
-      "s.serialization.Type\022N\n\023vararg_element_t" +
-      "ype\030\004 \001(\01321.org.jetbrains.jet.descriptor" +
-      "s.serialization.Type*\005\010d\020\310\001\"Q\n\nMemberKin" +
-      "d\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERRIDE\020\001\022\016\n" +
-      "\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003\":\n\014Callab" +
-      "leKind\022\007\n\003FUN\020\000\022\007\n\003VAL\020\001\022\007\n\003VAR\020\002\022\017\n\013CON" +
-      "STRUCTOR\020\003*\005\010d\020\310\001*-\n\010Modality\022\t\n\005FINAL\020\000" +
-      "\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002*b\n\nVisibility\022\014" +
-      "\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002",
-      "\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE_TO_THIS\020\004\022\t\n\005EXT" +
-      "RA\020\005B\022B\rDebugProtoBuf\210\001\000"
+      "ug.proto\022\"org.jetbrains.kotlin.serializa" +
+      "tion\"\035\n\013StringTable\022\016\n\006string\030\001 \003(\t\"\275\002\n\022" +
+      "QualifiedNameTable\022\\\n\016qualified_name\030\001 \003" +
+      "(\0132D.org.jetbrains.kotlin.serialization." +
+      "QualifiedNameTable.QualifiedName\032\310\001\n\rQua" +
+      "lifiedName\022!\n\025parent_qualified_name\030\001 \001(" +
+      "\005:\002-1\022\022\n\nshort_name\030\002 \002(\005\022`\n\004kind\030\003 \001(\0162" +
+      "I.org.jetbrains.kotlin.serialization.Qua" +
+      "lifiedNameTable.QualifiedName.Kind:\007PACK",
+      "AGE\"\036\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\"\335\005\n\n" +
+      "Annotation\022\n\n\002id\030\001 \002(\005\022I\n\010argument\030\002 \003(\013" +
+      "27.org.jetbrains.kotlin.serialization.An" +
+      "notation.Argument\032\367\004\n\010Argument\022\017\n\007name_i" +
+      "d\030\001 \002(\005\022L\n\005value\030\002 \002(\0132=.org.jetbrains.k" +
+      "otlin.serialization.Annotation.Argument." +
+      "Value\032\213\004\n\005Value\022P\n\004type\030\001 \001(\0162B.org.jetb" +
+      "rains.kotlin.serialization.Annotation.Ar" +
+      "gument.Value.Type\022\021\n\tint_value\030\002 \001(\022\022\023\n\013" +
+      "float_value\030\003 \001(\002\022\024\n\014double_value\030\004 \001(\001\022",
+      "\024\n\014string_value\030\005 \001(\005\022\020\n\010class_id\030\006 \001(\005\022" +
+      "\025\n\renum_value_id\030\007 \001(\005\022B\n\nannotation\030\010 \001" +
+      "(\0132..org.jetbrains.kotlin.serialization." +
+      "Annotation\022T\n\rarray_element\030\t \003(\0132=.org." +
+      "jetbrains.kotlin.serialization.Annotatio" +
+      "n.Argument.Value\"\230\001\n\004Type\022\010\n\004BYTE\020\000\022\010\n\004C" +
+      "HAR\020\001\022\t\n\005SHORT\020\002\022\007\n\003INT\020\003\022\010\n\004LONG\020\004\022\t\n\005F" +
+      "LOAT\020\005\022\n\n\006DOUBLE\020\006\022\013\n\007BOOLEAN\020\007\022\n\n\006STRIN" +
+      "G\020\010\022\t\n\005CLASS\020\t\022\010\n\004ENUM\020\n\022\016\n\nANNOTATION\020\013" +
+      "\022\t\n\005ARRAY\020\014\"\365\004\n\004Type\022I\n\013constructor\030\001 \002(",
+      "\01324.org.jetbrains.kotlin.serialization.T" +
+      "ype.Constructor\022C\n\010argument\030\002 \003(\01321.org." +
+      "jetbrains.kotlin.serialization.Type.Argu" +
+      "ment\022\027\n\010nullable\030\003 \001(\010:\005false\022%\n\035flexibl" +
+      "e_type_capabilities_id\030\004 \001(\005\022F\n\024flexible" +
+      "_upper_bound\030\005 \001(\0132(.org.jetbrains.kotli" +
+      "n.serialization.Type\032\220\001\n\013Constructor\022N\n\004" +
+      "kind\030\001 \001(\01629.org.jetbrains.kotlin.serial" +
+      "ization.Type.Constructor.Kind:\005CLASS\022\n\n\002" +
+      "id\030\002 \002(\005\"%\n\004Kind\022\t\n\005CLASS\020\000\022\022\n\016TYPE_PARA",
+      "METER\020\001\032\301\001\n\010Argument\022U\n\nprojection\030\001 \001(\016" +
+      "2<.org.jetbrains.kotlin.serialization.Ty" +
+      "pe.Argument.Projection:\003INV\0226\n\004type\030\002 \002(" +
+      "\0132(.org.jetbrains.kotlin.serialization.T" +
+      "ype\"&\n\nProjection\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003IN" +
+      "V\020\002\"\371\001\n\rTypeParameter\022\n\n\002id\030\001 \002(\005\022\014\n\004nam" +
+      "e\030\002 \002(\005\022\026\n\007reified\030\003 \001(\010:\005false\022Q\n\010varia" +
+      "nce\030\004 \001(\0162:.org.jetbrains.kotlin.seriali" +
+      "zation.TypeParameter.Variance:\003INV\022=\n\013up" +
+      "per_bound\030\005 \003(\0132(.org.jetbrains.kotlin.s",
+      "erialization.Type\"$\n\010Variance\022\006\n\002IN\020\000\022\007\n" +
+      "\003OUT\020\001\022\007\n\003INV\020\002\"\364\005\n\005Class\022\020\n\005flags\030\001 \001(\005" +
+      ":\0010\022\030\n\020extra_visibility\030\002 \001(\t\022\017\n\007fq_name" +
+      "\030\003 \002(\005\022K\n\014class_object\030\004 \001(\01325.org.jetbr" +
+      "ains.kotlin.serialization.Class.ClassObj" +
+      "ect\022I\n\016type_parameter\030\005 \003(\01321.org.jetbra" +
+      "ins.kotlin.serialization.TypeParameter\022;" +
+      "\n\tsupertype\030\006 \003(\0132(.org.jetbrains.kotlin" +
+      ".serialization.Type\022\031\n\021nested_class_name" +
+      "\030\007 \003(\005\022<\n\006member\030\013 \003(\0132,.org.jetbrains.k",
+      "otlin.serialization.Callable\022\022\n\nenum_ent" +
+      "ry\030\014 \003(\005\022Y\n\023primary_constructor\030\r \001(\0132<." +
+      "org.jetbrains.kotlin.serialization.Class" +
+      ".PrimaryConstructor\032F\n\013ClassObject\0227\n\004da" +
+      "ta\030\001 \001(\0132).org.jetbrains.kotlin.serializ" +
+      "ation.Class\032P\n\022PrimaryConstructor\022:\n\004dat" +
+      "a\030\001 \001(\0132,.org.jetbrains.kotlin.serializa" +
+      "tion.Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAI" +
+      "T\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020A" +
+      "NNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_O",
+      "BJECT\020\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(" +
+      "\0132,.org.jetbrains.kotlin.serialization.C" +
+      "allable*\005\010d\020\310\001\"\332\005\n\010Callable\022\r\n\005flags\030\001 \001" +
+      "(\005\022\030\n\020extra_visibility\030\002 \001(\t\022\024\n\014getter_f" +
+      "lags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022I\n\016type" +
+      "_parameter\030\004 \003(\01321.org.jetbrains.kotlin." +
+      "serialization.TypeParameter\022?\n\rreceiver_" +
+      "type\030\005 \001(\0132(.org.jetbrains.kotlin.serial" +
+      "ization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017value_para" +
+      "meter\030\007 \003(\0132;.org.jetbrains.kotlin.seria",
+      "lization.Callable.ValueParameter\022=\n\013retu" +
+      "rn_type\030\010 \002(\0132(.org.jetbrains.kotlin.ser" +
+      "ialization.Type\032\263\001\n\016ValueParameter\022\r\n\005fl" +
+      "ags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030\003 \002(\0132(." +
+      "org.jetbrains.kotlin.serialization.Type\022" +
+      "E\n\023vararg_element_type\030\004 \001(\0132(.org.jetbr" +
+      "ains.kotlin.serialization.Type*\005\010d\020\310\001\"Q\n" +
+      "\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVE" +
+      "RRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003" +
+      "\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL\020\001\022\007\n\003VA",
+      "R\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010Modality\022" +
+      "\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002*b\n\nVi" +
+      "sibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tP" +
+      "ROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE_TO_THI" +
+      "S\020\004\022\t\n\005EXTRA\020\005B\022B\rDebugProtoBuf\210\001\000"
     };
     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_StringTable_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor =
             getDescriptor().getMessageTypes().get(0);
-          internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_StringTable_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor,
               new java.lang.String[] { "String", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor =
             getDescriptor().getMessageTypes().get(1);
-          internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor,
               new java.lang.String[] { "QualifiedName", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor =
-            internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor =
+            internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor.getNestedTypes().get(0);
+          internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor,
               new java.lang.String[] { "ParentQualifiedName", "ShortName", "Kind", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor =
             getDescriptor().getMessageTypes().get(2);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor,
               new java.lang.String[] { "Id", "Argument", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_descriptor =
-            internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor =
+            internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor.getNestedTypes().get(0);
+          internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor,
               new java.lang.String[] { "NameId", "Value", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_descriptor =
-            internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor =
+            internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor.getNestedTypes().get(0);
+          internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Annotation_Argument_Value_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor,
               new java.lang.String[] { "Type", "IntValue", "FloatValue", "DoubleValue", "StringValue", "ClassId", "EnumValueId", "Annotation", "ArrayElement", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_Type_descriptor =
             getDescriptor().getMessageTypes().get(3);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Type_descriptor,
               new java.lang.String[] { "Constructor", "Argument", "Nullable", "FlexibleTypeCapabilitiesId", "FlexibleUpperBound", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor =
-            internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_descriptor =
+            internal_static_org_jetbrains_kotlin_serialization_Type_descriptor.getNestedTypes().get(0);
+          internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Type_Constructor_descriptor,
               new java.lang.String[] { "Kind", "Id", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor =
-            internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor.getNestedTypes().get(1);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor =
+            internal_static_org_jetbrains_kotlin_serialization_Type_descriptor.getNestedTypes().get(1);
+          internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor,
               new java.lang.String[] { "Projection", "Type", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor =
             getDescriptor().getMessageTypes().get(4);
-          internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor,
               new java.lang.String[] { "Id", "Name", "Reified", "Variance", "UpperBound", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_Class_descriptor =
             getDescriptor().getMessageTypes().get(5);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Class_descriptor,
               new java.lang.String[] { "Flags", "ExtraVisibility", "FqName", "ClassObject", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor =
-            internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_descriptor =
+            internal_static_org_jetbrains_kotlin_serialization_Class_descriptor.getNestedTypes().get(0);
+          internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Class_ClassObject_descriptor,
               new java.lang.String[] { "Data", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor =
-            internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor.getNestedTypes().get(1);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor =
+            internal_static_org_jetbrains_kotlin_serialization_Class_descriptor.getNestedTypes().get(1);
+          internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor,
               new java.lang.String[] { "Data", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_Package_descriptor =
             getDescriptor().getMessageTypes().get(6);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Package_descriptor,
               new java.lang.String[] { "Member", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor =
+          internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor =
             getDescriptor().getMessageTypes().get(7);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor,
               new java.lang.String[] { "Flags", "ExtraVisibility", "GetterFlags", "SetterFlags", "TypeParameter", "ReceiverType", "Name", "ValueParameter", "ReturnType", });
-          internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor =
-            internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor.getNestedTypes().get(0);
-          internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable = new
+          internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor =
+            internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor.getNestedTypes().get(0);
+          internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor,
+              internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor,
               new java.lang.String[] { "Flags", "Name", "Type", "VarargElementType", });
           return null;
         }
diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt
similarity index 94%
rename from compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt
rename to compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt
index 7b953f1b5bb..dfd96880f9c 100644
--- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.builtins
 
-import java.io.File
-import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializer
 import org.jetbrains.jet.test.TestCaseWithTmpdir
-import org.jetbrains.jet.lang.types.lang.BuiltinsPackageFragment
-import org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.jet.JetTestUtils
-import java.io.FileInputStream
-import org.jetbrains.jet.test.util.RecursiveDescriptorComparator
-import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
+import java.io.File
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
+import org.jetbrains.jet.JetTestUtils
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
+import java.io.FileInputStream
+import org.jetbrains.jet.lang.types.lang.BuiltinsPackageFragment
+import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
+import org.jetbrains.jet.test.util.RecursiveDescriptorComparator
+import org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME
 
 public class BuiltInsSerializerTest : TestCaseWithTmpdir() {
     private fun doTest(fileName: String) {
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
new file mode 100644
index 00000000000..401e2c1c5e5
--- /dev/null
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
@@ -0,0 +1,105 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/serialization/src/builtins.debug.proto
+
+package org.jetbrains.kotlin.serialization.builtins;
+
+public final class DebugBuiltInsProtoBuf {
+  private DebugBuiltInsProtoBuf() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.className);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.callableAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.parameterAnnotation);
+  }
+  public static final int CLASS_NAME_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.serialization.Package { ... }
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Package,
+      java.util.List> className = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Integer.class,
+        null);
+  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
+      java.util.List> classAnnotation = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.serialization.Callable { ... }
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
+      java.util.List> callableAnnotation = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
+   */
+  public static final
+    com.google.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
+      java.util.List> parameterAnnotation = com.google.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n+core/serialization/src/builtins.debug." +
+      "proto\022+org.jetbrains.kotlin.serializatio" +
+      "n.builtins\032.core/serialization/src/descr" +
+      "iptors.debug.proto:D\n\nclass_name\022+.org.j" +
+      "etbrains.kotlin.serialization.Package\030\226\001" +
+      " \003(\005B\002\020\001:t\n\020class_annotation\022).org.jetbr" +
+      "ains.kotlin.serialization.Class\030\226\001 \003(\0132." +
+      ".org.jetbrains.kotlin.serialization.Anno" +
+      "tation:z\n\023callable_annotation\022,.org.jetb" +
+      "rains.kotlin.serialization.Callable\030\226\001 \003",
+      "(\0132..org.jetbrains.kotlin.serialization." +
+      "Annotation:\212\001\n\024parameter_annotation\022;.or" +
+      "g.jetbrains.kotlin.serialization.Callabl" +
+      "e.ValueParameter\030\226\001 \003(\0132..org.jetbrains." +
+      "kotlin.serialization.AnnotationB\027B\025Debug" +
+      "BuiltInsProtoBuf"
+    };
+    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;
+          className.internalInit(descriptor.getExtensions().get(0));
+          classAnnotation.internalInit(descriptor.getExtensions().get(1));
+          callableAnnotation.internalInit(descriptor.getExtensions().get(2));
+          parameterAnnotation.internalInit(descriptor.getExtensions().get(3));
+          return null;
+        }
+      };
+    com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
+        }, assigner);
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java
rename to compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
index 8a3412a1277..b6c4570069e 100644
--- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.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.builtins;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.containers.ContainerUtil;
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
index ccb0c13aa60..053a0b58312 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
@@ -3723,44 +3723,44 @@ public final class DebugJvmProtoBuf {
 
   public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }
+   * extend .org.jetbrains.kotlin.serialization.Callable { ... }
    */
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
       org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature> methodSignature = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         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;
   /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }
+   * extend .org.jetbrains.kotlin.serialization.Callable { ... }
    */
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
       org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature> propertySignature = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         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;
   /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }
+   * extend .org.jetbrains.kotlin.serialization.Callable { ... }
    */
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable,
       java.lang.Integer> implClassName = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int INDEX_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }
+   * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
    */
   public static final
     com.google.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter,
+      org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
       java.lang.Integer> index = com.google.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
@@ -3820,19 +3820,18 @@ public final class DebugJvmProtoBuf {
       "(\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.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"
+      "JvmMethodSignature:\202\001\n\020method_signature\022" +
+      ",.org.jetbrains.kotlin.serialization.Cal" +
+      "lable\030d \001(\0132:.org.jetbrains.kotlin.seria" +
+      "lization.jvm.JvmMethodSignature:\206\001\n\022prop",
+      "erty_signature\022,.org.jetbrains.kotlin.se" +
+      "rialization.Callable\030e \001(\0132<.org.jetbrai" +
+      "ns.kotlin.serialization.jvm.JvmPropertyS" +
+      "ignature:E\n\017impl_class_name\022,.org.jetbra" +
+      "ins.kotlin.serialization.Callable\030f \001(\005:" +
+      "J\n\005index\022;.org.jetbrains.kotlin.serializ" +
+      "ation.Callable.ValueParameter\030d \001(\005B\022B\020D" +
+      "ebugJvmProtoBuf"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -3873,7 +3872,7 @@ public final class DebugJvmProtoBuf {
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor(),
+          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
         }, assigner);
   }
 
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 79d75a3c3b1..4169b0c4252 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
@@ -18,18 +18,18 @@ package org.jetbrains.jet.lang.resolve.kotlin
 
 import org.jetbrains.jet.lang.resolve.name.ClassId
 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.kotlin.serialization.deserialization.AnnotatedCallableKind
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
 import org.jetbrains.jet.lang.resolve.name.FqName
 import java.util.HashMap
 import org.jetbrains.jet.lang.resolve.name.Name
-import org.jetbrains.jet.descriptors.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationAndConstantLoader
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader
 import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames
 
 public abstract class AbstractBinaryClassAnnotationAndConstantLoader(
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt
index 740c93b821a..b483fdc6aeb 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt
@@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.constants.EnumValue
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.jet.lang.resolve.constants.ErrorValue
 import org.jetbrains.jet.lang.resolve.constants.createCompileTimeConstant
-import org.jetbrains.jet.descriptors.serialization.findClassAcrossModuleDependencies
+import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
 
 public class BinaryClassAnnotationAndConstantLoaderImpl(
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt
index fe987fede7b..301e21190a3 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt
@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.kotlin
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 
 // This class is needed only for easier injection: exact types of needed components are specified in the constructor here.
 // Otherwise injector generator is not smart enough to deduce, for example, which package fragment provider DeserializationComponents needs
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 5227f2c2563..f676d63218c 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
@@ -20,9 +20,9 @@ import kotlin.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 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;
+import org.jetbrains.kotlin.serialization.PackageData;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents;
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter;
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 02486d415e5..965a5a78583 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
@@ -17,8 +17,8 @@
 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.kotlin.serialization.deserialization.ClassDataFinder
+import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt
index b50fac0319a..8427f5e25e4 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.kotlin
 
-import org.jetbrains.jet.descriptors.serialization.FlexibleTypeCapabilitiesDeserializer
+import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver
 import org.jetbrains.jet.lang.types.FlexibleTypeCapabilities
@@ -29,4 +29,4 @@ object JavaFlexibleTypeCapabilitiesDeserializer : FlexibleTypeCapabilitiesDeseri
                else null
     }
 
-}
\ No newline at end of file
+}
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 8b69bbf673c..4e5b7ff1da1 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
@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsAnnotationAndConstantLoader.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsAnnotationAndConstantLoader.kt
index 40ad7107e97..ad16b010c79 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsAnnotationAndConstantLoader.kt
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsAnnotationAndConstantLoader.kt
@@ -16,11 +16,12 @@
 
 package org.jetbrains.jet.lang.types.lang
 
-import org.jetbrains.jet.descriptors.serialization.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.*
+import org.jetbrains.kotlin.serialization.*
+import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
 
 class BuiltInsAnnotationAndConstantLoader(
         module: ModuleDescriptor
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt
index 3f68f8cacb9..27457403264 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt
@@ -16,8 +16,7 @@
 
 package org.jetbrains.jet.lang.types.lang
 
-import org.jetbrains.jet.descriptors.serialization.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider
 import org.jetbrains.jet.lang.descriptors.PackageFragmentProviderImpl
@@ -25,8 +24,14 @@ import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl
 import org.jetbrains.jet.lang.resolve.name.*
 import org.jetbrains.kotlin.storage.StorageManager
 import java.io.InputStream
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import com.google.protobuf.ExtensionRegistryLite
+import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
+import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
+import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
+import org.jetbrains.kotlin.serialization.NameSerializationUtil
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ClassData
 
 public class BuiltinsPackageFragment(
         fqName: FqName,
diff --git a/core/serialization.jvm/src/jvm_descriptors.proto b/core/serialization.jvm/src/jvm_descriptors.proto
index f08fabc5dfc..0a1e1b3668e 100644
--- a/core/serialization.jvm/src/jvm_descriptors.proto
+++ b/core/serialization.jvm/src/jvm_descriptors.proto
@@ -69,7 +69,7 @@ message JvmPropertySignature {
   optional JvmMethodSignature setter = 4;
 }
 
-extend org.jetbrains.jet.descriptors.serialization.Callable {
+extend org.jetbrains.kotlin.serialization.Callable {
   optional JvmMethodSignature method_signature = 100;
 
   optional JvmPropertySignature property_signature = 101;
@@ -82,7 +82,7 @@ extend org.jetbrains.jet.descriptors.serialization.Callable {
   optional int32 impl_class_name = 102;
 }
 
-extend org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter {
+extend org.jetbrains.kotlin.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.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
index b3e289ed521..69e60d120c9 100644
--- a/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+++ b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
@@ -2798,14 +2798,14 @@ public final class JvmProtoBuf {
 
   public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }
+   * extend .org.jetbrains.kotlin.serialization.Callable { ... }
    */
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
       org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature> methodSignature = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
         org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
         org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
         null,
@@ -2813,14 +2813,14 @@ public final class JvmProtoBuf {
         com.google.protobuf.WireFormat.FieldType.MESSAGE);
   public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }
+   * extend .org.jetbrains.kotlin.serialization.Callable { ... }
    */
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
       org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature> propertySignature = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
         org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
         org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
         null,
@@ -2828,14 +2828,14 @@ public final class JvmProtoBuf {
         com.google.protobuf.WireFormat.FieldType.MESSAGE);
   public static final int IMPL_CLASS_NAME_FIELD_NUMBER = 102;
   /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }
+   * extend .org.jetbrains.kotlin.serialization.Callable { ... }
    */
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
       java.lang.Integer> implClassName = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
         0,
         null,
         null,
@@ -2843,14 +2843,14 @@ public final class JvmProtoBuf {
         com.google.protobuf.WireFormat.FieldType.INT32);
   public static final int INDEX_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }
+   * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
    */
   public static final
     com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter,
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
       java.lang.Integer> index = com.google.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
         0,
         null,
         null,
diff --git a/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java
index 68e37439811..6d30a9b4824 100644
--- a/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java
+++ b/core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.java
@@ -18,8 +18,8 @@ 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;
+import org.jetbrains.kotlin.serialization.ClassData;
+import org.jetbrains.kotlin.serialization.PackageData;
 
 public class JvmProtoBufUtil {
     private JvmProtoBufUtil() {
diff --git a/core/serialization/src/builtins.proto b/core/serialization/src/builtins.proto
index e392242a436..59ba30effe3 100644
--- a/core/serialization/src/builtins.proto
+++ b/core/serialization/src/builtins.proto
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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.builtins;
 
 import "core/serialization/src/descriptors.proto";
 
diff --git a/core/serialization/src/descriptors.proto b/core/serialization/src/descriptors.proto
index 810c59caa94..fedf79dc364 100644
--- a/core/serialization/src/descriptors.proto
+++ b/core/serialization/src/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,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 option java_outer_classname = "ProtoBuf";
 option optimize_for = LITE_RUNTIME; // Smaller runtime
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/BuiltInsProtoBuf.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/BuiltInsProtoBuf.java
deleted file mode 100644
index 6cd3a3943f3..00000000000
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/BuiltInsProtoBuf.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/serialization/src/builtins.proto
-
-package org.jetbrains.jet.descriptors.serialization;
-
-public final class BuiltInsProtoBuf {
-  private BuiltInsProtoBuf() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistryLite registry) {
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.className);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.callableAnnotation);
-    registry.add(org.jetbrains.jet.descriptors.serialization.BuiltInsProtoBuf.parameterAnnotation);
-  }
-  public static final int CLASS_NAME_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Package { ... }
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package,
-      java.util.List> className = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package.getDefaultInstance(),
-        null,
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.INT32,
-        true);
-  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Class { ... }
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class,
-      java.util.List> classAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... }
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable,
-      java.util.List> callableAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... }
-   */
-  public static final
-    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter,
-      java.util.List> parameterAnnotation = com.google.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        com.google.protobuf.WireFormat.FieldType.MESSAGE,
-        false);
-
-  static {
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/AnnotationSerializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
similarity index 95%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/AnnotationSerializer.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
index 8ecde5eba73..8e4eda95f9a 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/AnnotationSerializer.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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
 
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor
 import org.jetbrains.jet.lang.resolve.constants.*
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.jet.lang.types.JetType
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java b/core/serialization/src/org/jetbrains/kotlin/serialization/ClassData.java
similarity index 93%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/ClassData.java
index 4827e7bef00..e5175ebed0b 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/ClassData.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,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.ByteArrayInputStream;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
similarity index 99%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
index b6f168aa8b5..c902948860f 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.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;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.*;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java b/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java
similarity index 99%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java
index 76a40c0c329..26e13592ee5 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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;
 
 import com.google.protobuf.Internal;
 import org.jetbrains.annotations.NotNull;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/Interner.java b/core/serialization/src/org/jetbrains/kotlin/serialization/Interner.java
similarity index 96%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/Interner.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/Interner.java
index 21b614fb25a..4ff42614d8a 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/Interner.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/Interner.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;
 
 import gnu.trove.TObjectHashingStrategy;
 import gnu.trove.TObjectIntHashMap;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java b/core/serialization/src/org/jetbrains/kotlin/serialization/NameSerializationUtil.java
similarity index 95%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/NameSerializationUtil.java
index a75112c0a6a..77a17aa5931 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/NameSerializationUtil.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,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.IOException;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java b/core/serialization/src/org/jetbrains/kotlin/serialization/PackageData.java
similarity index 93%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/PackageData.java
index ae53c5f3a06..3d56ab96b2a 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/PackageData.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,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import com.google.protobuf.ExtensionRegistryLite;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
 import org.jetbrains.kotlin.utils.UtilsPackage;
 
 import java.io.ByteArrayInputStream;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java b/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
similarity index 69%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index af29c11b826..e3dad06ab2f 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: core/serialization/src/descriptors.proto
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 public final class ProtoBuf {
   private ProtoBuf() {}
@@ -9,7 +9,7 @@ public final class ProtoBuf {
       com.google.protobuf.ExtensionRegistryLite registry) {
   }
   /**
-   * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Modality}
+   * Protobuf enum {@code org.jetbrains.kotlin.serialization.Modality}
    */
   public enum Modality
       implements com.google.protobuf.Internal.EnumLite {
@@ -78,11 +78,11 @@ public final class ProtoBuf {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Modality)
+    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Modality)
   }
 
   /**
-   * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Visibility}
+   * Protobuf enum {@code org.jetbrains.kotlin.serialization.Visibility}
    */
   public enum Visibility
       implements com.google.protobuf.Internal.EnumLite {
@@ -186,7 +186,7 @@ public final class ProtoBuf {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Visibility)
+    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Visibility)
   }
 
   public interface StringTableOrBuilder
@@ -213,7 +213,7 @@ public final class ProtoBuf {
         getStringBytes(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.StringTable}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable}
    */
   public static final class StringTable extends
       com.google.protobuf.GeneratedMessageLite
@@ -368,53 +368,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable 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.ProtoBuf.StringTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable 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.ProtoBuf.StringTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable 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.ProtoBuf.StringTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable 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.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -423,19 +423,19 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.StringTable}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTableOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable.newBuilder()
+          org.jetbrains.kotlin.serialization.ProtoBuf.StringTable, Builder>
+        implements org.jetbrains.kotlin.serialization.ProtoBuf.StringTableOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -457,20 +457,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable build() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable result = buildPartial();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable build() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.StringTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable(this);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable buildPartial() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.StringTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.StringTable(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           string_ = new com.google.protobuf.UnmodifiableLazyStringList(
@@ -481,8 +481,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable other) {
+        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance()) return this;
         if (!other.string_.isEmpty()) {
           if (string_.isEmpty()) {
             string_ = other.string_;
@@ -504,11 +504,11 @@ public final class ProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable parsedMessage = null;
+        org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.StringTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.StringTable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -612,7 +612,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.StringTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.StringTable)
     }
 
     static {
@@ -620,29 +620,29 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.StringTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.StringTable)
   }
 
   public interface QualifiedNameTableOrBuilder
       extends com.google.protobuf.MessageLiteOrBuilder {
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+    // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    java.util.List 
+    java.util.List 
         getQualifiedNameList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
     int getQualifiedNameCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable}
    */
   public static final class QualifiedNameTable extends
       com.google.protobuf.GeneratedMessageLite
@@ -686,10 +686,10 @@ public final class ProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                qualifiedName_ = new java.util.ArrayList();
+                qualifiedName_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              qualifiedName_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry));
+              qualifiedName_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry));
               break;
             }
           }
@@ -752,18 +752,18 @@ public final class ProtoBuf {
        */
       int getShortName();
 
-      // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+      // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
        */
       boolean hasKind();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind();
+      org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName}
      */
     public static final class QualifiedName extends
         com.google.protobuf.GeneratedMessageLite
@@ -817,7 +817,7 @@ public final class ProtoBuf {
               }
               case 24: {
                 int rawValue = input.readEnum();
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue);
+                org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue);
                 if (value != null) {
                   bitField0_ |= 0x00000004;
                   kind_ = value;
@@ -851,7 +851,7 @@ public final class ProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind}
+       * Protobuf enum {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind}
        */
       public enum Kind
           implements com.google.protobuf.Internal.EnumLite {
@@ -903,7 +903,7 @@ public final class ProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind)
       }
 
       private int bitField0_;
@@ -947,26 +947,26 @@ public final class ProtoBuf {
         return shortName_;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+      // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
       public static final int KIND_FIELD_NUMBER = 3;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() {
         return kind_;
       }
 
       private void initFields() {
         parentQualifiedName_ = -1;
         shortName_ = 0;
-        kind_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
+        kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -1024,53 +1024,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName 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.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName 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.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName 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.ProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName 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.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -1079,19 +1079,19 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName, Builder>
-          implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder {
-        // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.newBuilder()
+            org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName, Builder>
+          implements org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder {
+        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -1108,7 +1108,7 @@ public final class ProtoBuf {
           bitField0_ = (bitField0_ & ~0x00000001);
           shortName_ = 0;
           bitField0_ = (bitField0_ & ~0x00000002);
-          kind_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
+          kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
           bitField0_ = (bitField0_ & ~0x00000004);
           return this;
         }
@@ -1117,20 +1117,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName build() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName build() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName(this);
+        public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName buildPartial() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1149,8 +1149,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName other) {
+          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this;
           if (other.hasParentQualifiedName()) {
             setParentQualifiedName(other.getParentQualifiedName());
           }
@@ -1175,11 +1175,11 @@ public final class ProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null;
+          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -1272,24 +1272,24 @@ public final class ProtoBuf {
           return this;
         }
 
-        // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
+        // optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+        private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+         * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
          */
         public boolean hasKind() {
           return ((bitField0_ & 0x00000004) == 0x00000004);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+         * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() {
           return kind_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+         * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
          */
-        public Builder setKind(org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value) {
+        public Builder setKind(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -1299,16 +1299,16 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+         * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
          */
         public Builder clearKind() {
           bitField0_ = (bitField0_ & ~0x00000004);
-          kind_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
+          kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
           
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
       }
 
       static {
@@ -1316,41 +1316,41 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+    // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
     public static final int QUALIFIED_NAME_FIELD_NUMBER = 1;
-    private java.util.List qualifiedName_;
+    private java.util.List qualifiedName_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    public java.util.List getQualifiedNameList() {
+    public java.util.List getQualifiedNameList() {
       return qualifiedName_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getQualifiedNameOrBuilderList() {
       return qualifiedName_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
     public int getQualifiedNameCount() {
       return qualifiedName_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) {
       return qualifiedName_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder(
         int index) {
       return qualifiedName_.get(index);
     }
@@ -1402,53 +1402,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable 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.ProtoBuf.QualifiedNameTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable 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.ProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable 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.ProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable 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.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1457,19 +1457,19 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTableOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.newBuilder()
+          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable, Builder>
+        implements org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTableOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1491,20 +1491,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable build() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable result = buildPartial();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable build() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable(this);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable buildPartial() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           qualifiedName_ = java.util.Collections.unmodifiableList(qualifiedName_);
@@ -1514,8 +1514,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable other) {
+        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance()) return this;
         if (!other.qualifiedName_.isEmpty()) {
           if (qualifiedName_.isEmpty()) {
             qualifiedName_ = other.qualifiedName_;
@@ -1543,11 +1543,11 @@ public final class ProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable parsedMessage = null;
+        org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1558,39 +1558,39 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
-      private java.util.List qualifiedName_ =
+      // repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+      private java.util.List qualifiedName_ =
         java.util.Collections.emptyList();
       private void ensureQualifiedNameIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          qualifiedName_ = new java.util.ArrayList(qualifiedName_);
+          qualifiedName_ = new java.util.ArrayList(qualifiedName_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
-      public java.util.List getQualifiedNameList() {
+      public java.util.List getQualifiedNameList() {
         return java.util.Collections.unmodifiableList(qualifiedName_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public int getQualifiedNameCount() {
         return qualifiedName_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) {
         return qualifiedName_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder setQualifiedName(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1600,19 +1600,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder setQualifiedName(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
         ensureQualifiedNameIsMutable();
         qualifiedName_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
-      public Builder addQualifiedName(org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
+      public Builder addQualifiedName(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1622,10 +1622,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder addQualifiedName(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1635,37 +1635,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder addQualifiedName(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
         ensureQualifiedNameIsMutable();
         qualifiedName_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder addQualifiedName(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
         ensureQualifiedNameIsMutable();
         qualifiedName_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder addAllQualifiedName(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureQualifiedNameIsMutable();
         super.addAll(values, qualifiedName_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder clearQualifiedName() {
         qualifiedName_ = java.util.Collections.emptyList();
@@ -1674,7 +1674,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder removeQualifiedName(int index) {
         ensureQualifiedNameIsMutable();
@@ -1683,7 +1683,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable)
     }
 
     static {
@@ -1691,7 +1691,7 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable)
   }
 
   public interface AnnotationOrBuilder
@@ -1715,23 +1715,23 @@ public final class ProtoBuf {
      */
     int getId();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+    // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getArgumentList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument getArgument(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument getArgument(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
     int getArgumentCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation}
    */
   public static final class Annotation extends
       com.google.protobuf.GeneratedMessageLite
@@ -1780,10 +1780,10 @@ public final class ProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                argument_ = new java.util.ArrayList();
+                argument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              argument_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.PARSER, extensionRegistry));
+              argument_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.PARSER, extensionRegistry));
               break;
             }
           }
@@ -1836,18 +1836,18 @@ public final class ProtoBuf {
        */
       int getNameId();
 
-      // required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+      // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
        */
       boolean hasValue();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value getValue();
+      org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getValue();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument}
      */
     public static final class Argument extends
         com.google.protobuf.GeneratedMessageLite
@@ -1895,11 +1895,11 @@ public final class ProtoBuf {
                 break;
               }
               case 18: {
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) == 0x00000002)) {
                   subBuilder = value_.toBuilder();
                 }
-                value_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry);
+                value_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(value_);
                   value_ = subBuilder.buildPartial();
@@ -1936,9 +1936,9 @@ public final class ProtoBuf {
       public interface ValueOrBuilder
           extends com.google.protobuf.MessageLiteOrBuilder {
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+        // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -1948,7 +1948,7 @@ public final class ProtoBuf {
          */
         boolean hasType();
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -1956,7 +1956,7 @@ public final class ProtoBuf {
          * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
          * 

          */
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type getType();
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type getType();
 
         // optional sint64 int_value = 2;
         /**
@@ -2042,33 +2042,33 @@ public final class ProtoBuf {
          */
         int getEnumValueId();
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+        // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
         boolean hasAnnotation();
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation getAnnotation();
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation();
 
-        // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+        // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        java.util.List 
+        java.util.List 
             getArrayElementList();
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index);
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index);
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
         int getArrayElementCount();
       }
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
        */
       public static final class Value extends
           com.google.protobuf.GeneratedMessageLite
@@ -2112,7 +2112,7 @@ public final class ProtoBuf {
                 }
                 case 8: {
                   int rawValue = input.readEnum();
-                  org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
+                  org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
                   if (value != null) {
                     bitField0_ |= 0x00000001;
                     type_ = value;
@@ -2150,11 +2150,11 @@ public final class ProtoBuf {
                   break;
                 }
                 case 66: {
-                  org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Builder subBuilder = null;
+                  org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder subBuilder = null;
                   if (((bitField0_ & 0x00000080) == 0x00000080)) {
                     subBuilder = annotation_.toBuilder();
                   }
-                  annotation_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.PARSER, extensionRegistry);
+                  annotation_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.PARSER, extensionRegistry);
                   if (subBuilder != null) {
                     subBuilder.mergeFrom(annotation_);
                     annotation_ = subBuilder.buildPartial();
@@ -2164,10 +2164,10 @@ public final class ProtoBuf {
                 }
                 case 74: {
                   if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                    arrayElement_ = new java.util.ArrayList();
+                    arrayElement_ = new java.util.ArrayList();
                     mutable_bitField0_ |= 0x00000100;
                   }
-                  arrayElement_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry));
+                  arrayElement_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry));
                   break;
                 }
               }
@@ -2200,7 +2200,7 @@ public final class ProtoBuf {
         }
 
         /**
-         * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type}
+         * Protobuf enum {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type}
          */
         public enum Type
             implements com.google.protobuf.Internal.EnumLite {
@@ -2351,15 +2351,15 @@ public final class ProtoBuf {
             this.value = value;
           }
 
-          // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type)
+          // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type)
         }
 
         private int bitField0_;
-        // optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+        // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
         public static final int TYPE_FIELD_NUMBER = 1;
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type type_;
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type type_;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2371,7 +2371,7 @@ public final class ProtoBuf {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2379,7 +2379,7 @@ public final class ProtoBuf {
          * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type getType() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type getType() {
           return type_;
         }
 
@@ -2503,67 +2503,67 @@ public final class ProtoBuf {
           return enumValueId_;
         }
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+        // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
         public static final int ANNOTATION_FIELD_NUMBER = 8;
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation annotation_;
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation annotation_;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
         public boolean hasAnnotation() {
           return ((bitField0_ & 0x00000080) == 0x00000080);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation getAnnotation() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation() {
           return annotation_;
         }
 
-        // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+        // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
         public static final int ARRAY_ELEMENT_FIELD_NUMBER = 9;
-        private java.util.List arrayElement_;
+        private java.util.List arrayElement_;
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        public java.util.List getArrayElementList() {
+        public java.util.List getArrayElementList() {
           return arrayElement_;
         }
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        public java.util.List 
+        public java.util.List 
             getArrayElementOrBuilderList() {
           return arrayElement_;
         }
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
         public int getArrayElementCount() {
           return arrayElement_.size();
         }
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
           return arrayElement_.get(index);
         }
         /**
-         * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
             int index) {
           return arrayElement_.get(index);
         }
 
         private void initFields() {
-          type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
+          type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
           intValue_ = 0L;
           floatValue_ = 0F;
           doubleValue_ = 0D;
           stringValue_ = 0;
           classId_ = 0;
           enumValueId_ = 0;
-          annotation_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance();
+          annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
           arrayElement_ = java.util.Collections.emptyList();
         }
         private byte memoizedIsInitialized = -1;
@@ -2672,53 +2672,53 @@ public final class ProtoBuf {
           return super.writeReplace();
         }
 
-        public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
             com.google.protobuf.ByteString data)
             throws com.google.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data);
         }
-        public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value 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.ProtoBuf.Annotation.Argument.Value parseFrom(byte[] data)
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(byte[] data)
             throws com.google.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data);
         }
-        public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value 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.ProtoBuf.Annotation.Argument.Value parseFrom(java.io.InputStream input)
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(java.io.InputStream input)
             throws java.io.IOException {
           return PARSER.parseFrom(input);
         }
-        public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value 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.ProtoBuf.Annotation.Argument.Value parseDelimitedFrom(java.io.InputStream input)
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseDelimitedFrom(java.io.InputStream input)
             throws java.io.IOException {
           return PARSER.parseDelimitedFrom(input);
         }
-        public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value parseDelimitedFrom(
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value 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.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
             com.google.protobuf.CodedInputStream input)
             throws java.io.IOException {
           return PARSER.parseFrom(input);
         }
-        public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
@@ -2727,19 +2727,19 @@ public final class ProtoBuf {
 
         public static Builder newBuilder() { return Builder.create(); }
         public Builder newBuilderForType() { return newBuilder(); }
-        public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value prototype) {
+        public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value prototype) {
           return newBuilder().mergeFrom(prototype);
         }
         public Builder toBuilder() { return newBuilder(this); }
 
         /**
-         * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value}
+         * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
          */
         public static final class Builder extends
             com.google.protobuf.GeneratedMessageLite.Builder<
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value, Builder>
-            implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.ValueOrBuilder {
-          // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.newBuilder()
+              org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value, Builder>
+            implements org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.ValueOrBuilder {
+          // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.newBuilder()
           private Builder() {
             maybeForceBuilderInitialization();
           }
@@ -2752,7 +2752,7 @@ public final class ProtoBuf {
 
           public Builder clear() {
             super.clear();
-            type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
+            type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
             bitField0_ = (bitField0_ & ~0x00000001);
             intValue_ = 0L;
             bitField0_ = (bitField0_ & ~0x00000002);
@@ -2766,7 +2766,7 @@ public final class ProtoBuf {
             bitField0_ = (bitField0_ & ~0x00000020);
             enumValueId_ = 0;
             bitField0_ = (bitField0_ & ~0x00000040);
-            annotation_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance();
+            annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
             bitField0_ = (bitField0_ & ~0x00000080);
             arrayElement_ = java.util.Collections.emptyList();
             bitField0_ = (bitField0_ & ~0x00000100);
@@ -2777,20 +2777,20 @@ public final class ProtoBuf {
             return create().mergeFrom(buildPartial());
           }
 
-          public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value getDefaultInstanceForType() {
-            return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getDefaultInstanceForType() {
+            return org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
           }
 
-          public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value build() {
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value result = buildPartial();
+          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value build() {
+            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value result = buildPartial();
             if (!result.isInitialized()) {
               throw newUninitializedMessageException(result);
             }
             return result;
           }
 
-          public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value buildPartial() {
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value(this);
+          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value buildPartial() {
+            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value result = new org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value(this);
             int from_bitField0_ = bitField0_;
             int to_bitField0_ = 0;
             if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2834,8 +2834,8 @@ public final class ProtoBuf {
             return result;
           }
 
-          public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value other) {
-            if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance()) return this;
+          public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value other) {
+            if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance()) return this;
             if (other.hasType()) {
               setType(other.getType());
             }
@@ -2893,11 +2893,11 @@ public final class ProtoBuf {
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value parsedMessage = null;
+            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parsedMessage = null;
             try {
               parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
             } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value) e.getUnfinishedMessage();
+              parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value) e.getUnfinishedMessage();
               throw e;
             } finally {
               if (parsedMessage != null) {
@@ -2908,10 +2908,10 @@ public final class ProtoBuf {
           }
           private int bitField0_;
 
-          // optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
-          private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
+          // optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+          private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2923,7 +2923,7 @@ public final class ProtoBuf {
             return ((bitField0_ & 0x00000001) == 0x00000001);
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2931,11 +2931,11 @@ public final class ProtoBuf {
            * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
            * 

            */
-          public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type getType() {
+          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type getType() {
             return type_;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2943,7 +2943,7 @@ public final class ProtoBuf {
            * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
            * 

            */
-          public Builder setType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type value) {
+          public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -2953,7 +2953,7 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2963,7 +2963,7 @@ public final class ProtoBuf {
            */
           public Builder clearType() {
             bitField0_ = (bitField0_ & ~0x00000001);
-            type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
+            type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
             
             return this;
           }
@@ -3214,24 +3214,24 @@ public final class ProtoBuf {
             return this;
           }
 
-          // optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
-          private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation annotation_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance();
+          // optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+          private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
           public boolean hasAnnotation() {
             return ((bitField0_ & 0x00000080) == 0x00000080);
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
-          public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation getAnnotation() {
+          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation() {
             return annotation_;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
-          public Builder setAnnotation(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation value) {
+          public Builder setAnnotation(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3241,23 +3241,23 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
           public Builder setAnnotation(
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+              org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
             annotation_ = builderForValue.build();
 
             bitField0_ |= 0x00000080;
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
-          public Builder mergeAnnotation(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation value) {
+          public Builder mergeAnnotation(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
             if (((bitField0_ & 0x00000080) == 0x00000080) &&
-                annotation_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance()) {
+                annotation_ != org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance()) {
               annotation_ =
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
             } else {
               annotation_ = value;
             }
@@ -3266,48 +3266,48 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.jet.descriptors.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
            */
           public Builder clearAnnotation() {
-            annotation_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance();
+            annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
 
             bitField0_ = (bitField0_ & ~0x00000080);
             return this;
           }
 
-          // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
-          private java.util.List arrayElement_ =
+          // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+          private java.util.List arrayElement_ =
             java.util.Collections.emptyList();
           private void ensureArrayElementIsMutable() {
             if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-              arrayElement_ = new java.util.ArrayList(arrayElement_);
+              arrayElement_ = new java.util.ArrayList(arrayElement_);
               bitField0_ |= 0x00000100;
              }
           }
 
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public java.util.List getArrayElementList() {
+          public java.util.List getArrayElementList() {
             return java.util.Collections.unmodifiableList(arrayElement_);
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public int getArrayElementCount() {
             return arrayElement_.size();
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
+          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
             return arrayElement_.get(index);
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder setArrayElement(
-              int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value value) {
+              int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3317,19 +3317,19 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder setArrayElement(
-              int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             ensureArrayElementIsMutable();
             arrayElement_.set(index, builderForValue.build());
 
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
-          public Builder addArrayElement(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value value) {
+          public Builder addArrayElement(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3339,10 +3339,10 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value value) {
+              int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3352,37 +3352,37 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             ensureArrayElementIsMutable();
             arrayElement_.add(builderForValue.build());
 
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             ensureArrayElementIsMutable();
             arrayElement_.add(index, builderForValue.build());
 
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder addAllArrayElement(
-              java.lang.Iterable values) {
+              java.lang.Iterable values) {
             ensureArrayElementIsMutable();
             super.addAll(values, arrayElement_);
 
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder clearArrayElement() {
             arrayElement_ = java.util.Collections.emptyList();
@@ -3391,7 +3391,7 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
            */
           public Builder removeArrayElement(int index) {
             ensureArrayElementIsMutable();
@@ -3400,7 +3400,7 @@ public final class ProtoBuf {
             return this;
           }
 
-          // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value)
+          // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
         }
 
         static {
@@ -3408,7 +3408,7 @@ public final class ProtoBuf {
           defaultInstance.initFields();
         }
 
-        // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value)
+        // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
       }
 
       private int bitField0_;
@@ -3436,25 +3436,25 @@ public final class ProtoBuf {
         return nameId_;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+      // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
       public static final int VALUE_FIELD_NUMBER = 2;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value value_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value_;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value getValue() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getValue() {
         return value_;
       }
 
       private void initFields() {
         nameId_ = 0;
-        value_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+        value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -3513,53 +3513,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument 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.ProtoBuf.Annotation.Argument parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument 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.ProtoBuf.Annotation.Argument parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument 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.ProtoBuf.Annotation.Argument parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument 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.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -3568,19 +3568,19 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation.Argument}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument, Builder>
-          implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.ArgumentOrBuilder {
-        // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.newBuilder()
+            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument, Builder>
+          implements org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.ArgumentOrBuilder {
+        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -3595,7 +3595,7 @@ public final class ProtoBuf {
           super.clear();
           nameId_ = 0;
           bitField0_ = (bitField0_ & ~0x00000001);
-          value_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+          value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
@@ -3604,20 +3604,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument build() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument result = buildPartial();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument build() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument(this);
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument buildPartial() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument result = new org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3632,8 +3632,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument other) {
+          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.getDefaultInstance()) return this;
           if (other.hasNameId()) {
             setNameId(other.getNameId());
           }
@@ -3663,11 +3663,11 @@ public final class ProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument parsedMessage = null;
+          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -3727,24 +3727,24 @@ public final class ProtoBuf {
           return this;
         }
 
-        // required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+        // required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value getValue() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getValue() {
           return value_;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
-        public Builder setValue(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value value) {
+        public Builder setValue(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -3754,23 +3754,23 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
         public Builder setValue(
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
           value_ = builderForValue.build();
 
           bitField0_ |= 0x00000002;
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
-        public Builder mergeValue(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value value) {
+        public Builder mergeValue(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              value_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance()) {
+              value_ != org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance()) {
             value_ =
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.newBuilder(value_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.newBuilder(value_).mergeFrom(value).buildPartial();
           } else {
             value_ = value;
           }
@@ -3779,16 +3779,16 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
          */
         public Builder clearValue() {
-          value_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+          value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
 
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation.Argument)
       }
 
       static {
@@ -3796,7 +3796,7 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Annotation.Argument)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation.Argument)
     }
 
     private int bitField0_;
@@ -3824,38 +3824,38 @@ public final class ProtoBuf {
       return id_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+    // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
     public static final int ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List argument_;
+    private java.util.List argument_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    public java.util.List getArgumentList() {
+    public java.util.List getArgumentList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getArgumentOrBuilderList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
     public int getArgumentCount() {
       return argument_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument getArgument(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument getArgument(int index) {
       return argument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
         int index) {
       return argument_.get(index);
     }
@@ -3919,53 +3919,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation 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.ProtoBuf.Annotation parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation 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.ProtoBuf.Annotation parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation 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.ProtoBuf.Annotation parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation 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.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3974,19 +3974,19 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Annotation}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.AnnotationOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.newBuilder()
+          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation, Builder>
+        implements org.jetbrains.kotlin.serialization.ProtoBuf.AnnotationOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -4010,20 +4010,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation build() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation result = buildPartial();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation build() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation(this);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation buildPartial() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation result = new org.jetbrains.kotlin.serialization.ProtoBuf.Annotation(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4039,8 +4039,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation other) {
+        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -4075,11 +4075,11 @@ public final class ProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation parsedMessage = null;
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Annotation) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -4139,39 +4139,39 @@ public final class ProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
-      private java.util.List argument_ =
+      // repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+      private java.util.List argument_ =
         java.util.Collections.emptyList();
       private void ensureArgumentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          argument_ = new java.util.ArrayList(argument_);
+          argument_ = new java.util.ArrayList(argument_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public java.util.List getArgumentList() {
+      public java.util.List getArgumentList() {
         return java.util.Collections.unmodifiableList(argument_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public int getArgumentCount() {
         return argument_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument getArgument(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument getArgument(int index) {
         return argument_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4181,19 +4181,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
-      public Builder addArgument(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument value) {
+      public Builder addArgument(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4203,10 +4203,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4216,37 +4216,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder addAllArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureArgumentIsMutable();
         super.addAll(values, argument_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder clearArgument() {
         argument_ = java.util.Collections.emptyList();
@@ -4255,7 +4255,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
        */
       public Builder removeArgument(int index) {
         ensureArgumentIsMutable();
@@ -4264,7 +4264,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Annotation)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation)
     }
 
     static {
@@ -4272,34 +4272,34 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Annotation)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation)
   }
 
   public interface TypeOrBuilder
       extends com.google.protobuf.MessageLiteOrBuilder {
 
-    // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+    // required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
     boolean hasConstructor();
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor getConstructor();
+    org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor getConstructor();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+    // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getArgumentList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument getArgument(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument getArgument(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
     int getArgumentCount();
 
@@ -4335,9 +4335,9 @@ public final class ProtoBuf {
      */
     int getFlexibleTypeCapabilitiesId();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+    // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -4347,7 +4347,7 @@ public final class ProtoBuf {
      */
     boolean hasFlexibleUpperBound();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -4355,10 +4355,10 @@ public final class ProtoBuf {
      * to represent flexible types is too many wasted bytes.
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getFlexibleUpperBound();
+    org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
    */
   public static final class Type extends
       com.google.protobuf.GeneratedMessageLite
@@ -4401,11 +4401,11 @@ public final class ProtoBuf {
               break;
             }
             case 10: {
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = constructor_.toBuilder();
               }
-              constructor_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.PARSER, extensionRegistry);
+              constructor_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(constructor_);
                 constructor_ = subBuilder.buildPartial();
@@ -4415,10 +4415,10 @@ public final class ProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                argument_ = new java.util.ArrayList();
+                argument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              argument_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.PARSER, extensionRegistry));
+              argument_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.PARSER, extensionRegistry));
               break;
             }
             case 24: {
@@ -4432,11 +4432,11 @@ public final class ProtoBuf {
               break;
             }
             case 42: {
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = flexibleUpperBound_.toBuilder();
               }
-              flexibleUpperBound_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              flexibleUpperBound_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(flexibleUpperBound_);
                 flexibleUpperBound_ = subBuilder.buildPartial();
@@ -4476,15 +4476,15 @@ public final class ProtoBuf {
     public interface ConstructorOrBuilder
         extends com.google.protobuf.MessageLiteOrBuilder {
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+      // optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+       * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
        */
       boolean hasKind();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+       * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind getKind();
+      org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind getKind();
 
       // required int32 id = 2;
       /**
@@ -4505,7 +4505,7 @@ public final class ProtoBuf {
       int getId();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Constructor}
      */
     public static final class Constructor extends
         com.google.protobuf.GeneratedMessageLite
@@ -4549,7 +4549,7 @@ public final class ProtoBuf {
               }
               case 8: {
                 int rawValue = input.readEnum();
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind value = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind.valueOf(rawValue);
+                org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind value = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind.valueOf(rawValue);
                 if (value != null) {
                   bitField0_ |= 0x00000001;
                   kind_ = value;
@@ -4588,7 +4588,7 @@ public final class ProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind}
+       * Protobuf enum {@code org.jetbrains.kotlin.serialization.Type.Constructor.Kind}
        */
       public enum Kind
           implements com.google.protobuf.Internal.EnumLite {
@@ -4640,23 +4640,23 @@ public final class ProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Type.Constructor.Kind)
       }
 
       private int bitField0_;
-      // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+      // optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
       public static final int KIND_FIELD_NUMBER = 1;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind kind_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind kind_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+       * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+       * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind getKind() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind getKind() {
         return kind_;
       }
 
@@ -4685,7 +4685,7 @@ public final class ProtoBuf {
       }
 
       private void initFields() {
-        kind_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind.CLASS;
+        kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind.CLASS;
         id_ = 0;
       }
       private byte memoizedIsInitialized = -1;
@@ -4737,53 +4737,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor 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.ProtoBuf.Type.Constructor parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor 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.ProtoBuf.Type.Constructor parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor 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.ProtoBuf.Type.Constructor parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor 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.ProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -4792,19 +4792,19 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Constructor}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor, Builder>
-          implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.ConstructorOrBuilder {
-        // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.newBuilder()
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor, Builder>
+          implements org.jetbrains.kotlin.serialization.ProtoBuf.Type.ConstructorOrBuilder {
+        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -4817,7 +4817,7 @@ public final class ProtoBuf {
 
         public Builder clear() {
           super.clear();
-          kind_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind.CLASS;
+          kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind.CLASS;
           bitField0_ = (bitField0_ & ~0x00000001);
           id_ = 0;
           bitField0_ = (bitField0_ & ~0x00000002);
@@ -4828,20 +4828,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor build() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor result = buildPartial();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor build() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor(this);
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor buildPartial() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor result = new org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4856,8 +4856,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor other) {
+          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.getDefaultInstance()) return this;
           if (other.hasKind()) {
             setKind(other.getKind());
           }
@@ -4879,11 +4879,11 @@ public final class ProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor parsedMessage = null;
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -4894,24 +4894,24 @@ public final class ProtoBuf {
         }
         private int bitField0_;
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind kind_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind.CLASS;
+        // optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind.CLASS;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+         * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
          */
         public boolean hasKind() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+         * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind getKind() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind getKind() {
           return kind_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+         * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
          */
-        public Builder setKind(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind value) {
+        public Builder setKind(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -4921,11 +4921,11 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
+         * optional .org.jetbrains.kotlin.serialization.Type.Constructor.Kind kind = 1 [default = CLASS];
          */
         public Builder clearKind() {
           bitField0_ = (bitField0_ & ~0x00000001);
-          kind_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Kind.CLASS;
+          kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Kind.CLASS;
           
           return this;
         }
@@ -4979,7 +4979,7 @@ public final class ProtoBuf {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type.Constructor)
       }
 
       static {
@@ -4987,34 +4987,34 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type.Constructor)
     }
 
     public interface ArgumentOrBuilder
         extends com.google.protobuf.MessageLiteOrBuilder {
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+      // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
        */
       boolean hasProjection();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection getProjection();
+      org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection getProjection();
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+      // required .org.jetbrains.kotlin.serialization.Type type = 2;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
       boolean hasType();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getType();
+      org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Argument}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
      */
     public static final class Argument extends
         com.google.protobuf.GeneratedMessageLite
@@ -5058,7 +5058,7 @@ public final class ProtoBuf {
               }
               case 8: {
                 int rawValue = input.readEnum();
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection value = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection.valueOf(rawValue);
+                org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection value = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.valueOf(rawValue);
                 if (value != null) {
                   bitField0_ |= 0x00000001;
                   projection_ = value;
@@ -5066,11 +5066,11 @@ public final class ProtoBuf {
                 break;
               }
               case 18: {
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) == 0x00000002)) {
                   subBuilder = type_.toBuilder();
                 }
-                type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+                type_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(type_);
                   type_ = subBuilder.buildPartial();
@@ -5105,7 +5105,7 @@ public final class ProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection}
+       * Protobuf enum {@code org.jetbrains.kotlin.serialization.Type.Argument.Projection}
        */
       public enum Projection
           implements com.google.protobuf.Internal.EnumLite {
@@ -5166,45 +5166,45 @@ public final class ProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Type.Argument.Projection)
       }
 
       private int bitField0_;
-      // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+      // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
       public static final int PROJECTION_FIELD_NUMBER = 1;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection projection_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection projection_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
        */
       public boolean hasProjection() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection getProjection() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection getProjection() {
         return projection_;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+      // required .org.jetbrains.kotlin.serialization.Type type = 2;
       public static final int TYPE_FIELD_NUMBER = 2;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type type_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+       * required .org.jetbrains.kotlin.serialization.Type type = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getType() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
         return type_;
       }
 
       private void initFields() {
-        projection_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection.INV;
-        type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
+        type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -5259,53 +5259,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument 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.ProtoBuf.Type.Argument parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument 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.ProtoBuf.Type.Argument parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument 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.ProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument 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.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -5314,19 +5314,19 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Argument}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument, Builder>
-          implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.ArgumentOrBuilder {
-        // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.newBuilder()
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument, Builder>
+          implements org.jetbrains.kotlin.serialization.ProtoBuf.Type.ArgumentOrBuilder {
+        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -5339,9 +5339,9 @@ public final class ProtoBuf {
 
         public Builder clear() {
           super.clear();
-          projection_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection.INV;
+          projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
           bitField0_ = (bitField0_ & ~0x00000001);
-          type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
@@ -5350,20 +5350,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument build() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument result = buildPartial();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument build() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument(this);
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument buildPartial() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument result = new org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5378,8 +5378,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument other) {
+          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.getDefaultInstance()) return this;
           if (other.hasProjection()) {
             setProjection(other.getProjection());
           }
@@ -5405,11 +5405,11 @@ public final class ProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument parsedMessage = null;
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -5420,24 +5420,24 @@ public final class ProtoBuf {
         }
         private int bitField0_;
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection.INV;
+        // optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
          */
         public boolean hasProjection() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection getProjection() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection getProjection() {
           return projection_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
          */
-        public Builder setProjection(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection value) {
+        public Builder setProjection(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -5447,33 +5447,33 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
          */
         public Builder clearProjection() {
           bitField0_ = (bitField0_ & ~0x00000001);
-          projection_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection.INV;
+          projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
           
           return this;
         }
 
-        // required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        // required .org.jetbrains.kotlin.serialization.Type type = 2;
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
         public boolean hasType() {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getType() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
           return type_;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
-        public Builder setType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+        public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -5483,23 +5483,23 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
         public Builder setType(
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
           type_ = builderForValue.build();
 
           bitField0_ |= 0x00000002;
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
-        public Builder mergeType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+        public Builder mergeType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              type_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance()) {
+              type_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
             type_ =
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
           } else {
             type_ = value;
           }
@@ -5508,16 +5508,16 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 2;
+         * required .org.jetbrains.kotlin.serialization.Type type = 2;
          */
         public Builder clearType() {
-          type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
 
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type.Argument)
       }
 
       static {
@@ -5525,58 +5525,58 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type.Argument)
     }
 
     private int bitField0_;
-    // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+    // required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
     public static final int CONSTRUCTOR_FIELD_NUMBER = 1;
-    private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor constructor_;
+    private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor constructor_;
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
     public boolean hasConstructor() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+     * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor getConstructor() {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor getConstructor() {
       return constructor_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+    // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
     public static final int ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List argument_;
+    private java.util.List argument_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    public java.util.List getArgumentList() {
+    public java.util.List getArgumentList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getArgumentOrBuilderList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
     public int getArgumentCount() {
       return argument_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument getArgument(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument getArgument(int index) {
       return argument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
         int index) {
       return argument_.get(index);
     }
@@ -5625,11 +5625,11 @@ public final class ProtoBuf {
       return flexibleTypeCapabilitiesId_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+    // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
     public static final int FLEXIBLE_UPPER_BOUND_FIELD_NUMBER = 5;
-    private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type flexibleUpperBound_;
+    private org.jetbrains.kotlin.serialization.ProtoBuf.Type flexibleUpperBound_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -5641,7 +5641,7 @@ public final class ProtoBuf {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
      *
      * 
      * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -5649,16 +5649,16 @@ public final class ProtoBuf {
      * to represent flexible types is too many wasted bytes.
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getFlexibleUpperBound() {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound() {
       return flexibleUpperBound_;
     }
 
     private void initFields() {
-      constructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
+      constructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
       argument_ = java.util.Collections.emptyList();
       nullable_ = false;
       flexibleTypeCapabilitiesId_ = 0;
-      flexibleUpperBound_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+      flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -5746,53 +5746,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type 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.ProtoBuf.Type parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type 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.ProtoBuf.Type parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type 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.ProtoBuf.Type parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type 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.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5801,19 +5801,19 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Type prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.newBuilder()
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type, Builder>
+        implements org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5826,7 +5826,7 @@ public final class ProtoBuf {
 
       public Builder clear() {
         super.clear();
-        constructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
+        constructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
         argument_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -5834,7 +5834,7 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000004);
         flexibleTypeCapabilitiesId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
-        flexibleUpperBound_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
@@ -5843,20 +5843,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type build() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type result = buildPartial();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type build() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Type result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type(this);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type buildPartial() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Type result = new org.jetbrains.kotlin.serialization.ProtoBuf.Type(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5884,8 +5884,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Type other) {
+        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) return this;
         if (other.hasConstructor()) {
           mergeConstructor(other.getConstructor());
         }
@@ -5939,11 +5939,11 @@ public final class ProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type parsedMessage = null;
+        org.jetbrains.kotlin.serialization.ProtoBuf.Type parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Type) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -5954,24 +5954,24 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor constructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
+      // required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor constructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
       public boolean hasConstructor() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor getConstructor() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor getConstructor() {
         return constructor_;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
-      public Builder setConstructor(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor value) {
+      public Builder setConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -5981,23 +5981,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
       public Builder setConstructor(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.Builder builderForValue) {
         constructor_ = builderForValue.build();
 
         bitField0_ |= 0x00000001;
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
-      public Builder mergeConstructor(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor value) {
+      public Builder mergeConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor value) {
         if (((bitField0_ & 0x00000001) == 0x00000001) &&
-            constructor_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.getDefaultInstance()) {
+            constructor_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.getDefaultInstance()) {
           constructor_ =
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.newBuilder(constructor_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.newBuilder(constructor_).mergeFrom(value).buildPartial();
         } else {
           constructor_ = value;
         }
@@ -6006,48 +6006,48 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1;
+       * required .org.jetbrains.kotlin.serialization.Type.Constructor constructor = 1;
        */
       public Builder clearConstructor() {
-        constructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
+        constructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
-      private java.util.List argument_ =
+      // repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+      private java.util.List argument_ =
         java.util.Collections.emptyList();
       private void ensureArgumentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          argument_ = new java.util.ArrayList(argument_);
+          argument_ = new java.util.ArrayList(argument_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public java.util.List getArgumentList() {
+      public java.util.List getArgumentList() {
         return java.util.Collections.unmodifiableList(argument_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public int getArgumentCount() {
         return argument_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument getArgument(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument getArgument(int index) {
         return argument_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6057,19 +6057,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
-      public Builder addArgument(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument value) {
+      public Builder addArgument(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6079,10 +6079,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6092,37 +6092,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder addAllArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureArgumentIsMutable();
         super.addAll(values, argument_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder clearArgument() {
         argument_ = java.util.Collections.emptyList();
@@ -6131,7 +6131,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
        */
       public Builder removeArgument(int index) {
         ensureArgumentIsMutable();
@@ -6230,10 +6230,10 @@ public final class ProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type flexibleUpperBound_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -6245,7 +6245,7 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -6253,11 +6253,11 @@ public final class ProtoBuf {
        * to represent flexible types is too many wasted bytes.
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getFlexibleUpperBound() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound() {
         return flexibleUpperBound_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -6265,7 +6265,7 @@ public final class ProtoBuf {
        * to represent flexible types is too many wasted bytes.
        * 

        */
-      public Builder setFlexibleUpperBound(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+      public Builder setFlexibleUpperBound(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6275,7 +6275,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -6284,14 +6284,14 @@ public final class ProtoBuf {
        * 

        */
       public Builder setFlexibleUpperBound(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         flexibleUpperBound_ = builderForValue.build();
 
         bitField0_ |= 0x00000010;
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -6299,11 +6299,11 @@ public final class ProtoBuf {
        * to represent flexible types is too many wasted bytes.
        * 

        */
-      public Builder mergeFlexibleUpperBound(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+      public Builder mergeFlexibleUpperBound(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000010) == 0x00000010) &&
-            flexibleUpperBound_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            flexibleUpperBound_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
           flexibleUpperBound_ =
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.newBuilder(flexibleUpperBound_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(flexibleUpperBound_).mergeFrom(value).buildPartial();
         } else {
           flexibleUpperBound_ = value;
         }
@@ -6312,7 +6312,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
        *
        * 
        * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
@@ -6321,13 +6321,13 @@ public final class ProtoBuf {
        * 

        */
       public Builder clearFlexibleUpperBound() {
-        flexibleUpperBound_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type)
     }
 
     static {
@@ -6335,7 +6335,7 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type)
   }
 
   public interface TypeParameterOrBuilder
@@ -6379,33 +6379,33 @@ public final class ProtoBuf {
      */
     boolean getReified();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+    // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
      */
     boolean hasVariance();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance getVariance();
+    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance getVariance();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+    // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    java.util.List 
+    java.util.List 
         getUpperBoundList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getUpperBound(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.Type getUpperBound(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
     int getUpperBoundCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.TypeParameter}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
    */
   public static final class TypeParameter extends
       com.google.protobuf.GeneratedMessageLite
@@ -6464,7 +6464,7 @@ public final class ProtoBuf {
             }
             case 32: {
               int rawValue = input.readEnum();
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance value = org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance.valueOf(rawValue);
+              org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance value = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.valueOf(rawValue);
               if (value != null) {
                 bitField0_ |= 0x00000008;
                 variance_ = value;
@@ -6473,10 +6473,10 @@ public final class ProtoBuf {
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                upperBound_ = new java.util.ArrayList();
+                upperBound_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              upperBound_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
+              upperBound_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
           }
@@ -6509,7 +6509,7 @@ public final class ProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.TypeParameter.Variance}
      */
     public enum Variance
         implements com.google.protobuf.Internal.EnumLite {
@@ -6570,7 +6570,7 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.TypeParameter.Variance)
     }
 
     private int bitField0_;
@@ -6630,54 +6630,54 @@ public final class ProtoBuf {
       return reified_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+    // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
     public static final int VARIANCE_FIELD_NUMBER = 4;
-    private org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance variance_;
+    private org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance variance_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
      */
     public boolean hasVariance() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance getVariance() {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance getVariance() {
       return variance_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+    // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
     public static final int UPPER_BOUND_FIELD_NUMBER = 5;
-    private java.util.List upperBound_;
+    private java.util.List upperBound_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    public java.util.List getUpperBoundList() {
+    public java.util.List getUpperBoundList() {
       return upperBound_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getUpperBoundOrBuilderList() {
       return upperBound_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
     public int getUpperBoundCount() {
       return upperBound_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getUpperBound(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getUpperBound(int index) {
       return upperBound_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
         int index) {
       return upperBound_.get(index);
     }
@@ -6686,7 +6686,7 @@ public final class ProtoBuf {
       id_ = 0;
       name_ = 0;
       reified_ = false;
-      variance_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance.INV;
+      variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
       upperBound_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -6769,53 +6769,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter 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.ProtoBuf.TypeParameter parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter 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.ProtoBuf.TypeParameter parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter 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.ProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter 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.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -6824,19 +6824,19 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.TypeParameter}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter, Builder>
-        implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameterOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.newBuilder()
+          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter, Builder>
+        implements org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -6855,7 +6855,7 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         reified_ = false;
         bitField0_ = (bitField0_ & ~0x00000004);
-        variance_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance.INV;
+        variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
         bitField0_ = (bitField0_ & ~0x00000008);
         upperBound_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -6866,20 +6866,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter build() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter result = buildPartial();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter build() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter(this);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter buildPartial() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter result = new org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6907,8 +6907,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter other) {
+        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -6956,11 +6956,11 @@ public final class ProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter parsedMessage = null;
+        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -7086,24 +7086,24 @@ public final class ProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance.INV;
+      // optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+      private org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
        */
       public boolean hasVariance() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance getVariance() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance getVariance() {
         return variance_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
        */
-      public Builder setVariance(org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance value) {
+      public Builder setVariance(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7113,48 +7113,48 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
        */
       public Builder clearVariance() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        variance_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance.INV;
+        variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
         
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
-      private java.util.List upperBound_ =
+      // repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+      private java.util.List upperBound_ =
         java.util.Collections.emptyList();
       private void ensureUpperBoundIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          upperBound_ = new java.util.ArrayList(upperBound_);
+          upperBound_ = new java.util.ArrayList(upperBound_);
           bitField0_ |= 0x00000010;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public java.util.List getUpperBoundList() {
+      public java.util.List getUpperBoundList() {
         return java.util.Collections.unmodifiableList(upperBound_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public int getUpperBoundCount() {
         return upperBound_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getUpperBound(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getUpperBound(int index) {
         return upperBound_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder setUpperBound(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7164,19 +7164,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder setUpperBound(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         ensureUpperBoundIsMutable();
         upperBound_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
-      public Builder addUpperBound(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+      public Builder addUpperBound(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7186,10 +7186,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7199,37 +7199,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         ensureUpperBoundIsMutable();
         upperBound_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         ensureUpperBoundIsMutable();
         upperBound_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder addAllUpperBound(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureUpperBoundIsMutable();
         super.addAll(values, upperBound_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder clearUpperBound() {
         upperBound_ = java.util.Collections.emptyList();
@@ -7238,7 +7238,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
        */
       public Builder removeUpperBound(int index) {
         ensureUpperBoundIsMutable();
@@ -7247,7 +7247,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeParameter)
     }
 
     static {
@@ -7255,7 +7255,7 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeParameter)
   }
 
   public interface ClassOrBuilder extends 
@@ -7327,9 +7327,9 @@ public final class ProtoBuf {
      */
     int getFqName();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+    // optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
@@ -7337,41 +7337,41 @@ public final class ProtoBuf {
      */
     boolean hasClassObject();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject getClassObject();
+    org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject getClassObject();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
     int getTypeParameterCount();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+    // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    java.util.List 
+    java.util.List 
         getSupertypeList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getSupertype(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.Type getSupertype(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
     int getSupertypeCount();
 
@@ -7404,18 +7404,18 @@ public final class ProtoBuf {
      */
     int getNestedClassName(int index);
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+    // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    java.util.List 
+    java.util.List 
         getMemberList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getMember(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
     int getMemberCount();
 
@@ -7433,9 +7433,9 @@ public final class ProtoBuf {
      */
     int getEnumEntry(int index);
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+    // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
@@ -7443,22 +7443,22 @@ public final class ProtoBuf {
      */
     boolean hasPrimaryConstructor();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor();
+    org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
    */
   public static final class Class extends
       com.google.protobuf.GeneratedMessageLite.ExtendableMessage<
         Class> implements ClassOrBuilder {
     // Use Class.newBuilder() to construct.
-    private Class(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Class(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
 
     }
@@ -7510,11 +7510,11 @@ public final class ProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = classObject_.toBuilder();
               }
-              classObject_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.PARSER, extensionRegistry);
+              classObject_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(classObject_);
                 classObject_ = subBuilder.buildPartial();
@@ -7524,18 +7524,18 @@ public final class ProtoBuf {
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                supertype_ = new java.util.ArrayList();
+                supertype_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              supertype_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
+              supertype_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
             case 56: {
@@ -7561,10 +7561,10 @@ public final class ProtoBuf {
             }
             case 90: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                member_ = new java.util.ArrayList();
+                member_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
+              member_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
               break;
             }
             case 96: {
@@ -7589,11 +7589,11 @@ public final class ProtoBuf {
               break;
             }
             case 106: {
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = primaryConstructor_.toBuilder();
               }
-              primaryConstructor_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry);
+              primaryConstructor_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(primaryConstructor_);
                 primaryConstructor_ = subBuilder.buildPartial();
@@ -7643,7 +7643,7 @@ public final class ProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Class.Kind}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Class.Kind}
      */
     public enum Kind
         implements com.google.protobuf.Internal.EnumLite {
@@ -7748,15 +7748,15 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Class.Kind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Class.Kind)
     }
 
     public interface ClassObjectOrBuilder
         extends com.google.protobuf.MessageLiteOrBuilder {
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+      // optional .org.jetbrains.kotlin.serialization.Class data = 1;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -7765,17 +7765,17 @@ public final class ProtoBuf {
        */
       boolean hasData();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
        * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
        * 

        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class getData();
+      org.jetbrains.kotlin.serialization.ProtoBuf.Class getData();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.ClassObject}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.ClassObject}
      */
     public static final class ClassObject extends
         com.google.protobuf.GeneratedMessageLite
@@ -7818,11 +7818,11 @@ public final class ProtoBuf {
                 break;
               }
               case 10: {
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) == 0x00000001)) {
                   subBuilder = data_.toBuilder();
                 }
-                data_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PARSER, extensionRegistry);
+                data_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(data_);
                   data_ = subBuilder.buildPartial();
@@ -7857,11 +7857,11 @@ public final class ProtoBuf {
       }
 
       private int bitField0_;
-      // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+      // optional .org.jetbrains.kotlin.serialization.Class data = 1;
       public static final int DATA_FIELD_NUMBER = 1;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class data_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Class data_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -7872,19 +7872,19 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Class data = 1;
        *
        * 
        * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
        * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class getData() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Class getData() {
         return data_;
       }
 
       private void initFields() {
-        data_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance();
+        data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -7930,53 +7930,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject 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.ProtoBuf.Class.ClassObject parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject 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.ProtoBuf.Class.ClassObject parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject 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.ProtoBuf.Class.ClassObject parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject 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.ProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -7985,19 +7985,19 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.ClassObject}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.ClassObject}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject, Builder>
-          implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObjectOrBuilder {
-        // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.newBuilder()
+            org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject, Builder>
+          implements org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObjectOrBuilder {
+        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -8010,7 +8010,7 @@ public final class ProtoBuf {
 
         public Builder clear() {
           super.clear();
-          data_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance();
+          data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance();
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
         }
@@ -8019,20 +8019,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject build() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject result = buildPartial();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject build() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject(this);
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject buildPartial() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject result = new org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -8043,8 +8043,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject other) {
+          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance()) return this;
           if (other.hasData()) {
             mergeData(other.getData());
           }
@@ -8065,11 +8065,11 @@ public final class ProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject parsedMessage = null;
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -8080,10 +8080,10 @@ public final class ProtoBuf {
         }
         private int bitField0_;
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class data_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance();
+        // optional .org.jetbrains.kotlin.serialization.Class data = 1;
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Class data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance();
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -8094,25 +8094,25 @@ public final class ProtoBuf {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
          * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class getData() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Class getData() {
           return data_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
          * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
          * 

          */
-        public Builder setData(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class value) {
+        public Builder setData(org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -8122,7 +8122,7 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -8130,25 +8130,25 @@ public final class ProtoBuf {
          * 

          */
         public Builder setData(
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
           data_ = builderForValue.build();
 
           bitField0_ |= 0x00000001;
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
          * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
          * 

          */
-        public Builder mergeData(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class value) {
+        public Builder mergeData(org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              data_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance()) {
+              data_ != org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance()) {
             data_ =
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.newBuilder(data_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.ProtoBuf.Class.newBuilder(data_).mergeFrom(value).buildPartial();
           } else {
             data_ = value;
           }
@@ -8157,7 +8157,7 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Class data = 1;
          *
          * 
          * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
@@ -8165,13 +8165,13 @@ public final class ProtoBuf {
          * 

          */
         public Builder clearData() {
-          data_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance();
+          data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance();
 
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class.ClassObject)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class.ClassObject)
       }
 
       static {
@@ -8179,15 +8179,15 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class.ClassObject)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class.ClassObject)
     }
 
     public interface PrimaryConstructorOrBuilder
         extends com.google.protobuf.MessageLiteOrBuilder {
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+      // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
@@ -8196,17 +8196,17 @@ public final class ProtoBuf {
        */
       boolean hasData();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
        * Otherwise it's default and can be created manually upon deserialization
        * 

        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getData();
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable getData();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.PrimaryConstructor}
      */
     public static final class PrimaryConstructor extends
         com.google.protobuf.GeneratedMessageLite
@@ -8249,11 +8249,11 @@ public final class ProtoBuf {
                 break;
               }
               case 10: {
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000001) == 0x00000001)) {
                   subBuilder = data_.toBuilder();
                 }
-                data_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.PARSER, extensionRegistry);
+                data_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(data_);
                   data_ = subBuilder.buildPartial();
@@ -8288,11 +8288,11 @@ public final class ProtoBuf {
       }
 
       private int bitField0_;
-      // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+      // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
       public static final int DATA_FIELD_NUMBER = 1;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable data_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Callable data_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
@@ -8303,19 +8303,19 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+       * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
        *
        * 
        * If this field is present, it contains serialized data for the primary constructor.
        * Otherwise it's default and can be created manually upon deserialization
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getData() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getData() {
         return data_;
       }
 
       private void initFields() {
-        data_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance();
+        data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -8361,53 +8361,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor 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.ProtoBuf.Class.PrimaryConstructor parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor 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.ProtoBuf.Class.PrimaryConstructor parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor 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.ProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor 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.ProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -8416,19 +8416,19 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Class.PrimaryConstructor}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor, Builder>
-          implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructorOrBuilder {
-        // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.newBuilder()
+            org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor, Builder>
+          implements org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructorOrBuilder {
+        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -8441,7 +8441,7 @@ public final class ProtoBuf {
 
         public Builder clear() {
           super.clear();
-          data_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance();
+          data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
         }
@@ -8450,20 +8450,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor build() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor result = buildPartial();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor build() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor(this);
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor buildPartial() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor result = new org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -8474,8 +8474,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor other) {
+          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) return this;
           if (other.hasData()) {
             mergeData(other.getData());
           }
@@ -8496,11 +8496,11 @@ public final class ProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor parsedMessage = null;
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -8511,10 +8511,10 @@ public final class ProtoBuf {
         }
         private int bitField0_;
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable data_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance();
+        // optional .org.jetbrains.kotlin.serialization.Callable data = 1;
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Callable data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
@@ -8525,25 +8525,25 @@ public final class ProtoBuf {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
          * Otherwise it's default and can be created manually upon deserialization
          * 

          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getData() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getData() {
           return data_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
          * Otherwise it's default and can be created manually upon deserialization
          * 

          */
-        public Builder setData(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable value) {
+        public Builder setData(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -8553,7 +8553,7 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
@@ -8561,25 +8561,25 @@ public final class ProtoBuf {
          * 

          */
         public Builder setData(
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
           data_ = builderForValue.build();
 
           bitField0_ |= 0x00000001;
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
          * Otherwise it's default and can be created manually upon deserialization
          * 

          */
-        public Builder mergeData(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable value) {
+        public Builder mergeData(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              data_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance()) {
+              data_ != org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance()) {
             data_ =
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.newBuilder(data_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.ProtoBuf.Callable.newBuilder(data_).mergeFrom(value).buildPartial();
           } else {
             data_ = value;
           }
@@ -8588,7 +8588,7 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1;
+         * optional .org.jetbrains.kotlin.serialization.Callable data = 1;
          *
          * 
          * If this field is present, it contains serialized data for the primary constructor.
@@ -8596,13 +8596,13 @@ public final class ProtoBuf {
          * 

          */
         public Builder clearData() {
-          data_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance();
+          data_ = org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
 
           bitField0_ = (bitField0_ & ~0x00000001);
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class.PrimaryConstructor)
       }
 
       static {
@@ -8610,7 +8610,7 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class.PrimaryConstructor)
     }
 
     private int bitField0_;
@@ -8719,11 +8719,11 @@ public final class ProtoBuf {
       return fqName_;
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+    // optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
     public static final int CLASS_OBJECT_FIELD_NUMBER = 4;
-    private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject classObject_;
+    private org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject classObject_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
@@ -8733,84 +8733,84 @@ public final class ProtoBuf {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+     * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
      *
      * 
      * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject getClassObject() {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject getClassObject() {
       return classObject_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 5;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+    // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
     public static final int SUPERTYPE_FIELD_NUMBER = 6;
-    private java.util.List supertype_;
+    private java.util.List supertype_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    public java.util.List getSupertypeList() {
+    public java.util.List getSupertypeList() {
       return supertype_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getSupertypeOrBuilderList() {
       return supertype_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
     public int getSupertypeCount() {
       return supertype_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getSupertype(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getSupertype(int index) {
       return supertype_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
         int index) {
       return supertype_.get(index);
     }
@@ -8853,38 +8853,38 @@ public final class ProtoBuf {
       return nestedClassName_.get(index);
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+    // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
     public static final int MEMBER_FIELD_NUMBER = 11;
-    private java.util.List member_;
+    private java.util.List member_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    public java.util.List getMemberList() {
+    public java.util.List getMemberList() {
       return member_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    public java.util.List 
+    public java.util.List 
         getMemberOrBuilderList() {
       return member_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
     public int getMemberCount() {
       return member_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getMember(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index) {
       return member_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.CallableOrBuilder getMemberOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder getMemberOrBuilder(
         int index) {
       return member_.get(index);
     }
@@ -8912,11 +8912,11 @@ public final class ProtoBuf {
       return enumEntry_.get(index);
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+    // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
     public static final int PRIMARY_CONSTRUCTOR_FIELD_NUMBER = 13;
-    private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor primaryConstructor_;
+    private org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor primaryConstructor_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
@@ -8926,13 +8926,13 @@ public final class ProtoBuf {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+     * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
      *
      * 
      * This field is present if and only if the class has a primary constructor
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
       return primaryConstructor_;
     }
 
@@ -8940,13 +8940,13 @@ public final class ProtoBuf {
       flags_ = 0;
       extraVisibility_ = "";
       fqName_ = 0;
-      classObject_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
+      classObject_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
       typeParameter_ = java.util.Collections.emptyList();
       supertype_ = java.util.Collections.emptyList();
       nestedClassName_ = java.util.Collections.emptyList();
       member_ = java.util.Collections.emptyList();
       enumEntry_ = java.util.Collections.emptyList();
-      primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+      primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -8999,7 +8999,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       com.google.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -9102,53 +9102,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class 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.ProtoBuf.Class parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class 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.ProtoBuf.Class parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class 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.ProtoBuf.Class parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class 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.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -9157,18 +9157,18 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Class prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class, Builder> implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.ClassOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.newBuilder()
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Class.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -9187,7 +9187,7 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         fqName_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
-        classObject_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
+        classObject_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         typeParameter_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -9199,7 +9199,7 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000080);
         enumEntry_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000100);
-        primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+        primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
@@ -9208,20 +9208,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Class getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class build() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class result = buildPartial();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Class build() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Class result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class(this);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Class buildPartial() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Class result = new org.jetbrains.kotlin.serialization.ProtoBuf.Class(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -9273,8 +9273,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Class other) {
+        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -9392,11 +9392,11 @@ public final class ProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class parsedMessage = null;
+        org.jetbrains.kotlin.serialization.ProtoBuf.Class parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Class) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -9607,10 +9607,10 @@ public final class ProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject classObject_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject classObject_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
@@ -9620,23 +9620,23 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject getClassObject() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject getClassObject() {
         return classObject_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
-      public Builder setClassObject(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject value) {
+      public Builder setClassObject(org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9646,31 +9646,31 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
       public Builder setClassObject(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.Builder builderForValue) {
         classObject_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
-      public Builder mergeClassObject(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject value) {
+      public Builder mergeClassObject(org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            classObject_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance()) {
+            classObject_ != org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance()) {
           classObject_ =
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.newBuilder(classObject_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.newBuilder(classObject_).mergeFrom(value).buildPartial();
         } else {
           classObject_ = value;
         }
@@ -9679,52 +9679,52 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4;
+       * optional .org.jetbrains.kotlin.serialization.Class.ClassObject class_object = 4;
        *
        * 
        * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
        * 

        */
       public Builder clearClassObject() {
-        classObject_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
+        classObject_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.ClassObject.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
-      private java.util.List typeParameter_ =
+      // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000010;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         return java.util.Collections.unmodifiableList(typeParameter_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public int getTypeParameterCount() {
         return typeParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
         return typeParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9734,19 +9734,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
-      public Builder addTypeParameter(org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9756,10 +9756,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9769,37 +9769,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeParameterIsMutable();
         super.addAll(values, typeParameter_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder clearTypeParameter() {
         typeParameter_ = java.util.Collections.emptyList();
@@ -9808,7 +9808,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
        */
       public Builder removeTypeParameter(int index) {
         ensureTypeParameterIsMutable();
@@ -9817,39 +9817,39 @@ public final class ProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
-      private java.util.List supertype_ =
+      // repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+      private java.util.List supertype_ =
         java.util.Collections.emptyList();
       private void ensureSupertypeIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          supertype_ = new java.util.ArrayList(supertype_);
+          supertype_ = new java.util.ArrayList(supertype_);
           bitField0_ |= 0x00000020;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public java.util.List getSupertypeList() {
+      public java.util.List getSupertypeList() {
         return java.util.Collections.unmodifiableList(supertype_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public int getSupertypeCount() {
         return supertype_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getSupertype(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getSupertype(int index) {
         return supertype_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder setSupertype(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9859,19 +9859,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder setSupertype(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         ensureSupertypeIsMutable();
         supertype_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
-      public Builder addSupertype(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+      public Builder addSupertype(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9881,10 +9881,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder addSupertype(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9894,37 +9894,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder addSupertype(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         ensureSupertypeIsMutable();
         supertype_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder addSupertype(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         ensureSupertypeIsMutable();
         supertype_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder addAllSupertype(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureSupertypeIsMutable();
         super.addAll(values, supertype_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder clearSupertype() {
         supertype_ = java.util.Collections.emptyList();
@@ -9933,7 +9933,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
        */
       public Builder removeSupertype(int index) {
         ensureSupertypeIsMutable();
@@ -10043,39 +10043,39 @@ public final class ProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
-      private java.util.List member_ =
+      // repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
+      private java.util.List member_ =
         java.util.Collections.emptyList();
       private void ensureMemberIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          member_ = new java.util.ArrayList(member_);
+          member_ = new java.util.ArrayList(member_);
           bitField0_ |= 0x00000080;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public java.util.List getMemberList() {
+      public java.util.List getMemberList() {
         return java.util.Collections.unmodifiableList(member_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public int getMemberCount() {
         return member_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getMember(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index) {
         return member_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder setMember(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10085,19 +10085,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder setMember(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
         ensureMemberIsMutable();
         member_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
-      public Builder addMember(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable value) {
+      public Builder addMember(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10107,10 +10107,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder addMember(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10120,37 +10120,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder addMember(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
         ensureMemberIsMutable();
         member_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder addMember(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
         ensureMemberIsMutable();
         member_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder addAllMember(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureMemberIsMutable();
         super.addAll(values, member_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder clearMember() {
         member_ = java.util.Collections.emptyList();
@@ -10159,7 +10159,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 11;
        */
       public Builder removeMember(int index) {
         ensureMemberIsMutable();
@@ -10234,10 +10234,10 @@ public final class ProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
@@ -10247,23 +10247,23 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() {
         return primaryConstructor_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
-      public Builder setPrimaryConstructor(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor value) {
+      public Builder setPrimaryConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10273,31 +10273,31 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
       public Builder setPrimaryConstructor(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.Builder builderForValue) {
         primaryConstructor_ = builderForValue.build();
 
         bitField0_ |= 0x00000200;
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
-      public Builder mergePrimaryConstructor(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor value) {
+      public Builder mergePrimaryConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor value) {
         if (((bitField0_ & 0x00000200) == 0x00000200) &&
-            primaryConstructor_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
+            primaryConstructor_ != org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) {
           primaryConstructor_ =
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial();
         } else {
           primaryConstructor_ = value;
         }
@@ -10306,20 +10306,20 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13;
+       * optional .org.jetbrains.kotlin.serialization.Class.PrimaryConstructor primary_constructor = 13;
        *
        * 
        * This field is present if and only if the class has a primary constructor
        * 

        */
       public Builder clearPrimaryConstructor() {
-        primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
+        primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class)
     }
 
     static {
@@ -10327,36 +10327,36 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class)
   }
 
   public interface PackageOrBuilder extends 
        com.google.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+    // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    java.util.List 
+    java.util.List 
         getMemberList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getMember(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
     int getMemberCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Package}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
    */
   public static final class Package extends
       com.google.protobuf.GeneratedMessageLite.ExtendableMessage<
         Package> implements PackageOrBuilder {
     // Use Package.newBuilder() to construct.
-    private Package(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Package(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
 
     }
@@ -10394,10 +10394,10 @@ public final class ProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                member_ = new java.util.ArrayList();
+                member_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
+              member_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry));
               break;
             }
           }
@@ -10429,38 +10429,38 @@ public final class ProtoBuf {
       return PARSER;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+    // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
     public static final int MEMBER_FIELD_NUMBER = 1;
-    private java.util.List member_;
+    private java.util.List member_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    public java.util.List getMemberList() {
+    public java.util.List getMemberList() {
       return member_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getMemberOrBuilderList() {
       return member_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
     public int getMemberCount() {
       return member_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getMember(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index) {
       return member_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+     * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.CallableOrBuilder getMemberOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder getMemberOrBuilder(
         int index) {
       return member_.get(index);
     }
@@ -10491,7 +10491,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       com.google.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       for (int i = 0; i < member_.size(); i++) {
         output.writeMessage(1, member_.get(i));
@@ -10521,53 +10521,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package 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.ProtoBuf.Package parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package 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.ProtoBuf.Package parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package 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.ProtoBuf.Package parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package 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.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -10576,18 +10576,18 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Package prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Package}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package, Builder> implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.PackageOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package.newBuilder()
+          org.jetbrains.kotlin.serialization.ProtoBuf.Package, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.PackageOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Package.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -10609,20 +10609,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Package getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package build() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package result = buildPartial();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Package build() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Package result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package(this);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Package buildPartial() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Package result = new org.jetbrains.kotlin.serialization.ProtoBuf.Package(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           member_ = java.util.Collections.unmodifiableList(member_);
@@ -10632,8 +10632,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Package other) {
+        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance()) return this;
         if (!other.member_.isEmpty()) {
           if (member_.isEmpty()) {
             member_ = other.member_;
@@ -10666,11 +10666,11 @@ public final class ProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package parsedMessage = null;
+        org.jetbrains.kotlin.serialization.ProtoBuf.Package parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Package) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Package) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -10681,39 +10681,39 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
-      private java.util.List member_ =
+      // repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
+      private java.util.List member_ =
         java.util.Collections.emptyList();
       private void ensureMemberIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          member_ = new java.util.ArrayList(member_);
+          member_ = new java.util.ArrayList(member_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public java.util.List getMemberList() {
+      public java.util.List getMemberList() {
         return java.util.Collections.unmodifiableList(member_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public int getMemberCount() {
         return member_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getMember(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getMember(int index) {
         return member_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder setMember(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10723,19 +10723,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder setMember(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
         ensureMemberIsMutable();
         member_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
-      public Builder addMember(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable value) {
+      public Builder addMember(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10745,10 +10745,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder addMember(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10758,37 +10758,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder addMember(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
         ensureMemberIsMutable();
         member_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder addMember(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) {
         ensureMemberIsMutable();
         member_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder addAllMember(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureMemberIsMutable();
         super.addAll(values, member_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder clearMember() {
         member_ = java.util.Collections.emptyList();
@@ -10797,7 +10797,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1;
+       * repeated .org.jetbrains.kotlin.serialization.Callable member = 1;
        */
       public Builder removeMember(int index) {
         ensureMemberIsMutable();
@@ -10806,7 +10806,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Package)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Package)
     }
 
     static {
@@ -10814,7 +10814,7 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Package)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Package)
   }
 
   public interface CallableOrBuilder extends 
@@ -10918,30 +10918,30 @@ public final class ProtoBuf {
      */
     int getSetterFlags();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
     int getTypeParameterCount();
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+    // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
     boolean hasReceiverType();
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getReceiverType();
+    org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType();
 
     // required int32 name = 6;
     /**
@@ -10961,26 +10961,26 @@ public final class ProtoBuf {
      */
     int getName();
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+    // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    java.util.List 
+    java.util.List 
         getValueParameterList();
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index);
+    org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index);
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
@@ -10988,24 +10988,24 @@ public final class ProtoBuf {
      */
     int getValueParameterCount();
 
-    // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+    // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
     boolean hasReturnType();
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
-    org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getReturnType();
+    org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType();
   }
   /**
-   * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable}
+   * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable}
    */
   public static final class Callable extends
       com.google.protobuf.GeneratedMessageLite.ExtendableMessage<
         Callable> implements CallableOrBuilder {
     // Use Callable.newBuilder() to construct.
-    private Callable(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Callable(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
 
     }
@@ -11053,18 +11053,18 @@ public final class ProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 42: {
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = receiverType_.toBuilder();
               }
-              receiverType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(receiverType_);
                 receiverType_ = subBuilder.buildPartial();
@@ -11079,18 +11079,18 @@ public final class ProtoBuf {
             }
             case 58: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                valueParameter_ = new java.util.ArrayList();
+                valueParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              valueParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry));
+              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry));
               break;
             }
             case 66: {
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000040) == 0x00000040)) {
                 subBuilder = returnType_.toBuilder();
               }
-              returnType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(returnType_);
                 returnType_ = subBuilder.buildPartial();
@@ -11141,7 +11141,7 @@ public final class ProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Callable.MemberKind}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Callable.MemberKind}
      */
     public enum MemberKind
         implements com.google.protobuf.Internal.EnumLite {
@@ -11219,11 +11219,11 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Callable.MemberKind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Callable.MemberKind)
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Callable.CallableKind}
+     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Callable.CallableKind}
      */
     public enum CallableKind
         implements com.google.protobuf.Internal.EnumLite {
@@ -11301,7 +11301,7 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Callable.CallableKind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Callable.CallableKind)
     }
 
     public interface ValueParameterOrBuilder extends 
@@ -11348,34 +11348,34 @@ public final class ProtoBuf {
        */
       int getName();
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+      // required .org.jetbrains.kotlin.serialization.Type type = 3;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
       boolean hasType();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getType();
+      org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+      // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
       boolean hasVarargElementType();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
-      org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getVarargElementType();
+      org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType();
     }
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable.ValueParameter}
      */
     public static final class ValueParameter extends
         com.google.protobuf.GeneratedMessageLite.ExtendableMessage<
           ValueParameter> implements ValueParameterOrBuilder {
       // Use ValueParameter.newBuilder() to construct.
-      private ValueParameter(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+      private ValueParameter(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
         super(builder);
 
       }
@@ -11422,11 +11422,11 @@ public final class ProtoBuf {
                 break;
               }
               case 26: {
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000004) == 0x00000004)) {
                   subBuilder = type_.toBuilder();
                 }
-                type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+                type_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(type_);
                   type_ = subBuilder.buildPartial();
@@ -11435,11 +11435,11 @@ public final class ProtoBuf {
                 break;
               }
               case 34: {
-                org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder subBuilder = null;
+                org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000008) == 0x00000008)) {
                   subBuilder = varargElementType_.toBuilder();
                 }
-                varargElementType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+                varargElementType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(varargElementType_);
                   varargElementType_ = subBuilder.buildPartial();
@@ -11526,43 +11526,43 @@ public final class ProtoBuf {
         return name_;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+      // required .org.jetbrains.kotlin.serialization.Type type = 3;
       public static final int TYPE_FIELD_NUMBER = 3;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type type_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_;
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+       * required .org.jetbrains.kotlin.serialization.Type type = 3;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getType() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
         return type_;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+      // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
       public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type varargElementType_;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_;
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
       public boolean hasVarargElementType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getVarargElementType() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType() {
         return varargElementType_;
       }
 
       private void initFields() {
         flags_ = 0;
         name_ = 0;
-        type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
-        varargElementType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -11599,7 +11599,7 @@ public final class ProtoBuf {
                           throws java.io.IOException {
         getSerializedSize();
         com.google.protobuf.GeneratedMessageLite
-          .ExtendableMessage.ExtensionWriter extensionWriter =
+          .ExtendableMessage.ExtensionWriter extensionWriter =
             newExtensionWriter();
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           output.writeInt32(1, flags_);
@@ -11650,53 +11650,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
           com.google.protobuf.ByteString data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter 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.ProtoBuf.Callable.ValueParameter parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(byte[] data)
           throws com.google.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter 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.ProtoBuf.Callable.ValueParameter parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter 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.ProtoBuf.Callable.ValueParameter parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter parseDelimitedFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter 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.ProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
           com.google.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
+      public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -11705,18 +11705,18 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter}
+       * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable.ValueParameter}
        */
       public static final class Builder extends
           com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter, Builder> implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameterOrBuilder {
-        // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.newBuilder()
+            org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameterOrBuilder {
+        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -11733,9 +11733,9 @@ public final class ProtoBuf {
           bitField0_ = (bitField0_ & ~0x00000001);
           name_ = 0;
           bitField0_ = (bitField0_ & ~0x00000002);
-          type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
           bitField0_ = (bitField0_ & ~0x00000004);
-          varargElementType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+          varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
           bitField0_ = (bitField0_ & ~0x00000008);
           return this;
         }
@@ -11744,20 +11744,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter getDefaultInstanceForType() {
-          return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance();
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter build() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter result = buildPartial();
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter build() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter buildPartial() {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter(this);
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter buildPartial() {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter result = new org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -11780,8 +11780,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter other) {
-          if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter other) {
+          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance()) return this;
           if (other.hasFlags()) {
             setFlags(other.getFlags());
           }
@@ -11828,11 +11828,11 @@ public final class ProtoBuf {
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter parsedMessage = null;
+          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -11949,24 +11949,24 @@ public final class ProtoBuf {
           return this;
         }
 
-        // required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        // required .org.jetbrains.kotlin.serialization.Type type = 3;
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
         public boolean hasType() {
           return ((bitField0_ & 0x00000004) == 0x00000004);
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getType() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
           return type_;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
-        public Builder setType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+        public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -11976,23 +11976,23 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
         public Builder setType(
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
           type_ = builderForValue.build();
 
           bitField0_ |= 0x00000004;
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
-        public Builder mergeType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+        public Builder mergeType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              type_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance()) {
+              type_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
             type_ =
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
           } else {
             type_ = value;
           }
@@ -12001,33 +12001,33 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.jet.descriptors.serialization.Type type = 3;
+         * required .org.jetbrains.kotlin.serialization.Type type = 3;
          */
         public Builder clearType() {
-          type_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
 
           bitField0_ = (bitField0_ & ~0x00000004);
           return this;
         }
 
-        // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
-        private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type varargElementType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+        private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
         public boolean hasVarargElementType() {
           return ((bitField0_ & 0x00000008) == 0x00000008);
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
-        public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getVarargElementType() {
+        public org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType() {
           return varargElementType_;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
-        public Builder setVarargElementType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+        public Builder setVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -12037,23 +12037,23 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
         public Builder setVarargElementType(
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
           varargElementType_ = builderForValue.build();
 
           bitField0_ |= 0x00000008;
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
-        public Builder mergeVarargElementType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+        public Builder mergeVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              varargElementType_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance()) {
+              varargElementType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
             varargElementType_ =
-              org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
           } else {
             varargElementType_ = value;
           }
@@ -12062,16 +12062,16 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4;
+         * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
          */
         public Builder clearVarargElementType() {
-          varargElementType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+          varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
 
           bitField0_ = (bitField0_ & ~0x00000008);
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Callable.ValueParameter)
       }
 
       static {
@@ -12079,7 +12079,7 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable.ValueParameter)
     }
 
     private int bitField0_;
@@ -12226,55 +12226,55 @@ public final class ProtoBuf {
       return setterFlags_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+    // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
-    // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+    // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
     public static final int RECEIVER_TYPE_FIELD_NUMBER = 5;
-    private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type receiverType_;
+    private org.jetbrains.kotlin.serialization.ProtoBuf.Type receiverType_;
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
     public boolean hasReceiverType() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getReceiverType() {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType() {
       return receiverType_;
     }
 
@@ -12302,32 +12302,32 @@ public final class ProtoBuf {
       return name_;
     }
 
-    // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+    // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
     public static final int VALUE_PARAMETER_FIELD_NUMBER = 7;
-    private java.util.List valueParameter_;
+    private java.util.List valueParameter_;
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    public java.util.List getValueParameterList() {
+    public java.util.List getValueParameterList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getValueParameterOrBuilderList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
@@ -12337,40 +12337,40 @@ public final class ProtoBuf {
       return valueParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index) {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index) {
       return valueParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+     * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
      *
      * 
      * Value parameters for functions and constructors, or setter value parameter for properties
      * 

      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index) {
       return valueParameter_.get(index);
     }
 
-    // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+    // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
     public static final int RETURN_TYPE_FIELD_NUMBER = 8;
-    private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type returnType_;
+    private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_;
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
     public boolean hasReturnType() {
       return ((bitField0_ & 0x00000040) == 0x00000040);
     }
     /**
-     * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+     * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
      */
-    public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getReturnType() {
+    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
       return returnType_;
     }
 
@@ -12380,10 +12380,10 @@ public final class ProtoBuf {
       getterFlags_ = 0;
       setterFlags_ = 0;
       typeParameter_ = java.util.Collections.emptyList();
-      receiverType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+      receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
       name_ = 0;
       valueParameter_ = java.util.Collections.emptyList();
-      returnType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+      returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -12432,7 +12432,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       com.google.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -12518,53 +12518,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable 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.ProtoBuf.Callable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable 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.ProtoBuf.Callable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable 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.ProtoBuf.Callable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable 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.ProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable parseFrom(
+    public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -12573,18 +12573,18 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Callable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable}
+     * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable}
      */
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable, Builder> implements org.jetbrains.jet.descriptors.serialization.ProtoBuf.CallableOrBuilder {
-      // Construct using org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.newBuilder()
+          org.jetbrains.kotlin.serialization.ProtoBuf.Callable, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder {
+      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Callable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -12607,13 +12607,13 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000008);
         typeParameter_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000010);
-        receiverType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000020);
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000040);
         valueParameter_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000080);
-        returnType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
@@ -12622,20 +12622,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable getDefaultInstanceForType() {
-        return org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance();
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable build() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable result = buildPartial();
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable build() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable buildPartial() {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable result = new org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable(this);
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable buildPartial() {
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable result = new org.jetbrains.kotlin.serialization.ProtoBuf.Callable(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -12680,8 +12680,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable other) {
-        if (other == org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Callable other) {
+        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -12771,11 +12771,11 @@ public final class ProtoBuf {
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable parsedMessage = null;
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Callable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -13063,39 +13063,39 @@ public final class ProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
-      private java.util.List typeParameter_ =
+      // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000010;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         return java.util.Collections.unmodifiableList(typeParameter_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public int getTypeParameterCount() {
         return typeParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
         return typeParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13105,19 +13105,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
-      public Builder addTypeParameter(org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13127,10 +13127,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13140,37 +13140,37 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeParameterIsMutable();
         super.addAll(values, typeParameter_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder clearTypeParameter() {
         typeParameter_ = java.util.Collections.emptyList();
@@ -13179,7 +13179,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
        */
       public Builder removeTypeParameter(int index) {
         ensureTypeParameterIsMutable();
@@ -13188,24 +13188,24 @@ public final class ProtoBuf {
         return this;
       }
 
-      // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type receiverType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+      // optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
       public boolean hasReceiverType() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getReceiverType() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType() {
         return receiverType_;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
-      public Builder setReceiverType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+      public Builder setReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13215,23 +13215,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
       public Builder setReceiverType(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         receiverType_ = builderForValue.build();
 
         bitField0_ |= 0x00000020;
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
-      public Builder mergeReceiverType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+      public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000020) == 0x00000020) &&
-            receiverType_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
           receiverType_ =
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
         } else {
           receiverType_ = value;
         }
@@ -13240,10 +13240,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
        */
       public Builder clearReceiverType() {
-        receiverType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000020);
         return this;
@@ -13298,28 +13298,28 @@ public final class ProtoBuf {
         return this;
       }
 
-      // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
-      private java.util.List valueParameter_ =
+      // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+      private java.util.List valueParameter_ =
         java.util.Collections.emptyList();
       private void ensureValueParameterIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          valueParameter_ = new java.util.ArrayList(valueParameter_);
+          valueParameter_ = new java.util.ArrayList(valueParameter_);
           bitField0_ |= 0x00000080;
          }
       }
 
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public java.util.List getValueParameterList() {
+      public java.util.List getValueParameterList() {
         return java.util.Collections.unmodifiableList(valueParameter_);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
@@ -13329,24 +13329,24 @@ public final class ProtoBuf {
         return valueParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index) {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index) {
         return valueParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder setValueParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13356,27 +13356,27 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder setValueParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
-      public Builder addValueParameter(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter value) {
+      public Builder addValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13386,14 +13386,14 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder addValueParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter value) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13403,49 +13403,49 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder addValueParameter(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder addValueParameter(
-          int index, org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
        * 

        */
       public Builder addAllValueParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureValueParameterIsMutable();
         super.addAll(values, valueParameter_);
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
@@ -13458,7 +13458,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7;
+       * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
        *
        * 
        * Value parameters for functions and constructors, or setter value parameter for properties
@@ -13471,24 +13471,24 @@ public final class ProtoBuf {
         return this;
       }
 
-      // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
-      private org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type returnType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+      // required .org.jetbrains.kotlin.serialization.Type return_type = 8;
+      private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
       public boolean hasReturnType() {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
-      public org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type getReturnType() {
+      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
         return returnType_;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
-      public Builder setReturnType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+      public Builder setReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13498,23 +13498,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
       public Builder setReturnType(
-          org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
         returnType_ = builderForValue.build();
 
         bitField0_ |= 0x00000100;
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
-      public Builder mergeReturnType(org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type value) {
+      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000100) == 0x00000100) &&
-            returnType_ != org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            returnType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
           returnType_ =
-            org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
         } else {
           returnType_ = value;
         }
@@ -13523,16 +13523,16 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8;
+       * required .org.jetbrains.kotlin.serialization.Type return_type = 8;
        */
       public Builder clearReturnType() {
-        returnType_ = org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.getDefaultInstance();
+        returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000100);
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Callable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Callable)
     }
 
     static {
@@ -13540,7 +13540,7 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Callable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable)
   }
 
 
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/SerializerExtension.java b/core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
similarity index 95%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/SerializerExtension.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java
index d443c22ebe1..32ca727e304 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/SerializerExtension.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.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;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/StringTable.java b/core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java
similarity index 90%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/StringTable.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java
index 1694eaf6f99..04df1f05ff3 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/StringTable.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.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,17 +14,20 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization;
 
 import gnu.trove.TObjectHashingStrategy;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
 import java.util.List;
 
-import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
+import static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
 
 public class StringTable {
     public static final TObjectHashingStrategy QUALIFIED_NAME_BUILDER_HASHING =
diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java b/core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
new file mode 100644
index 00000000000..30a8e24cb99
--- /dev/null
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
@@ -0,0 +1,80 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/serialization/src/builtins.proto
+
+package org.jetbrains.kotlin.serialization.builtins;
+
+public final class BuiltInsProtoBuf {
+  private BuiltInsProtoBuf() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.className);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.callableAnnotation);
+    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.parameterAnnotation);
+  }
+  public static final int CLASS_NAME_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.serialization.Package { ... }
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Package,
+      java.util.List> className = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(),
+        null,
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.INT32,
+        true);
+  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
+      java.util.List> classAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+  public static final int CALLABLE_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.serialization.Callable { ... }
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable,
+      java.util.List> callableAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
+   */
+  public static final
+    com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
+      java.util.List> parameterAnnotation = com.google.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        com.google.protobuf.WireFormat.FieldType.MESSAGE,
+        false);
+
+  static {
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotatedCallableKind.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java
similarity index 86%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotatedCallableKind.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java
index 87858ff474a..0d41d3eb619 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotatedCallableKind.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotatedCallableKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 public enum AnnotatedCallableKind {
     FUNCTION,
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationAndConstantLoader.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
similarity index 87%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationAndConstantLoader.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
index bee47d52104..d665deac23e 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/AnnotationAndConstantLoader.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.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,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
 
 import java.util.List;
 
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/AnnotationDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
similarity index 94%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/AnnotationDeserializer.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
index ce93f7fdf25..cdc3dcf9c2d 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/AnnotationDeserializer.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Annotation.Argument.Value.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value
+import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.constants.*
@@ -33,6 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.types.ErrorUtils
 import org.jetbrains.jet.lang.descriptors.ClassKind
 import org.jetbrains.jet.lang.types.Variance
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
 public class AnnotationDeserializer(private val module: ModuleDescriptor) {
     private val builtIns: KotlinBuiltIns
@@ -64,7 +65,7 @@ public class AnnotationDeserializer(private val module: ModuleDescriptor) {
 
     private fun resolveValue(
             expectedType: JetType,
-            value: ProtoBuf.Annotation.Argument.Value,
+            value: Value,
             nameResolver: NameResolver
     ): CompileTimeConstant<*> {
         val result = when (value.getType()) {
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassDataFinder.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
similarity index 84%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassDataFinder.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java
index 54ee7a655e8..674b9330a24 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassDataFinder.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.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,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization;
+package org.jetbrains.kotlin.serialization.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.name.ClassId;
+import org.jetbrains.kotlin.serialization.ClassData;
 
 public interface ClassDataFinder {
     @Nullable
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
similarity index 89%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassDeserializer.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
index fc3575537de..2bdfce7f65a 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassDeserializer.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 import org.jetbrains.jet.lang.resolve.name.ClassId
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.ClassData
 
 public class ClassDeserializer(private val components: DeserializationComponents) {
     private val classes: (ClassKey) -> DeserializedClassDescriptor? =
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DeserializedType.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt
similarity index 93%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/DeserializedType.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt
index ffbc0b7e3d8..7b6f487531a 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/DeserializedType.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/FlexibleTypeCapabilitiesDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt
similarity index 87%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/FlexibleTypeCapabilitiesDeserializer.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt
index 18df5732a60..0244bf60a96 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/FlexibleTypeCapabilitiesDeserializer.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.types.FlexibleTypeCapabilities
 
 trait FlexibleTypeCapabilitiesDeserializer {
@@ -27,4 +26,4 @@ trait FlexibleTypeCapabilitiesDeserializer {
     }
 
     fun capabilitiesById(id: String): FlexibleTypeCapabilities?
-}
\ No newline at end of file
+}
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
similarity index 95%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
index 6e1600d49f3..84a74bed5d2 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,17 +14,16 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.*
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
-import org.jetbrains.jet.descriptors.serialization.descriptors.*
+import org.jetbrains.kotlin.serialization.*
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.*
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.impl.*
 import org.jetbrains.jet.lang.resolve.DescriptorFactory
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind.*
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.*
 
 public class MemberDeserializer(private val c: DeserializationContext) {
     public fun loadCallable(proto: Callable): CallableMemberDescriptor {
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java
similarity index 93%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java
index 7d1cf3ad15f..79f8e47fd26 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/NameResolver.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.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.deserialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -22,8 +22,9 @@ import org.jetbrains.jet.lang.resolve.name.ClassId;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
 
-import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
+import static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName;
 
 public class NameResolver {
     private final ProtoBuf.StringTable strings;
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
similarity index 83%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
index 1bdf6a94a59..c4bf50e7edb 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/ProtoContainer.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization
 
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.resolve.name.FqName
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
 
 public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqName: FqName?) {
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
similarity index 93%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
index 3ab9d430c74..cd5bad05d41 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
-import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedTypeParameterDescriptor
+import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeParameterDescriptor
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
 import org.jetbrains.jet.lang.types.*
 import org.jetbrains.kotlin.utils.*
-
 import java.util.LinkedHashMap
 
 public class TypeDeserializer(
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
similarity index 91%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
index 0b799118937..443b1fd3ba4 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.context
+package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.storage.StorageManager
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.descriptors.serialization.*
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationAndConstantLoader
 import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedAnnotations.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt
similarity index 93%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedAnnotations.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt
index 2160766b128..aa08e608bae 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedAnnotations.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import org.jetbrains.kotlin.storage.StorageManager
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedCallableMemberDescriptor.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
similarity index 77%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedCallableMemberDescriptor.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
index 1cd9379bf68..45dc892cc8d 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedCallableMemberDescriptor.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 
 public trait DeserializedCallableMemberDescriptor: CallableMemberDescriptor {
     public val proto: ProtoBuf.Callable
     public val nameResolver: NameResolver
-}
\ No newline at end of file
+}
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
similarity index 94%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
index 0d901e68711..b6126eb1d40 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.context.*
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.impl.AbstractClassDescriptor
@@ -29,14 +29,12 @@ import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass
 import org.jetbrains.jet.lang.types.AbstractClassTypeConstructor
 import org.jetbrains.jet.lang.types.JetType
-import org.jetbrains.jet.descriptors.serialization
+import org.jetbrains.kotlin.serialization.deserialization
 import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName
-import org.jetbrains.jet.descriptors.serialization.classKind
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
 import java.util.*
-import org.jetbrains.jet.descriptors.serialization.NameResolver
 
 public class DeserializedClassDescriptor(
         outerContext: DeserializationContext,
@@ -46,9 +44,9 @@ public class DeserializedClassDescriptor(
         outerContext.storageManager,
         nameResolver.getClassId(classProto.getFqName()).getRelativeClassName().shortName()
 ) {
-    private val modality = serialization.modality(Flags.MODALITY.get(classProto.getFlags()))
-    private val visibility = serialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
-    private val kind = classKind(Flags.CLASS_KIND.get(classProto.getFlags()))
+    private val modality = deserialization.modality(Flags.MODALITY.get(classProto.getFlags()))
+    private val visibility = deserialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
+    private val kind = deserialization.classKind(Flags.CLASS_KIND.get(classProto.getFlags()))
     private val isInner = Flags.INNER.get(classProto.getFlags())
 
     val c = outerContext.childContext(this, classProto.getTypeParameterList(), nameResolver)
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
similarity index 95%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
index 59b94b9a1e2..b10556ec137 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.scopes.JetScope
 import org.jetbrains.kotlin.utils.Printer
 import org.jetbrains.kotlin.utils.toReadOnlyList
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
 import java.util.*
 
 public abstract class DeserializedMemberScope protected(
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
similarity index 88%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
index 61d0af6ad63..5e0a1c83cdb 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
 import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
 import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.name.ClassId
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.kotlin.utils.addIfNotNull
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
 public open class DeserializedPackageMemberScope(
         packageDescriptor: PackageFragmentDescriptor,
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
similarity index 90%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
index 47672362e1e..2cb591cdaa4 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPropertyDescriptor.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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.descriptors
+package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
@@ -22,9 +22,9 @@ import org.jetbrains.jet.lang.descriptors.Modality
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.descriptors.annotations.Annotations
 import org.jetbrains.jet.lang.descriptors.Visibility
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind
 import org.jetbrains.jet.lang.descriptors.SourceElement
 
@@ -52,4 +52,4 @@ public class DeserializedPropertyDescriptor(
         return DeserializedPropertyDescriptor(
                 newOwner, original, getAnnotations(), newModality, newVisibility, isVar(), getName(), kind, proto, nameResolver)
     }
-}
\ No newline at end of file
+}
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
similarity index 88%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java
index 960f945f811..adb979fa3d4 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.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,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization.descriptors;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.descriptors.serialization.Flags;
-import org.jetbrains.jet.descriptors.serialization.NameResolver;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.SerializationPackage;
+import org.jetbrains.kotlin.serialization.Flags;
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage;
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
@@ -98,7 +98,7 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
                 null,
                 annotations,
                 nameResolver.getName(proto.getName()),
-                SerializationPackage.memberKind(Flags.MEMBER_KIND.get(proto.getFlags())),
+                DeserializationPackage.memberKind(Flags.MEMBER_KIND.get(proto.getFlags())),
                 proto,
                 nameResolver
         );
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
similarity index 81%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java
index c9ed2c57423..aa6bf62addd 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedTypeParameterDescriptor.java
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.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,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization.descriptors;
+package org.jetbrains.kotlin.serialization.deserialization.descriptors;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf;
-import org.jetbrains.jet.descriptors.serialization.SerializationPackage;
-import org.jetbrains.jet.descriptors.serialization.TypeDeserializer;
-import org.jetbrains.jet.descriptors.serialization.context.DeserializationContext;
+import org.jetbrains.kotlin.serialization.ProtoBuf;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage;
+import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer;
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext;
 import org.jetbrains.jet.lang.descriptors.SourceElement;
 import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor;
 import org.jetbrains.jet.lang.types.JetType;
@@ -38,7 +38,7 @@ public class DeserializedTypeParameterDescriptor extends AbstractLazyTypeParamet
         super(c.getStorageManager(),
               c.getContainingDeclaration(),
               c.getNameResolver().getName(proto.getName()),
-              SerializationPackage.variance(proto.getVariance()),
+              DeserializationPackage.variance(proto.getVariance()),
               proto.getReified(),
               index,
               SourceElement.NO_SOURCE);
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/findClassInModule.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt
similarity index 94%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/findClassInModule.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt
index 904ea02d894..366c132adee 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/findClassInModule.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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.deserialization
 
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.resolve.name.Name
@@ -40,4 +40,4 @@ public fun ModuleDescriptor.findClassAcrossModuleDependencies(classId: ClassId):
         result = findInnerClass(result, name) ?: return null
     }
     return result
-}
\ No newline at end of file
+}
diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/protoEnumMapping.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
similarity index 90%
rename from core/serialization/src/org/jetbrains/jet/descriptors/serialization/protoEnumMapping.kt
rename to core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
index ed3b113bf8f..ab54e076873 100644
--- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/protoEnumMapping.kt
+++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.descriptors.serialization
+package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor
 import org.jetbrains.jet.lang.descriptors.Modality
 import org.jetbrains.jet.lang.descriptors.Visibilities
 import org.jetbrains.jet.lang.descriptors.ClassKind
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter
+import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter
 import org.jetbrains.jet.lang.types.Variance
 
-fun memberKind(memberKind: Callable.MemberKind) = when (memberKind) {
+fun memberKind(memberKind: ProtoBuf.Callable.MemberKind) = when (memberKind) {
     ProtoBuf.Callable.MemberKind.DECLARATION -> CallableMemberDescriptor.Kind.DECLARATION
     ProtoBuf.Callable.MemberKind.FAKE_OVERRIDE -> CallableMemberDescriptor.Kind.FAKE_OVERRIDE
     ProtoBuf.Callable.MemberKind.DELEGATION -> CallableMemberDescriptor.Kind.DELEGATION
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt
index 0a03a800fdd..e569cbbbf82 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt
@@ -18,16 +18,16 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
 import com.intellij.psi.stubs.StubElement
 import com.intellij.psi.PsiElement
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.descriptors.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Modality
+import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFunctionStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPropertyStubImpl
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.MemberKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind
 import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.*
 
 fun createCallableStub(
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt
index ded257b8f9b..a225a612349 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt
@@ -17,8 +17,8 @@
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
 import com.intellij.psi.stubs.StubElement
-import org.jetbrains.jet.descriptors.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.psi.stubs.elements.JetClassElementType
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinClassStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinObjectStubImpl
@@ -33,10 +33,10 @@ import org.jetbrains.jet.lang.psi.JetDelegatorToSuperClass
 import org.jetbrains.jet.lexer.JetTokens
 import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName
 import org.jetbrains.jet.lang.psi.JetClassObject
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.jet.lexer.JetModifierKeywordToken
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Type
 import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.*
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 
@@ -230,4 +230,4 @@ private class ClassClsStubBuilder(
         val classData = c.components.classDataFinder.findClassData(nestedClassId)!!
         createClassStub(classBody, classData.getClassProto(), nestedClassId, c.child(classData.getNameResolver()))
     }
-}
\ No newline at end of file
+}
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt
index c16c619ee6e..6d09101d9e1 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt
@@ -16,11 +16,11 @@
 
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
-import org.jetbrains.jet.descriptors.serialization.NameResolver
+import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.jet.lang.resolve.name.Name
 import org.jetbrains.jet.lang.resolve.name.FqName
-import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder
 import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
 import org.jetbrains.jet.lang.resolve.kotlin.AbstractBinaryClassAnnotationAndConstantLoader
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt
index 2accd8216e7..453caf882f7 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
 import com.intellij.psi.stubs.StubElement
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.jet.lang.resolve.name.FqName
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
@@ -37,20 +37,20 @@ import org.jetbrains.jet.lang.psi.JetFunctionType
 import org.jetbrains.jet.lang.psi.JetFunctionTypeReceiver
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
 import org.jetbrains.jet.lang.psi.JetTypeParameterList
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type
+import org.jetbrains.kotlin.serialization.ProtoBuf.Type
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeParameterStubImpl
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance
+import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
 import org.jetbrains.jet.lang.psi.JetTypeConstraintList
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeConstraintStubImpl
 import org.jetbrains.jet.lang.resolve.name.ClassId
 import java.util.ArrayList
-import org.jetbrains.jet.descriptors.serialization.Flags
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection
+import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection
 import org.jetbrains.jet.lang.psi.JetProjectionKind
 
 class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt
index f1b8e8707c7..5b09921422e 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt
@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.plugin.decompiler.stubBuilder
 
-
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFileStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
@@ -31,19 +30,19 @@ import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
 import org.jetbrains.jet.lang.resolve.name.SpecialNames
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinUserTypeStubImpl
 import org.jetbrains.jet.lexer.JetModifierKeywordToken
-import org.jetbrains.jet.descriptors.serialization.Flags
+import org.jetbrains.kotlin.serialization.Flags
 import org.jetbrains.jet.lexer.JetTokens
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
+import org.jetbrains.kotlin.serialization.ProtoBuf
 import com.intellij.util.io.StringRef
-import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
+import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.jet.lang.psi.stubs.impl.KotlinAnnotationEntryStubImpl
 import org.jetbrains.jet.lang.psi.JetConstructorCalleeExpression
 import org.jetbrains.jet.lang.psi.JetTypeReference
 import org.jetbrains.jet.lang.resolve.name.Name
-import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotatedCallableKind
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
 import java.util.ArrayList
 
 fun createTopLevelClassStub(classId: ClassId, classProto: ProtoBuf.Class, context: ClsStubBuilderContext): KotlinFileStubImpl {
@@ -231,4 +230,4 @@ fun sortCallableStubs(unordered: List): List