diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt
index 8330c006e06..d25a1ba7fe7 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt
@@ -76,7 +76,7 @@ class PlatformStaticGenerator(
         )
     }
 
-    class object {
+    companion object {
         [platformStatic]
         public fun createStaticFunctionDescriptor(descriptor: FunctionDescriptor): FunctionDescriptor {
             val memberDescriptor = if (descriptor is PropertyAccessorDescriptor) descriptor.getCorrespondingProperty() else descriptor
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt
index b8781dec0c8..3f03f07b263 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SourceInfo.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction
 
 data public class SourceInfo(val source: String, val pathOrCleanFQN: String, val linesInFile: Int) {
 
-    class object {
+    companion object {
         fun createInfo(element: JetElement?, internalClassName: String): SourceInfo {
             assert(element != null) { "Couldn't create source mapper for null element " + internalClassName }
             val lineNumbers = CodegenUtil.getLineNumberForElement(element!!.getContainingFile(), true)
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt
index eb23bea6f46..814324beae8 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/extensions/ExpressionCodegenExtension.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.resolve.*
 
 public trait ExpressionCodegenExtension {
-    class object : ProjectExtensionDescriptor<ExpressionCodegenExtension>("org.jetbrains.kotlin.expressionCodegenExtension", javaClass<ExpressionCodegenExtension>())
+    companion object : ProjectExtensionDescriptor<ExpressionCodegenExtension>("org.jetbrains.kotlin.expressionCodegenExtension", javaClass<ExpressionCodegenExtension>())
 
     public class Context(
             public val typeMapper: JetTypeMapper,
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
index 1f3fd198b38..827fb144cd3 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
 
 public class ReifiedTypeInliner(private val parametersMapping: ReifiedTypeParameterMappings?) {
 
-    class object {
+    companion object {
         public val NEW_ARRAY_MARKER_METHOD_NAME: String = "reifyNewArray"
         public val CHECKCAST_MARKER_METHOD_NAME: String = "reifyCheckcast"
         public val INSTANCEOF_MARKER_METHOD_NAME: String = "reifyInstanceof"
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
index 143a7a9eb20..2ddb23f7b80 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/SMAP.kt
@@ -143,7 +143,7 @@ trait SourceMapper {
         parent?.visitOrigin()
     }
 
-    class object {
+    companion object {
 
         fun flushToClassBuilder(mapper: SourceMapper, v: ClassBuilder) {
             for (fileMapping in mapper.resultMappings) {
@@ -253,7 +253,7 @@ class SMAP(val fileMappings: List<FileMapping>) {
         sourceInfo = SourceInfo(default.name, default.path, defaultMapping.source + defaultMapping.range - 1)
     }
 
-    class object {
+    companion object {
         val FILE_SECTION = "*F"
 
         val LINE_SECTION = "*L"
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.kt
index 4052eb504a8..4325c5dacaa 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.kt
@@ -30,7 +30,7 @@ import javax.inject.Inject
 
 public class TraceBasedErrorReporter : ErrorReporter {
 
-    class object {
+    companion object {
         private val LOG = Logger.getInstance(javaClass<TraceBasedErrorReporter>())
 
         public val ABI_VERSION_ERRORS: WritableSlice<String, AbiVersionErrorData> = Slices.createCollectiveSlice()
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt
index dc9eba066cc..e24ad8befb5 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.name.Name
 abstract class JavaAnnotationArgumentImpl(
         override val name: Name?
 ) : JavaAnnotationArgument {
-    class object Factory {
+    companion object Factory {
         fun create(argument: PsiAnnotationMemberValue, name: Name?): JavaAnnotationArgument {
             val value = JavaPsiFacade.getInstance(argument.getProject()).getConstantEvaluationHelper().computeConstantExpression(argument)
             if (value is Enum<*>) {
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
index 65c68e52f2f..1905da3f7d8 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt
@@ -49,7 +49,7 @@ public class VirtualFileKotlinClass private(
     override fun hashCode() = file.hashCode()
     override fun toString() = "${javaClass.getSimpleName()}: $file"
 
-    class object Factory {
+    companion object Factory {
         private val LOG = Logger.getInstance(javaClass<VirtualFileKotlinClass>())
 
         deprecated("Use KotlinBinaryClassCache")
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt
index 275abfaff3b..a2597bfab7e 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt
@@ -47,7 +47,7 @@ public class JvmDeclarationOrigin(
         public val element: PsiElement?,
         public val descriptor: DeclarationDescriptor?
 ) {
-    class object {
+    companion object {
         public val NO_ORIGIN: JvmDeclarationOrigin = JvmDeclarationOrigin(OTHER, null, null)
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt
index 09eb88563ab..f91f6b8b1a4 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt
@@ -39,7 +39,7 @@ public data open class AnalysisResult protected (
 
     private class Error(bindingContext: BindingContext, val exception: Throwable) : AnalysisResult(bindingContext, ErrorUtils.getErrorModule())
 
-    class object {
+    companion object {
         public val EMPTY: AnalysisResult = success(BindingContext.EMPTY, ErrorUtils.getErrorModule())
 
         platformStatic public fun success(bindingContext: BindingContext, module: ModuleDescriptor): AnalysisResult {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
index 5414451dea3..8eb0f88aa5c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt
@@ -75,7 +75,7 @@ public class ReadValueInstruction private (
     override fun createCopy(): InstructionImpl =
             ReadValueInstruction(element, lexicalScope, target, receiverValues, outputValue)
 
-    class object Factory {
+    companion object Factory {
         public fun create (
                 element: JetElement,
                 lexicalScope: LexicalScope,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
index b3123b175b5..dafc8d92757 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
@@ -79,7 +79,7 @@ public class CallInstruction private(
     override fun toString() =
             renderInstruction("call", "${render(element)}, ${resolvedCall.getResultingDescriptor()!!.getName()}")
 
-    class object Factory {
+    companion object Factory {
         fun create (
                 element: JetElement,
                 lexicalScope: LexicalScope,
@@ -115,7 +115,7 @@ public class MagicInstruction(
 
     override fun toString() = renderInstruction("magic[$kind]", render(element))
 
-    class object Factory {
+    companion object Factory {
         fun create(
                 element: JetElement,
                 valueElement: JetElement?,
@@ -165,7 +165,7 @@ class MergeInstruction private(
 
     override fun toString() = renderInstruction("merge", render(element))
 
-    class object Factory {
+    companion object Factory {
         fun create(
                 element: JetElement,
                 lexicalScope: LexicalScope,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt
index 0afb5d46da1..1f219981b3d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/extensions/ExternalDeclarationsProvider.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.psi.JetFile
 
 public trait ExternalDeclarationsProvider {
-    class object : ProjectExtensionDescriptor<ExternalDeclarationsProvider>(
+    companion object : ProjectExtensionDescriptor<ExternalDeclarationsProvider>(
             "org.jetbrains.kotlin.externalDeclarationsProvider",
             javaClass<ExternalDeclarationsProvider>()
     )
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt
index 0d2b9d16820..2e124631934 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/parser/KDocLinkParser.kt
@@ -29,7 +29,7 @@ import kotlin.platform.*
  * Parses the contents of a Markdown link in KDoc. Uses the standard Kotlin lexer.
  */
 class KDocLinkParser(): PsiParser {
-    class object {
+    companion object {
         platformStatic public fun parseMarkdownLink(root: IElementType, chameleon: ASTNode): ASTNode {
             val parentElement = chameleon.getTreeParent().getPsi()
             val project = parentElement.getProject()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt
index 5e82ddb1628..6442232bbbe 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt
@@ -147,7 +147,7 @@ public abstract class JetCodeFragment(
         }
     }
 
-    class object {
+    companion object {
         public val IMPORT_SEPARATOR: String = ","
         public val RUNTIME_TYPE_EVALUATOR: Key<Function1<JetExpression, JetType?>> = Key.create("RUNTIME_TYPE_EVALUATOR")
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt
index 7416bae2fa1..ea8976929c3 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt
@@ -50,7 +50,7 @@ abstract class JetSimpleNameExpressionImpl(node: ASTNode) : JetExpressionImpl(no
     override fun getReferencedName() = getReferencedNameImpl()
 
     //NOTE: an unfortunate way to share an implementation between stubbed and not stubbed tree
-    class object Helper {
+    companion object Helper {
 
         fun JetSimpleNameExpression.getReferencedNameElementTypeImpl(): IElementType {
             return this.getReferencedNameElement().getNode()!!.getElementType()!!
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt
index c126647fd95..27c2b7256d9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinStubBaseImpl.kt
@@ -73,7 +73,7 @@ public open class KotlinStubBaseImpl<T : JetElementImplStub<*>>(parent: StubElem
         return methodName
     }
 
-    class object {
+    companion object {
         private val LOGGER: Logger = Logger.getInstance(javaClass<KotlinStubBaseImpl<JetElementImplStub<*>>>())
 
         private val BASE_STUB_INTERFACES = listOf(javaClass<KotlinStubWithFqName<*>>(), javaClass<KotlinClassOrObjectStub<*>>(), javaClass<NamedStub<*>>())
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt
index cde3f0392eb..f5540fa887d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt
@@ -25,7 +25,7 @@ public trait CodeAnalyzerInitializer {
     public fun initialize(trace: BindingTrace, module: ModuleDescriptor, codeAnalyzer: KotlinCodeAnalyzer?)
     public fun createTrace(): BindingTrace
     
-    class object {
+    companion object {
         public fun getInstance(project: Project): CodeAnalyzerInitializer =
                 ServiceManager.getService<CodeAnalyzerInitializer>(project, javaClass<CodeAnalyzerInitializer>())!!
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt
index ec63b349312..a76a75a4f3e 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt
@@ -28,7 +28,7 @@ public class CompositeBindingContext private (
         private val delegates: List<BindingContext>
 ) : BindingContext {
 
-    class object {
+    companion object {
         public fun create(delegates: List<BindingContext>): BindingContext {
             if (delegates.isEmpty()) return BindingContext.EMPTY
             if (delegates.size() == 1) return delegates.first()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt
index bef31c129d3..42bccac03a7 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/StatementFilter.kt
@@ -25,7 +25,7 @@ public open class StatementFilter {
     public open val filter: ((JetElement) -> Boolean)?
         get() = null
 
-    class object {
+    companion object {
         public val NONE: StatementFilter = StatementFilter()
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
index 56127026b76..f81fe3fa856 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt
@@ -310,7 +310,7 @@ public class TypeResolver(
         return classifierDescriptor
     }
 
-    class object {
+    companion object {
         [platformStatic]
         public fun resolveProjectionKind(projectionKind: JetProjectionKind): Variance {
             return when (projectionKind) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
index d0004ab72a0..9e0d73ef638 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt
@@ -79,7 +79,7 @@ class VarianceChecker(private val trace: BindingTrace) {
             val occurrencePosition: Variance
     )
 
-    class object {
+    companion object {
         platformStatic fun recordPrivateToThisIfNeeded(trace: BindingTrace, descriptor: CallableMemberDescriptor) {
             if (isIrrelevant(descriptor) || descriptor.getVisibility() != Visibilities.PRIVATE) return
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt
index 0dab7a9f754..1c26f716090 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt
@@ -47,8 +47,8 @@ public class CallableDescriptorCollectors<D : CallableDescriptor>(val collectors
         Iterable<CallableDescriptorCollector<D>> {
     override fun iterator(): Iterator<CallableDescriptorCollector<D>> = collectors.iterator()
 
-    [suppress("UNCHECKED_CAST")]
-    class object {
+    [suppress("UNCHECKED_CAST")] companion
+    object {
         public val FUNCTIONS_AND_VARIABLES: CallableDescriptorCollectors<CallableDescriptor> =
                 CallableDescriptorCollectors(listOf(
                         FUNCTIONS_COLLECTOR as CallableDescriptorCollector<CallableDescriptor>,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
index 27c6ea20cba..d24904e5755 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
@@ -38,7 +38,7 @@ import kotlin.platform.platformStatic
 
 public class ConstantExpressionEvaluator private (val trace: BindingTrace) : JetVisitor<CompileTimeConstant<*>, JetType>() {
 
-    class object {
+    companion object {
         platformStatic public fun evaluate(expression: JetExpression, trace: BindingTrace, expectedType: JetType? = TypeUtils.NO_EXPECTED_TYPE): CompileTimeConstant<*>? {
             val evaluator = ConstantExpressionEvaluator(trace)
             return evaluator.evaluate(expression, expectedType)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt
index 036c7e25500..a14056e7678 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt
@@ -36,7 +36,7 @@ public trait Diagnostics : Iterable<Diagnostic> {
 
     override fun iterator() = all().iterator()
 
-    class object {
+    companion object {
         public val EMPTY: Diagnostics = object : Diagnostics {
             override fun noSuppression(): Diagnostics = this
             override val modificationTracker: ModificationTracker = ModificationTracker.NEVER_CHANGED
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt
index 37f6dc46ebe..a296cdf7075 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyFileScope.kt
@@ -55,7 +55,7 @@ class LazyFileScope private(
         }
     }
 
-    class object Factory {
+    companion object Factory {
         public fun create(
                 resolveSession: ResolveSession,
                 file: JetFile,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
index 30eeb4108c2..f56ab0d094c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
@@ -35,7 +35,7 @@ public abstract class DeclarationProviderFactoryService {
             filesScope: GlobalSearchScope
     ): DeclarationProviderFactory
 
-    class object {
+    companion object {
         public platformStatic fun createDeclarationProviderFactory(
                 project: Project,
                 storageManager: StorageManager,
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
index 4d886a951fe..2ff51bcfe68 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
@@ -319,7 +319,7 @@ public open class LazyClassMemberScope(
     // Do not add details here, they may compromise the laziness during debugging
     override fun toString() = "lazy scope for class ${thisDescriptor.getName()}"
 
-    class object {
+    companion object {
         private val EXTRACT_FUNCTIONS: MemberExtractor<FunctionDescriptor> = object : MemberExtractor<FunctionDescriptor> {
             override fun extract(extractFrom: JetType, name: Name): Collection<FunctionDescriptor> {
                 return extractFrom.getMemberScope().getFunctions(name)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
index 469a5d5245f..1c09b78447d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
@@ -46,7 +46,7 @@ public trait Qualifier: ReceiverValue {
     public val name: Name
         get() = classifier?.getName() ?: packageView!!.getName()
 
-    // package, classifier or class object descriptor
+    // package, classifier or companion object descriptor
     public val resultingDescriptor: DeclarationDescriptor
 
     public val scope: JetScope
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt
index e84cefac0af..ca53d6aace6 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt
@@ -87,7 +87,7 @@ public class KotlinCodeBlockModificationListener(modificationTracker: PsiModific
         }
     }
 
-    class object {
+    companion object {
         private val LOG = Logger.getInstance("#org.jetbrains.kotlin.asJava.JetCodeBlockModificationListener")
 
         private fun containsClassesInside(element: PsiElement?): Boolean {
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt
index 465b4257a52..3c97fbdd532 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.kt
@@ -65,7 +65,7 @@ public class KotlinLightClassForPackage private(
             }
         }
 
-        class object {
+        companion object {
             public fun getInstance(project: Project): FileStubCache {
                 return ServiceManager.getService<FileStubCache>(project, javaClass<FileStubCache>())
             }
@@ -214,7 +214,7 @@ public class KotlinLightClassForPackage private(
         }
     }
 
-    class object Factory {
+    companion object Factory {
         public fun create(
                 manager: PsiManager,
                 qualifiedName: FqName,
diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt
index e33137f2f90..3d91596226d 100644
--- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt
+++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.config.CompilerConfigurationKey
 import org.jetbrains.kotlin.config.CompilerConfiguration
 
 public trait ComponentRegistrar {
-    class object {
+    companion object {
         public val PLUGIN_COMPONENT_REGISTRARS: CompilerConfigurationKey<MutableList<ComponentRegistrar>> = CompilerConfigurationKey.create("plugin component registrars")
     }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt
index ef5613210e9..3fef9c1ce5e 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSMAPBaseTest.kt
@@ -98,7 +98,7 @@ public trait AbstractSMAPBaseTest {
     }
 
     class SMAPAndFile(val smap: String?, val sourceFile: String) {
-        class object {
+        companion object {
             fun SMAPAndFile(smap: String?, sourceFile: File) = SMAPAndFile(smap, getPath(sourceFile))
 
             public fun getPath(file: File): String {
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
index da2cc9316c2..49d3aca4b06 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
@@ -165,7 +165,7 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() {
         )
     }
 
-    class object {
+    companion object {
         val PATH_TO_TEST_ROOT_DIR = "compiler/testData/multiModule/java/custom"
     }
 }
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
index 4751dff752b..9fbaedbd233 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
@@ -52,7 +52,7 @@ import java.net.URLClassLoader
 import java.util.regex.Pattern
 
 public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() {
-    class object {
+    companion object {
         private val renderer = DescriptorRendererBuilder()
                 .setWithDefinedIn(false)
                 .setExcludedAnnotationClasses(listOf(
diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
index f113a73afc5..2c8cf0a0cfc 100644
--- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt
@@ -108,7 +108,7 @@ public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescrip
         }
     }
 
-    class object {
+    companion object {
         val pattern = Pattern.compile(".+(?=:)")
     }
 }
diff --git a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt
index 81f30f87707..e0cfb519c89 100644
--- a/compiler/util/src/org/jetbrains/kotlin/config/Services.kt
+++ b/compiler/util/src/org/jetbrains/kotlin/config/Services.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.config
 import java.util.HashMap
 
 public class Services private(private val map: Map<Class<*>, Any>) {
-    class object {
+    companion object {
         public val EMPTY: Services = Builder().build()
     }
 
diff --git a/core/builtins/native/kotlin/Enum.kt b/core/builtins/native/kotlin/Enum.kt
index 7eb3d65f627..46f93c7a847 100644
--- a/core/builtins/native/kotlin/Enum.kt
+++ b/core/builtins/native/kotlin/Enum.kt
@@ -22,7 +22,7 @@ package kotlin
  * information on enum classes.
  */
 public abstract class Enum<E : Enum<E>>(name: String, ordinal: Int): Comparable<E> {
-    class object Companion {}
+    companion object {}
 
     /**
      * Returns the name of this enum constant, exactly as declared in its enum declaration.
diff --git a/core/builtins/native/kotlin/Primitives.kt b/core/builtins/native/kotlin/Primitives.kt
index df00df81d1a..ff16d084c80 100644
--- a/core/builtins/native/kotlin/Primitives.kt
+++ b/core/builtins/native/kotlin/Primitives.kt
@@ -23,7 +23,7 @@ package kotlin
  * On the JVM, non-nullable values of this type are represented as values of the primitive type `byte`.
  */
 public class Byte private () : Number, Comparable<Byte> {
-    class object Companion {}
+    companion object {}
 
 /**
  * Compares this value with the specified value for order.
@@ -181,7 +181,7 @@ public class Byte private () : Number, Comparable<Byte> {
  * On the JVM, non-nullable values of this type are represented as values of the primitive type `char`.
  */
 public class Char private () : Comparable<Char> {
-    class object Companion {}
+    companion object {}
 
 /**
  * Compares the character code of this character with the specified value for order.
@@ -326,7 +326,7 @@ public class Char private () : Comparable<Char> {
  * On the JVM, non-nullable values of this type are represented as values of the primitive type `short`.
  */
 public class Short private () : Number, Comparable<Short> {
-    class object Companion {}
+    companion object {}
 
 /**
  * Compares this value with the specified value for order.
@@ -484,7 +484,7 @@ public class Short private () : Number, Comparable<Short> {
  * On the JVM, non-nullable values of this type are represented as values of the primitive type `int`.
  */
 public class Int private () : Number, Comparable<Int> {
-    class object Companion {}
+    companion object {}
 
 /**
  * Compares this value with the specified value for order.
@@ -657,7 +657,7 @@ public class Int private () : Number, Comparable<Int> {
  * On the JVM, non-nullable values of this type are represented as values of the primitive type `long`.
  */
 public class Long private () : Number, Comparable<Long> {
-    class object Companion {}
+    companion object {}
 
 /**
  * Compares this value with the specified value for order.
@@ -830,7 +830,7 @@ public class Long private () : Number, Comparable<Long> {
  * On the JVM, non-nullable values of this type are represented as values of the primitive type `float`.
  */
 public class Float private () : Number, Comparable<Float> {
-    class object Companion : FloatingPointConstants<Float> {}
+    companion object : FloatingPointConstants<Float> {}
 
 /**
  * Compares this value with the specified value for order.
@@ -988,7 +988,7 @@ public class Float private () : Number, Comparable<Float> {
  * On the JVM, non-nullable values of this type are represented as values of the primitive type `double`.
  */
 public class Double private () : Number, Comparable<Double> {
-    class object Companion : FloatingPointConstants<Double> {}
+    companion object : FloatingPointConstants<Double> {}
 
 /**
  * Compares this value with the specified value for order.
diff --git a/core/builtins/native/kotlin/String.kt b/core/builtins/native/kotlin/String.kt
index 8a606ecd210..a889d01a000 100644
--- a/core/builtins/native/kotlin/String.kt
+++ b/core/builtins/native/kotlin/String.kt
@@ -21,7 +21,7 @@ package kotlin
  * implemented as instances of this class.
  */
 public class String : Comparable<String>, CharSequence {
-    class object Companion {}
+    companion object {}
     
     /**
      * Returns a string obtained by concatenating this string with the string representation of the given [other] object.
diff --git a/core/builtins/src/kotlin/Ranges.kt b/core/builtins/src/kotlin/Ranges.kt
index f5d73be0d12..b957723d37f 100644
--- a/core/builtins/src/kotlin/Ranges.kt
+++ b/core/builtins/src/kotlin/Ranges.kt
@@ -38,7 +38,7 @@ public class ByteRange(override val start: Byte, override val end: Byte) : Range
     override fun hashCode(): Int =
         if (isEmpty()) -1 else (31 * start.toInt() + end)
 
-    class object Companion {
+    companion object {
         /** An empty range of values of type Byte. */
         public val EMPTY: ByteRange = ByteRange(1, 0)
     }
@@ -64,7 +64,7 @@ public class CharRange(override val start: Char, override val end: Char) : Range
     override fun hashCode(): Int =
         if (isEmpty()) -1 else (31 * start.toInt() + end)
 
-    class object Companion {
+    companion object {
         /** An empty range of values of type Char. */
         public val EMPTY: CharRange = CharRange(1.toChar(), 0.toChar())
     }
@@ -90,7 +90,7 @@ public class ShortRange(override val start: Short, override val end: Short) : Ra
     override fun hashCode(): Int =
         if (isEmpty()) -1 else (31 * start.toInt() + end)
 
-    class object Companion {
+    companion object {
         /** An empty range of values of type Short. */
         public val EMPTY: ShortRange = ShortRange(1, 0)
     }
@@ -116,7 +116,7 @@ public class IntRange(override val start: Int, override val end: Int) : Range<In
     override fun hashCode(): Int =
         if (isEmpty()) -1 else (31 * start + end)
 
-    class object Companion {
+    companion object {
         /** An empty range of values of type Int. */
         public val EMPTY: IntRange = IntRange(1, 0)
     }
@@ -142,7 +142,7 @@ public class LongRange(override val start: Long, override val end: Long) : Range
     override fun hashCode(): Int =
         if (isEmpty()) -1 else (31 * (start xor (start ushr 32)) + (end xor (end ushr 32))).toInt()
 
-    class object Companion {
+    companion object {
         /** An empty range of values of type Long. */
         public val EMPTY: LongRange = LongRange(1, 0)
     }
@@ -168,7 +168,7 @@ public class FloatRange(override val start: Float, override val end: Float) : Ra
     override fun hashCode(): Int =
         if (isEmpty()) -1 else (31 * java.lang.Float.floatToIntBits(start) + java.lang.Float.floatToIntBits(end))
 
-    class object Companion {
+    companion object {
         /** An empty range of values of type Float. */
         public val EMPTY: FloatRange = FloatRange(1.0f, 0.0f)
     }
@@ -199,7 +199,7 @@ public class DoubleRange(override val start: Double, override val end: Double) :
         return (31 * result + (temp xor (temp ushr 32))).toInt()
     }
 
-    class object Companion {
+    companion object {
         /** An empty range of values of type Double. */
         public val EMPTY: DoubleRange = DoubleRange(1.0, 0.0)
     }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt
index 2faafff6357..94341984951 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.types.JetType
 
 public trait SamConversionResolver {
-    public class object EMPTY : SamConversionResolver {
+    public companion object EMPTY : SamConversionResolver {
         override fun <D : FunctionDescriptor> resolveSamAdapter(original: D) = null
         override fun resolveSamConstructor(name: Name, scope: JetScope) = null
         override fun resolveFunctionTypeIfSamInterface(
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
index 98402b0d574..24e8c7e06ef 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name
 // The purpose of this class is to hold a unique signature of either a method or a field, so that annotations on a member can be put
 // into a map indexed by these signatures
 data class MemberSignature private(private val signature: String) {
-    class object {
+    companion object {
         platformStatic public fun fromMethodNameAndDesc(nameAndDesc: String): MemberSignature {
             return MemberSignature(nameAndDesc)
         }
diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationArguments.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationArguments.kt
index 3425290445c..d7ac0b8f1d9 100644
--- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationArguments.kt
+++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaAnnotationArguments.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.Name
 abstract class ReflectJavaAnnotationArgument(
         override val name: Name?
 ) : JavaAnnotationArgument {
-    class object Factory {
+    companion object Factory {
         fun create(value: Any, name: Name?): ReflectJavaAnnotationArgument {
             return when {
                 value.javaClass.isEnumClassOrSpecializedEnumEntryClass() -> ReflectJavaEnumValueAnnotationArgument(name, value as Enum<*>)
diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt
index de71b7a5fca..b0f2d2975d7 100644
--- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt
+++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/java/structure/reflect/ReflectJavaType.kt
@@ -27,7 +27,7 @@ public abstract class ReflectJavaType : JavaType {
 
     override fun createArrayType(): JavaArrayType = throw UnsupportedOperationException()
 
-    class object Factory {
+    companion object Factory {
         fun create(type: Type): ReflectJavaType {
             return when {
                 type is Class<*> && type.isPrimitive() -> ReflectJavaPrimitiveType(type)
diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt
index 83af46896b4..8f5d7fb4bc7 100644
--- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt
+++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/ReflectKotlinClass.kt
@@ -44,7 +44,7 @@ public class ReflectKotlinClass private(
         private val classHeader: KotlinClassHeader
 ) : KotlinJvmBinaryClass {
 
-    class object Factory {
+    companion object Factory {
 
         public fun create(klass: Class<*>): ReflectKotlinClass? {
             val headerReader = ReadKotlinClassHeaderAnnotationVisitor()
diff --git a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt
index 911071839ce..eaca97c31bb 100644
--- a/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt
+++ b/core/descriptors.runtime/src/org/jetbrains/kotlin/load/kotlin/reflect/RuntimeModuleData.kt
@@ -29,7 +29,7 @@ public class RuntimeModuleData private(private val injector: InjectorForRuntimeD
 
     public val localClassResolver: LocalClassResolver get() = injector.getDeserializationComponentsForJava().components.localClassResolver
 
-    class object {
+    companion object {
         public fun create(classLoader: ClassLoader): RuntimeModuleData {
             val module = ModuleDescriptorImpl(Name.special("<runtime module for $classLoader>"), listOf(), JavaToKotlinClassMap.INSTANCE)
             module.addDependencyOnModule(module)
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt
index 66e92a84753..5608526f48d 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt
@@ -26,7 +26,7 @@ public trait Annotations : Iterable<AnnotationDescriptor> {
 
     public fun findAnnotation(fqName: FqName): AnnotationDescriptor?
 
-    class object {
+    companion object {
         public val EMPTY: Annotations = object : Annotations {
             override fun isEmpty() = true
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
index 2aa6f5b011b..fae1f9a3966 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt
@@ -76,7 +76,7 @@ public trait JetScope {
         }
     }
 
-    class object {
+    companion object {
         public val ALL_NAME_FILTER: (Name) -> Boolean = { true }
     }
 }
@@ -141,7 +141,7 @@ public class DescriptorKindFilter(
         }
     }
 
-    class object {
+    companion object {
         public val NON_SINGLETON_CLASSIFIERS_MASK: Int = 0x01
         public val SINGLETON_CLASSIFIERS_MASK: Int = 0x02
         public val PACKAGES_MASK: Int = 0x04
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
index 4e10c7c353b..9562ca3506e 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt
@@ -33,7 +33,7 @@ public trait FlexibleTypeCapabilities {
 }
 
 public trait Flexibility : TypeCapability, SubtypingRepresentatives {
-    class object {
+    companion object {
         // This is a "magic" classifier: when type resolver sees it in the code, e.g. ft<Foo, Foo?>, instead of creating a normal type,
         // it creates a flexible type, e.g. (Foo..Foo?).
         // This is used in tests and Evaluate Expression to have flexible types in the code,
@@ -145,7 +145,7 @@ public open class DelegatingFlexibleType protected (
         override val upperBound: JetType,
         override val extraCapabilities: FlexibleTypeCapabilities
 ) : DelegatingType(), NullAwareness, Flexibility, FlexibleTypeDelegation, Approximation {
-    class object {
+    companion object {
         platformStatic fun create(lowerBound: JetType, upperBound: JetType, extraCapabilities: FlexibleTypeCapabilities): JetType {
             if (lowerBound == upperBound) return lowerBound
             return DelegatingFlexibleType(lowerBound, upperBound, extraCapabilities)
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt
index 9ddaa55085e..c13f189d307 100644
--- a/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/common.kt
@@ -30,7 +30,7 @@ enum class PrimitiveType {
     BOOLEAN
 
     val capitalized: String get() = name().toLowerCase().capitalize()
-    class object {
+    companion object {
         val exceptBoolean: Iterable<PrimitiveType> by Delegates.lazy { PrimitiveType.values().filterNot { it == BOOLEAN } }
     }
 }
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
index 77a005f477a..22cbb811c0c 100644
--- a/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
@@ -61,7 +61,7 @@ class GeneratePrimitives(out: PrintWriter) : BuiltInsSourceGenerator(out) {
             }
             out.println("Comparable<$className> {")
 
-            out.print("    class object Companion")
+            out.print("    companion object")
             if (kind == PrimitiveType.FLOAT || kind == PrimitiveType.DOUBLE) {
                 out.print(" : FloatingPointConstants<$className>")
             }
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
index 407b25b44f5..377db8d7130 100644
--- a/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/ranges.kt
@@ -82,7 +82,7 @@ public class $range(override val start: $t, override val end: $t) : Range<$t>, P
 
     override fun hashCode(): Int $hashCode
 
-    class object Companion {
+    companion object {
         /** An empty range of values of type $t. */
         public val EMPTY: $range = $range($emptyBounds)
     }
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
index 553313302db..5be3c38c4f8 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt
@@ -48,7 +48,7 @@ public class ReferenceVariantsHelper(
             public val receivers: Collection<ReceiverValue>,
             public val callType: CallType
     ) {
-        class object {
+        companion object {
             val Empty = ReceiversData(listOf(), CallType.NORMAL)
         }
     }
@@ -216,7 +216,7 @@ public class ReferenceVariantsHelper(
         return resolutionScope.getDescriptorsFiltered(DescriptorKindFilter.PACKAGES, nameFilter).filter(visibilityFilter)
     }
 
-    class object {
+    companion object {
         public fun getExplicitReceiverData(expression: JetSimpleNameExpression): Pair<JetExpression, CallType>? {
             val receiverExpression = expression.getReceiverExpression() ?: return null
             val parent = expression.getParent()
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
index 14896ff3136..2ac4e876a59 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt
@@ -469,7 +469,7 @@ class PartialBodyResolveFilter(
         NEED_COMPLETION
     }
 
-    class object {
+    companion object {
         private fun JetElement.blocks(): Collection<JetBlockExpression> {
             val result = ArrayList<JetBlockExpression>(1)
             this.accept(object : JetVisitorVoid() {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt
index dfb6c805f4b..560299aa207 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/actions/internal/KotlinInternalMode.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.actions.internal
 import com.intellij.ide.util.PropertiesComponent
 
 public class KotlinInternalMode {
-    public class object Instance {
+    public companion object Instance {
         val INTERNAL_MODE_PROPERTY = "kotlin.internal.mode.enabled"
 
         public var enabled: Boolean
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt
index abe3bd07595..813df25e105 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.stubindex.JetFunctionShortNameIndex
 
 // used in Upsource, what's why in idea-analysis module
 public class JetShortNamesCache(private val project: com.intellij.openapi.project.Project) : com.intellij.psi.search.PsiShortNamesCache() {
-    class object {
+    companion object {
         public fun getKotlinInstance(project: com.intellij.openapi.project.Project): org.jetbrains.kotlin.idea.caches.JetShortNamesCache
                 = com.intellij.openapi.extensions.Extensions.getArea(project).getExtensionPoint<com.intellij.psi.search.PsiShortNamesCache>(com.intellij.psi.search.PsiShortNamesCache.EP_NAME).getExtensions()
                 .firstIsInstance<JetShortNamesCache>()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
index 898cc630a1e..21620577a6b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt
@@ -45,7 +45,7 @@ import kotlin.platform.platformStatic
 private val LOG = Logger.getInstance(javaClass<KotlinCacheService>())
 
 public class KotlinCacheService(val project: Project) {
-    class object {
+    companion object {
         platformStatic public fun getInstance(project: Project): KotlinCacheService = ServiceManager.getService(project, javaClass<KotlinCacheService>())!!
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt
index da5d259c204..995ef565967 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt
@@ -31,7 +31,7 @@ import com.intellij.codeInsight.ExternalAnnotationsListener
 import com.intellij.psi.PsiModifierListOwner
 
 class LibraryModificationTracker(project: Project) : SimpleModificationTracker() {
-    class object {
+    companion object {
         platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<LibraryModificationTracker>())!!
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt
index 44f73ee1758..e33633636c6 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt
@@ -43,7 +43,7 @@ private class ExceptionTrackerWithProcessCanceledReport() : ExceptionTracker() {
     }
 
 
-    class object {
+    companion object {
         val LOG = Logger.getInstance(javaClass<ExceptionTrackerWithProcessCanceledReport>())
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
index 263b6a296a3..304607bc51d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt
@@ -32,7 +32,7 @@ import com.intellij.openapi.util.SimpleModificationTracker
 import kotlin.platform.platformStatic
 
 class ModuleTypeCacheManager private (project: Project) {
-    class object {
+    companion object {
         platformStatic fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<ModuleTypeCacheManager>())
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JsMetaFileUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JsMetaFileUtils.kt
index 018545b2d6a..f2079bea99e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JsMetaFileUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JsMetaFileUtils.kt
@@ -94,7 +94,7 @@ private fun getLibraryName(module: ModuleDescriptor): String? {
 
 
 class JsMetaFileVirtualFileHolder private(val myProject: Project) {
-    class object {
+    companion object {
         public val MODULE_DESCRIPTOR_KEY: Key<ModuleDescriptorImpl> = Key.create("MODULE_DESCRIPTOR")
         public val PACKAGE_FQNAME_KEY: Key<FqName> = Key.create("PACKAGE_FQNAME_KEY")
         private val JS_META_FILE_HOLDER_KEY: Key<JsMetaFileVirtualFileHolder> = Key.create("JS_META_FILE_HOLDER_KEY")
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt
index cc4397403fc..5842d11c9ae 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt
@@ -87,7 +87,7 @@ public open class KotlinClsStubBuilder : ClsStubBuilder() {
         return ClsStubBuilderComponents(classDataFinder, annotationLoader)
     }
 
-    class object {
+    companion object {
         val LOG = Logger.getInstance(javaClass<KotlinClsStubBuilder>())
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt
index 4397d443d21..cdb621ae323 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt
@@ -113,7 +113,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
         return MutablePackageFragmentDescriptor(moduleDescriptor, fqName)
     }
 
-    class object {
+    companion object {
         private val LOG = Logger.getInstance(javaClass<DeserializerForDecompiler>())
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
index cdf7fbdddb3..e8caaca90c4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
@@ -222,7 +222,7 @@ public open class JetPsiChecker : Annotator, HighlightRangeExtension {
         }
     }
 
-    class object {
+    companion object {
         var namesHighlightingEnabled = true
             [TestOnly] set
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
index 91dac12e458..7c0d1be7f61 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 
 public class OperatorToFunctionIntention : JetSelfTargetingIntention<JetExpression>("operator.to.function", javaClass()) {
-    class object {
+    companion object {
         private fun isApplicablePrefix(element: JetPrefixExpression): Boolean {
             return when (element.getOperationReference().getReferencedNameElementType()) {
                 JetTokens.PLUS, JetTokens.MINUS, JetTokens.PLUSPLUS, JetTokens.MINUSMINUS, JetTokens.EXCL -> true
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt
index e4af8106997..3ce34c8af44 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt
@@ -41,7 +41,7 @@ public class JetForLoopInReference(element: JetForExpression) : JetMultiReferenc
         return LOOP_RANGE_KEYS.map { key -> context.get(key, loopRange)?.getCandidateDescriptor() }.filterNotNull()
     }
 
-    class object {
+    companion object {
         private val LOOP_RANGE_KEYS = array(
                 BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL,
                 BindingContext.LOOP_RANGE_NEXT_RESOLVED_CALL,
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt
index d562fab6cd9..1ffe98db487 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt
@@ -57,7 +57,7 @@ public data class UsagesSearchLocation(
         val inStrings: Boolean = false,
         val inPlainText: Boolean = true
 ) {
-    class object {
+    companion object {
         public val DEFAULT: UsagesSearchLocation = UsagesSearchLocation()
         public val EVERYWHERE: UsagesSearchLocation = UsagesSearchLocation(true, true, true, true)
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
index 7d3781d407f..0c3a335d09c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
@@ -78,7 +78,7 @@ public class SubpackagesIndexService(private val project: Project) {
         }
     }
 
-    class object {
+    companion object {
         public fun getInstance(project: Project): SubpackagesIndex {
             return ServiceManager.getService(project, javaClass<SubpackagesIndexService>())!!.cachedValue.getValue()!!
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
index 7d0116175fc..82e2e9dfa86 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ImportInsertHelper.kt
@@ -44,7 +44,7 @@ public abstract class ImportInsertHelper {
 
     public abstract fun importDescriptor(file: JetFile, descriptor: DeclarationDescriptor): ImportDescriptorResult
 
-    class object {
+    companion object {
         [platformStatic]
         public fun getInstance(project: Project): ImportInsertHelper
             = ServiceManager.getService<ImportInsertHelper>(project, javaClass<ImportInsertHelper>())
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
index 72f479c8d07..8ac6ac4bee7 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt
@@ -46,12 +46,12 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options.
             val removeThisLabels: Boolean = false,
             val removeThis: Boolean = false
     ) {
-        class object {
+        companion object {
             val DEFAULT = Options()
         }
     }
 
-    class object {
+    companion object {
         val DEFAULT = ShortenReferences()
 
         private fun DeclarationDescriptor.asString()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt
index 595199cfd3b..00ddf46edf1 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/plugin/references/SimpleNameReferenceExtension.kt
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.psi.JetPsiFactory
 
 public trait SimpleNameReferenceExtension {
-    class object {
+    companion object {
         public val EP_NAME: ExtensionPointName<SimpleNameReferenceExtension> = ExtensionPointName.create("org.jetbrains.kotlin.simpleNameReferenceExtension")!!
     }
 
diff --git a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
index f1b5b37929e..67c73cf0b77 100644
--- a/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
+++ b/idea/idea-jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt
@@ -21,7 +21,7 @@ public class CompilerSettings {
     public var copyJsLibraryFiles: Boolean = true
     public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY
 
-    class object {
+    companion object {
         private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version"
         private val DEFAULT_OUTPUT_DIRECTORY = "lib"
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt
index b2f456b547b..9ec9b7c058c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/JetAddImportAction.kt
@@ -154,7 +154,7 @@ public class JetAddImportAction(
         JBPopupFactory.getInstance().createListPopup(getImportSelectionPopup()).showInBestPositionFor(editor)
     }
 
-    class object {
+    companion object {
 
         protected fun addImport(element: PsiElement, project: Project, selectedVariant: Variant) {
             PsiDocumentManager.getInstance(project).commitAllDocuments()
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt
index 1c8bf39859d..97a81d07bb0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinReferenceTransferableData.kt
@@ -73,7 +73,7 @@ public class KotlinReferenceData(
         }
     }
 
-    class object {
+    companion object {
         public val dataFlavor: DataFlavor? by Delegates.lazy {
             try {
                 DataFlavor(DataFlavor.javaJVMLocalObjectMimeType + ";class=" + javaClass<KotlinReferenceData>().getName(), "KotlinReferenceData")
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt b/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt
index c2e16abfa1a..e875538c68c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt
@@ -52,7 +52,7 @@ public class DeclarationDescriptorLookupObject(
         return descriptorsEqualWithSubstitution(descriptor, lookupObject.descriptor)
     }
 
-    class object {
+    companion object {
         private val LOG = Logger.getInstance("#" + javaClass<DeclarationDescriptorLookupObject>().getName())
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt
index 958a5b3b062..ba70a060335 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.JetFunctionLiteral
 
 public class KotlinCompletionCharFilter() : CharFilter() {
-    class object {
+    companion object {
         public val ACCEPT_OPENING_BRACE: Key<Boolean> = Key("KotlinCompletionCharFilter.ACCEPT_OPENNING_BRACE")
 
         public val JUST_TYPING_PREFIX: Key<String> = Key("KotlinCompletionCharFilter.JUST_TYPING_PREFIX")
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt
index fb55ed942d3..6d0a17c437f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt
@@ -30,7 +30,7 @@ public class LeafElementFilter(private val elementType: IElementType) : ElementF
     override fun isClassAcceptable(hintClass: Class<*>)
             = LEAF_CLASS_FILTER.isClassAcceptable(hintClass)
 
-    class object {
+    companion object {
         private val LEAF_CLASS_FILTER = ClassFilter(javaClass<LeafPsiElement>())
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
index 9d9da8d25f6..2f0f01330f6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt
@@ -255,7 +255,7 @@ public class LookupElementFactory(
         }
     }
 
-    class object {
+    companion object {
         public fun getDefaultInsertHandler(descriptor: DeclarationDescriptor): InsertHandler<LookupElement> {
             return when (descriptor) {
                 is FunctionDescriptor -> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt
index c86ef9779dc..3ab3425edc7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt
@@ -217,7 +217,7 @@ public class KotlinFunctionInsertHandler(val caretPosition : CaretPosition, val
         return caretPosition == CaretPosition.IN_BRACKETS
     }
 
-    class object {
+    companion object {
         public val NO_PARAMETERS_HANDLER: KotlinFunctionInsertHandler = KotlinFunctionInsertHandler(CaretPosition.AFTER_BRACKETS, null)
         public val WITH_PARAMETERS_HANDLER: KotlinFunctionInsertHandler = KotlinFunctionInsertHandler(CaretPosition.IN_BRACKETS, null)
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt
index 777d550e1ed..690781bf78c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt
@@ -85,7 +85,7 @@ class WithTailInsertHandler(val tailText: String,
         }
     }
 
-    class object {
+    companion object {
         fun commaTail() = WithTailInsertHandler(",", spaceBefore = false, spaceAfter = true /*TODO: use code style option*/)
         fun rparenthTail() = WithTailInsertHandler(")", spaceBefore = false, spaceAfter = false)
         fun elseTail() = WithTailInsertHandler("else", spaceBefore = true, spaceAfter = true)
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt
index 84ef584c648..63d793448d1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt
@@ -473,7 +473,7 @@ class SmartCompletion(
         }
     }
 
-    class object {
+    companion object {
         public val OLD_ARGUMENTS_REPLACEMENT_OFFSET: OffsetKey = OffsetKey.create("nonFunctionReplacementOffset")
         public val MULTIPLE_ARGUMENTS_REPLACEMENT_OFFSET: OffsetKey = OffsetKey.create("multipleArgumentsReplacementOffset")
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
index 2b935755f51..5ea0953493f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt
@@ -104,7 +104,7 @@ fun LookupElement.addTailAndNameSimilarity(matchedExpectedInfos: Collection<Expe
 }
 
 class ExpectedInfoClassification private(val substitutor: TypeSubstitutor?, val makeNotNullable: Boolean) {
-    class object {
+    companion object {
         val notMatches = ExpectedInfoClassification(null, false)
         fun matches(substitutor: TypeSubstitutor) = ExpectedInfoClassification(substitutor, false)
         fun matchesIfNotNullable(substitutor: TypeSubstitutor) = ExpectedInfoClassification(substitutor, true)
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
index 38c28f99e7e..cd70dd7987b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
@@ -180,7 +180,7 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor<TextBl
         return dialog.isOK()
     }
 
-    class object {
+    companion object {
         private val LOG = Logger.getInstance("#org.jetbrains.kotlin.idea.conversion.copy.ConvertJavaCopyPastePostProcessor")
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedCode.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedCode.kt
index df47e626ead..5137eaa3f68 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedCode.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/CopiedCode.kt
@@ -28,7 +28,7 @@ class CopiedCode(val fileName: String, val fileText: String, val startOffsets: I
     public override fun getOffsets(offsets: IntArray?, index: Int) = index
     public override fun setOffsets(offsets: IntArray?, index: Int) = index
 
-    class object {
+    companion object {
         val DATA_FLAVOR: DataFlavor = DataFlavor(javaClass<ConvertJavaCopyPastePostProcessor>(), "class: ConvertJavaCopyPastePostProcessor")
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt b/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
index db17335db0f..32ee802ba5f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt
@@ -116,7 +116,7 @@ public class KotlinCoverageExtension(): JavaCoverageEngineExtension() {
         return false
     }
 
-    class object {
+    companion object {
         private val LOG = Logger.getInstance(javaClass<KotlinCoverageExtension>())
 
         fun collectGeneratedClassQualifiedNames(outputRoot: VirtualFile?, file: JetFile): List<String>? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
index de1cb2cbe37..c58383f04bf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
@@ -273,7 +273,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult
         myTypeMappers.put(key, value)
     }
 
-    class object {
+    companion object {
         public fun createTypeMapper(file: JetFile): JetTypeMapper {
             val project = file.getProject()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
index 3c76c3a8839..5e56a1e35a1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt
@@ -34,7 +34,7 @@ public class KotlinDebuggerSettings : XDebuggerSettings<KotlinDebuggerSettings>(
     public var DEBUG_DISABLE_KOTLIN_INTERNAL_CLASSES: Boolean = true
     public var DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED: Boolean = false
 
-    class object {
+    companion object {
         public fun getInstance(): KotlinDebuggerSettings {
             return XDebuggerUtil.getInstance()?.getDebuggerSettings(javaClass<KotlinDebuggerSettings>())!!
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt
index 381ea8aab32..2e27c137231 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt
@@ -42,7 +42,7 @@ class KotlinEditorTextProvider : EditorTextProvider {
         return Pair(expression, expressionRange)
     }
 
-    class object {
+    companion object {
 
         fun <T> getElementInfo(expr: JetExpression, f: (PsiElement) -> T): T {
             var expressionText = f(expr)
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
index d1c004033d7..bde73612788 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
@@ -95,7 +95,7 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
 
     override fun getEvaluatorBuilder() = KotlinEvaluationBuilder
 
-    class object {
+    companion object {
         fun getContextElement(elementAt: PsiElement?): PsiElement? {
             if (elementAt == null) return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt
index a1a6d67830b..02a220cfb7c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt
@@ -40,7 +40,7 @@ class KotlinEvaluateExpressionCache(val project: Project) {
                         MultiMap.create(), PsiModificationTracker.MODIFICATION_COUNT)
             }, false)
 
-    class object {
+    companion object {
         private val LOG = Logger.getLogger(javaClass<KotlinEvaluateExpressionCache>())!!
 
         fun getInstance(project: Project) = ServiceManager.getService(project, javaClass<KotlinEvaluateExpressionCache>())!!
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
index 43935d351eb..af1d1de9c6b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -157,7 +157,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
         return null
     }
 
-    class object {
+    companion object {
         private fun extractAndCompile(codeFragment: JetCodeFragment, sourcePosition: SourcePosition, context: EvaluationContextImpl): CompiledDataDescriptor {
             codeFragment.checkForErrors()
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt
index 00211719ff8..432e53cefb9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt
@@ -79,7 +79,7 @@ public abstract class KotlinRuntimeTypeEvaluator(
         throw EvaluateExceptionUtil.createEvaluateException(DebuggerBundle.message("evaluation.error.surrounded.expression.null"))
     }
 
-    class object {
+    companion object {
         private fun getCastableRuntimeType(project: Project, value: Value): JetType? {
             val myValue = value.asValue()
             var psiClass = myValue.asmType.getClassDescriptor(project)
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt
index f8909810a7f..af430f67122 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt
@@ -36,7 +36,7 @@ import com.intellij.psi.tree.TokenSet
 import com.intellij.psi.PsiWhiteSpace
 
 public class KotlinEnterHandler: EnterHandlerDelegateAdapter() {
-    class object {
+    companion object {
         private val LOG = Logger.getInstance(javaClass<KotlinEnterHandler>())
         private val FORCE_INDENT_IN_LAMBDA_AFTER = TokenSet.create(JetTokens.ARROW, JetTokens.LBRACE)
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt
index 58e2c2e9f70..75c0d09dae4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.lexer.JetTokens
 import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase
 
 public class KotlinListSelectioner : ExtendWordSelectionHandlerBase() {
-    class object {
+    companion object {
         fun canSelect(e: PsiElement)
             = e is JetParameterList || e is JetValueArgumentList || e is JetTypeParameterList || e is JetTypeArgumentList
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt
index 4c3d1c4f527..60e8fe3d463 100644
--- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.JetIcons
 import org.jetbrains.kotlin.idea.project.TargetPlatform
 
 public class KotlinTemplatesFactory : ProjectTemplatesFactory() {
-    class object {
+    companion object {
         public val KOTLIN_GROUP_NAME: String = "Kotlin"
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
index dea2a28b896..65e05d4585c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
@@ -51,7 +51,7 @@ import javax.swing.JComponent
 import javax.swing.JPanel
 
 public class UnusedSymbolInspection : AbstractKotlinInspection() {
-    class object {
+    companion object {
         private val javaInspection = UnusedDeclarationInspection()
 
         public fun isEntryPoint(declaration: JetNamedDeclaration): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
index 8cbae453018..2a7bce736ab 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
@@ -64,7 +64,7 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences
 public class ConvertFunctionToPropertyIntention : JetSelfTargetingIntention<JetNamedFunction>(
         "convert.function.to.property.intention", javaClass()
 ) {
-    class object {
+    companion object {
         private var JetNamedFunction.typeFqNameToAdd: String? by UserDataProperty(Key.create("TYPE_FQ_NAME_TO_ADD"))
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt
index b100e5bb86d..5cf380c3e04 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt
@@ -37,7 +37,7 @@ public class ConvertToBlockBodyAction : PsiElementBaseIntentionAction() {
         convert(findDeclaration(element)!!)
     }
 
-    class object {
+    companion object {
         fun convert(declaration: JetDeclarationWithBody): JetDeclarationWithBody {
             val body = declaration.getBodyExpression()!!
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt
index b2180a220c2..00cf06e66af 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt
@@ -59,7 +59,7 @@ public class InsertExplicitTypeArguments : JetSelfTargetingIntention<JetCallExpr
         ShortenReferences.DEFAULT.process(element.getTypeArgumentList()!!)
     }
 
-    class object {
+    companion object {
         fun createTypeArguments(element: JetCallExpression): JetTypeArgumentList? {
             val context = element.analyze()
             val resolvedCall = element.getResolvedCall(context)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
index 711c37fcdc1..aef5eb26e19 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression
 public class RemoveCurlyBracesFromTemplateIntention : JetSelfTargetingIntention<JetBlockStringTemplateEntry>(
         "remove.unnecessary.curly.brackets.from.string.template", javaClass()) {
 
-    class object {
+    companion object {
         val INSTANCE = RemoveCurlyBracesFromTemplateIntention()
         val pattern = Pattern.compile("[a-zA-Z0-9_].*")
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
index 642e0f47a1b..e228bc1fc0e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
@@ -68,7 +68,7 @@ public class ReplaceItWithExplicitFunctionLiteralParamIntention() : PsiElementBa
         return JetBundle.message("replace.it.with.explicit.function.literal.param.family")
     }
 
-    class object {
+    companion object {
         fun isAutoCreatedIt(simpleNameExpression: JetSimpleNameExpression): Boolean {
             if (simpleNameExpression.getReferencedName() != "it") {
                 return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt
index 05c19d773f7..1f50e7d1829 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions
 public class SwapBinaryExpression : JetSelfTargetingIntention<JetBinaryExpression>(
         "swap.binary.expression", javaClass()
 ) {
-    class object {
+    companion object {
         val SUPPORTED_OPERATIONS = setOf(PLUS, MUL, OROR, ANDAND, EQEQ, EXCLEQ, EQEQEQ, EXCLEQEQEQ, GT, LT, GTEQ, LTEQ)
 
         val SUPPORTED_OPERATION_NAMES = SUPPORTED_OPERATIONS.map { OperatorConventions.BINARY_OPERATION_NAMES[it]?.asString() }.toSet().filterNotNull() +
diff --git a/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt
index 43a9e1f08a2..f330d4ef2ef 100644
--- a/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt
@@ -40,7 +40,7 @@ import com.intellij.util.WaitForProgressToShow
 import com.intellij.openapi.application.ApplicationManager
 
 public class CreateIncrementalCompilationBackup: AnAction("Create backup for debugging Kotlin incremental compilation") {
-    class object {
+    companion object {
         val BACKUP_DIR_NAME = ".backup"
         val PATCHES_TO_CREATE = 5
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt
index 271ec530941..9ec0a9466ff 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddInitKeywordFix.kt
@@ -38,7 +38,7 @@ public class AddInitKeywordFix(element: JetClassInitializer) : JetIntentionActio
         addInitKeyword(file, element)
     }
 
-    class object Factory : JetSingleIntentionActionFactory() {
+    companion object Factory : JetSingleIntentionActionFactory() {
         fun addInitKeyword(file: JetFile, element: JetClassInitializer) {
             if (element.hasInitKeyword()) return
 
@@ -79,7 +79,7 @@ public class AddInitKeywordFixInWholeProjectFix(elem: JetClassInitializer) : Jet
         }
     }
 
-    class object Factory : JetSingleIntentionActionFactory() {
+    companion object Factory : JetSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
                 diagnostic.getPsiElement().getNonStrictParentOfType<JetClassInitializer>()?.let {
                     AddInitKeywordFixInWholeProjectFix(it)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
index dc6123198f3..ee21159087a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
@@ -164,7 +164,7 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<Jet
             PsiShortNamesCache.getInstance(jetFile.getProject())
     }
 
-    class object {
+    companion object {
         private val ERRORS = setOf(Errors.UNRESOLVED_REFERENCE, Errors.UNRESOLVED_REFERENCE_WRONG_RECEIVER)
 
         public fun createFactory(): JetSingleIntentionActionFactory {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ClassObjectToDefaultObjectFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ClassObjectToDefaultObjectFix.kt
index edacc90d49e..696722620d6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ClassObjectToDefaultObjectFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ClassObjectToDefaultObjectFix.kt
@@ -33,7 +33,7 @@ public class ClassObjectToCompanionObjectFix(private val elem: JetObjectDeclarat
         classKeywordToCompanionModifier(elem)
     }
 
-    class object Factory : JetSingleIntentionActionFactory() {
+    companion object Factory : JetSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
                 (diagnostic.getPsiElement() as? JetObjectDeclaration)?.let { ClassObjectToCompanionObjectFix(it) }
 
@@ -66,7 +66,7 @@ public class ClassObjectToCompanionObjectInWholeProjectFix(private val elem: Jet
         }
     }
 
-    class object Factory : JetSingleIntentionActionFactory() {
+    companion object Factory : JetSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
                 (diagnostic.getPsiElement() as? JetObjectDeclaration)?.let { ClassObjectToCompanionObjectInWholeProjectFix(it) }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
index bd528899aa8..6012fe8930b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
@@ -183,7 +183,7 @@ abstract class OutputValueBoxer(val outputValues: List<OutputValue>) {
             assert(outputValues.size() <= 3, "At most 3 output values are supported")
         }
 
-        class object {
+        companion object {
             private val selectors = array("first", "second", "third")
         }
 
@@ -330,7 +330,7 @@ enum class ExtractionTarget(val name: String) {
 
     abstract fun isAvailable(descriptor: ExtractableCodeDescriptor): Boolean
 
-    class object {
+    companion object {
         fun checkNotTrait(descriptor: ExtractableCodeDescriptor): Boolean {
             val parent = descriptor.extractionData.targetSibling.getStrictParentOfType<JetDeclaration>()
             return !(parent is JetClass && parent.isTrait())
@@ -367,7 +367,7 @@ data class ExtractionGeneratorOptions(
         val allowDummyName: Boolean = false,
         val allowExpressionBody: Boolean = true
 ) {
-    class object {
+    companion object {
         val DEFAULT = ExtractionGeneratorOptions()
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
index 38404f38ea2..5577e4e0481 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
@@ -49,7 +49,7 @@ data class ExtractionOptions(
         val extractAsProperty: Boolean = false,
         val allowSpecialClassNames: Boolean = false
 ) {
-    class object {
+    companion object {
         val DEFAULT = ExtractionOptions()
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt
index c137aaa474c..5312acf38cf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionEngine.kt
@@ -50,7 +50,7 @@ public open class ExtractionEngineHelper {
         continuation(ExtractionGeneratorConfiguration(descriptorWithConflicts.descriptor, ExtractionGeneratorOptions.DEFAULT))
     }
 
-    class object {
+    companion object {
         public val DEFAULT: ExtractionEngineHelper = ExtractionEngineHelper()
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
index 32ad133f687..02dc81f3263 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
@@ -96,7 +96,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(
         val project: Project,
         val options: MoveKotlinTopLevelDeclarationsOptions,
         val mover: Mover = Mover.Default) : BaseRefactoringProcessor(project) {
-    class object {
+    companion object {
         private val LOG: Logger = Logger.getInstance(javaClass<MoveKotlinTopLevelDeclarationsProcessor>())
 
         private val REFACTORING_NAME: String = JetRefactoringBundle.message("refactoring.move.top.level.declarations")
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
index 0e16e6e7f48..efe21a1838e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
@@ -132,7 +132,7 @@ public class JetPsiUnifier(
         parameters: Collection<UnifierParameter> = Collections.emptySet(),
         val allowWeakMatches: Boolean = false
 ) {
-    class object {
+    companion object {
         val DEFAULT = JetPsiUnifier()
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt b/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt
index babfc90e9f6..a47294bf7b0 100644
--- a/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt
+++ b/idea/src/org/jetbrains/kotlin/plugin/findUsages/handlers/KotlinFindUsagesHandlerDecorator.kt
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.find.findUsages.FindUsagesHandler
 
 public trait KotlinFindUsagesHandlerDecorator {
-    class object {
+    companion object {
         public val EP_NAME: ExtensionPointName<KotlinFindUsagesHandlerDecorator> = ExtensionPointName.create("org.jetbrains.kotlin.findUsagesHandlerDecorator")!!
     }
 
diff --git a/idea/testData/refactoring/rename/defaultObject/after/usage.kt b/idea/testData/refactoring/rename/defaultObject/after/usage.kt
index b3b0f6e67be..55bbe82b1b1 100644
--- a/idea/testData/refactoring/rename/defaultObject/after/usage.kt
+++ b/idea/testData/refactoring/rename/defaultObject/after/usage.kt
@@ -1,5 +1,5 @@
 fun main(args: Array<String>) {
-    // class object usages
+    // companion object usages
     Foo.f()
     val x = Foo
 
diff --git a/idea/testData/refactoring/rename/defaultObject/before/usage.kt b/idea/testData/refactoring/rename/defaultObject/before/usage.kt
index 7dd3eea95cc..48a837993b1 100644
--- a/idea/testData/refactoring/rename/defaultObject/before/usage.kt
+++ b/idea/testData/refactoring/rename/defaultObject/before/usage.kt
@@ -1,5 +1,5 @@
 fun main(args: Array<String>) {
-    // class object usages
+    // companion object usages
     Foo.f()
     val x = Foo
 
diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/usage.kt b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/usage.kt
index b3b0f6e67be..55bbe82b1b1 100644
--- a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/usage.kt
+++ b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/after/usage.kt
@@ -1,5 +1,5 @@
 fun main(args: Array<String>) {
-    // class object usages
+    // companion object usages
     Foo.f()
     val x = Foo
 
diff --git a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt
index 86c214c2e8f..67e50a1ad51 100644
--- a/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt
+++ b/idea/testData/refactoring/rename/defaultObjectWithDefaultName/before/usage.kt
@@ -1,5 +1,5 @@
 fun main(args: Array<String>) {
-    // class object usages
+    // companion object usages
     Foo.f()
     val x = Foo
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt
index da3c1b209ac..d4da2b0e1ce 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt
@@ -25,7 +25,7 @@ import org.junit.Assert
 import junit.framework.AssertionFailedError
 
 public abstract class AbstractReferenceResolveInLibrarySourcesTest : JetLightCodeInsightFixtureTestCase() {
-    class object {
+    companion object {
         private val REF_CARET_MARKER = "<ref-caret>"
     }
 
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
index eb8f702432e..69fdf1ffd44 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
@@ -57,7 +57,7 @@ class Converter private(
 
     public val specialContext: PsiElement? = personalState.specialContext
 
-    class object {
+    companion object {
         public fun create(elementToConvert: PsiElement, settings: ConverterSettings, conversionScope: ConversionScope,
                           referenceSearcher: ReferenceSearcher, resolverForConverter: ResolverForConverter, postProcessor: PostProcessor?,
                           usageProcessingsCollector: (UsageProcessing) -> Unit): Converter {
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ConverterSettings.kt b/j2k/src/org/jetbrains/kotlin/j2k/ConverterSettings.kt
index 5e1071fe213..d5f3d5c693e 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ConverterSettings.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ConverterSettings.kt
@@ -23,7 +23,7 @@ public data class ConverterSettings(
         var openByDefault: Boolean
 ) {
 
-    class object {
+    companion object {
         public val defaultSettings: ConverterSettings = ConverterSettings(
                 forceNotNullTypes = true,
                 specifyLocalVariableTypeByDefault = false,
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt
index cf3b5a1faf5..0374e2df1db 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt
@@ -94,7 +94,7 @@ object DocCommentConverter {
     private class HtmlToMarkdownConverter() : XmlRecursiveElementVisitor() {
         private enum class ListType { Ordered; Unordered }
         data class MarkdownSpan(val prefix: String, val suffix: String) {
-            class object {
+            companion object {
                 val Empty = MarkdownSpan("", "")
 
                 fun wrap(text: String) = MarkdownSpan(text, text)
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
index 704b369a229..73c1f4c2f5b 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
@@ -499,7 +499,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
         return ""
     }
 
-    class object {
+    companion object {
         private val needQualifierNameSet = setOf("java.lang.Byte", "java.lang.Double", "java.lang.Float", "java.lang.Long", "java.lang.Short")
     }
 }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
index 81616c7fd7f..1042d7aaac3 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
@@ -410,7 +410,7 @@ class TypeConverter(val converter: Converter) {
         }
     }
 
-    class object {
+    companion object {
         private val boxingTypes: Set<String> = setOf(
                 CommonClassNames.JAVA_LANG_BYTE,
                 CommonClassNames.JAVA_LANG_CHARACTER,
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt
index bd336a26358..8dee4a03700 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeVisitor.kt
@@ -115,7 +115,7 @@ class TypeVisitor(
         return VarArgType(typeConverter.convertType(ellipsisType.getComponentType()))
     }
 
-    class object {
+    companion object {
         private val toKotlinTypesMap: Map<String, String> = mapOf(
                 CommonClassNames.JAVA_LANG_OBJECT to "kotlin.Any",
                 CommonClassNames.JAVA_LANG_BYTE to "kotlin.Byte",
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt
index a932e537ec0..178842b083e 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Annotation.kt
@@ -64,7 +64,7 @@ class Annotations(val annotations: List<Annotation>) : Element() {
 
     fun plus(other: Annotations) = Annotations(annotations + other.annotations).assignNoPrototype()
 
-    class object {
+    companion object {
         val Empty = Annotations(listOf())
     }
 }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Block.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Block.kt
index 6eda4e4277f..344a899e995 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Block.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Block.kt
@@ -31,7 +31,7 @@ class Block(val statements: List<Statement>, val lBrace: LBrace, val rBrace: RBr
         builder.append(lBrace).append(statements, "\n", "\n", "\n").append(rBrace)
     }
 
-    class object {
+    companion object {
         val Empty = Block(listOf(), LBrace(), RBrace())
     }
 }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt
index 433f5e2cc4e..747c5966385 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt
@@ -88,7 +88,7 @@ abstract class Element {
         override val isEmpty: Boolean get() = true
     }
 
-    class object {
+    companion object {
         var saveCreationStacktraces = false
     }
 }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Identifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Identifier.kt
index d3ed47069b6..fc3292598ad 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Identifier.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Identifier.kt
@@ -51,7 +51,7 @@ class Identifier(
 
     override fun toString() = if (isNullable) "$name?" else name
 
-    class object {
+    companion object {
         val Empty = Identifier("")
 
         private val KEYWORDS = JetTokens.KEYWORDS.getTypes().map { (it as JetKeywordToken).getValue() }.toSet()
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/MethodCallExpression.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/MethodCallExpression.kt
index b57bffbafad..703016abf43 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/MethodCallExpression.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/MethodCallExpression.kt
@@ -36,7 +36,7 @@ class MethodCallExpression(
         }
     }
 
-    class object {
+    companion object {
         public fun buildNotNull(receiver: Expression?,
                                 methodName: String,
                                 arguments: List<Expression> = listOf(),
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt
index 16ce9361a57..d3e63afb081 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Modifier.kt
@@ -59,7 +59,7 @@ class Modifiers(modifiers: Collection<Modifier>) : Element() {
 
     fun accessModifier(): Modifier? = modifiers.firstOrNull { it in ACCESS_MODIFIERS }
 
-    class object {
+    companion object {
         val Empty = Modifiers(listOf())
     }
 }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt
index d7ee697bc9d..38db2f9827c 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt
@@ -54,7 +54,7 @@ class TypeParameterList(val parameters: List<TypeParameter>) : Element() {
 
     private fun hasWhere(): Boolean = parameters.any { it.hasWhere() }
 
-    class object {
+    companion object {
         val Empty = TypeParameterList(listOf())
     }
 }
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index a0ea2f9afb3..d2459a0692e 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -70,7 +70,7 @@ import org.jetbrains.kotlin.utils.sure
 import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
 
 public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
-    class object {
+    companion object {
         public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder"
 
         private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession")
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
index 953d3f8a2a4..bb8cb572793 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
@@ -55,7 +55,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin"
 
 
 class CacheFormatVersion(targetDataRoot: File) {
-    class object {
+    companion object {
         // Change this when incremental cache format changes
         private val INCREMENTAL_CACHE_OWN_VERSION = 2
         private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION
@@ -82,7 +82,7 @@ class CacheFormatVersion(targetDataRoot: File) {
 }
 
 public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache {
-    class object {
+    companion object {
         val PROTO_MAP = "proto.tab"
         val CONSTANTS_MAP = "constants.tab"
         val INLINE_FUNCTIONS = "inline-functions.tab"
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt
index 9b27dc8647e..2665cd67063 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt
@@ -29,7 +29,7 @@ class LocalFileKotlinClass private(
         innerClasses: FileBasedKotlinClass.InnerClassesInfo
 ) : FileBasedKotlinClass(className, classHeader, innerClasses) {
 
-    class object {
+    companion object {
         fun create(file: File): LocalFileKotlinClass? {
             val fileContents = file.readBytes()
             return FileBasedKotlinClass.create(fileContents) {
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index 779125bf233..0c71eddfa84 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -51,7 +51,7 @@ import org.jetbrains.jps.api.CanceledStatus
 import org.jetbrains.jps.builders.java.dependencyView.Callbacks
 
 public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
-    class object {
+    companion object {
         val COMPILATION_FAILED = "COMPILATION FAILED"
 
         // change to "/tmp" or anything when default is too long (for easier debugging)
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
index 029347e5090..538b0ce2236 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt
@@ -29,7 +29,7 @@ import java.io.File
  * with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime
  */
 public class ClasspathOrderTest : TestCaseWithTmpdir() {
-    class object {
+    companion object {
         val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile()
     }
 
diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt
index 27a87a9d9dc..aca9ef13242 100644
--- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt
+++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/jsScopes.kt
@@ -80,7 +80,7 @@ public open class JsFunctionScope(parent: JsScope, description: String) : JsScop
                 || getParent()?.hasOwnName(name) ?: false
     }
 
-    class object {
+    companion object {
         public val RESERVED_WORDS: Set<String> = setOf(
                 // keywords
                 "await", "break", "case", "catch", "continue", "debugger", "default", "delete", "do", "else", "finally", "for", "function", "if",
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt
index 0294226b61c..e5c24397a8f 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt
@@ -28,7 +28,7 @@ public enum class PredefinedAnnotation(fqName: String) {
 
     public val fqName: FqName = FqName(fqName)
 
-    class object {
+    companion object {
         // TODO: replace with straight assignment when KT-5761 will be fixed
         val WITH_CUSTOM_NAME by Delegates.lazy { setOf(LIBRARY, NATIVE) }
     }
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt
index bd97068d04c..fd5677e8f13 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt
@@ -28,7 +28,7 @@ public class JsAnalysisResult(
         moduleDescriptor: ModuleDescriptor
 ) : AnalysisResult(bindingTrace.getBindingContext(), moduleDescriptor) {
 
-    class object {
+    companion object {
         platformStatic public fun success(trace: BindingTrace, module: ModuleDescriptor): JsAnalysisResult {
             return JsAnalysisResult(trace, module)
         }
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt
index fac2a7c154b..9a4cf2dd0d5 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt
@@ -54,7 +54,7 @@ import org.jetbrains.kotlin.resolve.TemporaryBindingTrace
 
 public class JsCallChecker : CallChecker {
 
-    class object {
+    companion object {
         private val JS_PATTERN: DescriptorPredicate = PatternBuilder.pattern("kotlin.js.js(String)")
 
         platformStatic
diff --git a/js/js.libraries/src/core/dom.kt b/js/js.libraries/src/core/dom.kt
index 87f5e3ea25a..2d910cb32af 100644
--- a/js/js.libraries/src/core/dom.kt
+++ b/js/js.libraries/src/core/dom.kt
@@ -93,7 +93,7 @@ native public trait DOMError {
     public val severity: Short
     public val type: String
 
-    public class object {
+    public companion object {
         public val SEVERITY_ERROR: Short = 2
         public val SEVERITY_FATAL_ERROR: Short = 3
         public val SEVERITY_WARNING: Short = 1
@@ -221,7 +221,7 @@ native public trait Node {
     public fun replaceChild(arg1: Node, arg2: Node): Node = noImpl
     public fun setUserData(arg1: String?, arg2: Any, arg3: UserDataHandler): Any = noImpl
 
-    public class object {
+    public companion object {
         public val ATTRIBUTE_NODE: Short = 2
         public val CDATA_SECTION_NODE: Short = 4
         public val COMMENT_NODE: Short = 8
@@ -270,7 +270,7 @@ native public trait TypeInfo {
     public val typeNamespace: String
     public fun isDerivedFrom(arg1: String?, arg2: String?, arg3: Int): Boolean = noImpl
 
-    public class object {
+    public companion object {
         public val DERIVATION_EXTENSION: Int = 2
         public val DERIVATION_LIST: Int = 8
         public val DERIVATION_RESTRICTION: Int = 1
@@ -281,7 +281,7 @@ native public trait TypeInfo {
 native public trait UserDataHandler {
     public fun handle(arg1: Short, arg2: String?, arg3: Any, arg4: Node, arg5: Node): Unit = noImpl
 
-    public class object {
+    public companion object {
         public val NODE_ADOPTED: Short = 5
         public val NODE_CLONED: Short = 1
         public val NODE_DELETED: Short = 3
diff --git a/js/js.libraries/src/core/domEvents.kt b/js/js.libraries/src/core/domEvents.kt
index 7c766d78021..6228909626a 100644
--- a/js/js.libraries/src/core/domEvents.kt
+++ b/js/js.libraries/src/core/domEvents.kt
@@ -29,7 +29,7 @@ native public trait Event {
     public fun preventDefault(): Unit = noImpl
     public fun stopPropagation(): Unit = noImpl
 
-    public class object {
+    public companion object {
         public val AT_TARGET: Short = 2
         public val BUBBLING_PHASE: Short = 3
         public val CAPTURING_PHASE: Short = 1
@@ -64,7 +64,7 @@ native public trait MutationEvent: Event {
     public val relatedNode: Node
     public fun initMutationEvent(arg1: String?, arg2: Boolean, arg3: Boolean, arg4: Node, arg5: String?, arg6: String?, arg7: String?, arg8: Short): Unit = noImpl
 
-    public class object {
+    public companion object {
         public val ADDITION: Short = 2
         public val MODIFICATION: Short = 1
         public val REMOVAL: Short = 3
diff --git a/js/js.translator/testData/delegation/cases/onObject.kt b/js/js.translator/testData/delegation/cases/onObject.kt
index 5ff8e5759c4..6fcfedcbae8 100644
--- a/js/js.translator/testData/delegation/cases/onObject.kt
+++ b/js/js.translator/testData/delegation/cases/onObject.kt
@@ -9,7 +9,7 @@ class TImpl(val v: String) : T {
 }
 
 class A {
-    class object : T by TImpl("A.Default")
+    companion object : T by TImpl("A.Default")
 }
 
 object B : T by TImpl("B")
diff --git a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/CompilerPlugin.kt b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/CompilerPlugin.kt
index 864203051c8..ff5db5bc077 100644
--- a/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/CompilerPlugin.kt
+++ b/libraries/examples/kotlin-gradle-subplugin-example/src/main/kotlin/example/CompilerPlugin.kt
@@ -31,7 +31,7 @@ public object ExampleConfigurationKeys {
 }
 
 public class ExampleCommandLineProcessor : CommandLineProcessor {
-    class object {
+    companion object {
         public val EXAMPLE_PLUGIN_ID: String = "example.plugin"
         public val EXAMPLE_OPTION: CliOption = CliOption("exampleKey", "<value>", "")
     }
diff --git a/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt
index 3f5f969aa81..e54a6e9e583 100644
--- a/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt
+++ b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt
@@ -48,7 +48,7 @@ public abstract class FunctionalList<T>(public val size: Int) {
 
     private class Standard<T>(override val head: T, override val tail: FunctionalList<T>) : FunctionalList<T>(tail.size + 1)
 
-    class object {
+    companion object {
         public fun <T> emptyList(): FunctionalList<T> = Empty<T>()
 
         public fun <T> of(element: T): FunctionalList<T> = FunctionalList.Standard<T>(element, emptyList())
diff --git a/libraries/tools/kotlin-js-tests-junit/src/test/kotlin/tests/SeleniumTestSuite.kt b/libraries/tools/kotlin-js-tests-junit/src/test/kotlin/tests/SeleniumTestSuite.kt
index 5f0cb0d9cc1..e27e52426e9 100644
--- a/libraries/tools/kotlin-js-tests-junit/src/test/kotlin/tests/SeleniumTestSuite.kt
+++ b/libraries/tools/kotlin-js-tests-junit/src/test/kotlin/tests/SeleniumTestSuite.kt
@@ -14,7 +14,7 @@ public class SeleniumTest(val id: String) {
         println("Testing $id")
     }
 
-    class object {
+    companion object {
         Parameters public fun findSeleniumUris(): List<String> {
             return arrayList("a", "b")
         }
diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateJavaScriptStubs.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateJavaScriptStubs.kt
index f35778d01a1..2819c3d9b9d 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateJavaScriptStubs.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateJavaScriptStubs.kt
@@ -150,7 +150,7 @@ $imports
             if (fields != null) {
                 if (fields.isNotEmpty()) {
                     println("")
-                    println("    public class object {")
+                    println("    public companion object {")
                     for (field in fields) {
                         if (field != null) {
                             val modifiers = field.getModifiers()
diff --git a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
index 7f653601b08..35bc2c66983 100644
--- a/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
+++ b/plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
@@ -41,7 +41,7 @@ public object AndroidConfigurationKeys {
 }
 
 public class AndroidCommandLineProcessor : CommandLineProcessor {
-    class object {
+    companion object {
         public val ANDROID_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.android"
 
         public val RESOURCE_PATH_OPTION: CliOption = CliOption("androidRes", "<path>", "Android resources path")
diff --git a/plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt b/plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt
index fba8bf7ec70..97cec39e629 100644
--- a/plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt
+++ b/plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt
@@ -51,7 +51,7 @@ private enum class AndroidClassType(val internalClassName: String, val supportsC
 }
 
 public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
-    class object {
+    companion object {
         private val PROPERTY_NAME = "_\$_findViewCache"
         private val CACHED_FIND_VIEW_BY_ID_METHOD_NAME = "_\$_findCachedViewById"
         private val CLEAR_CACHE_METHOD_NAME = "_\$_clearFindViewByIdCache"
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt
index 2aa84caf7d9..4eca04c4260 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt
@@ -70,7 +70,7 @@ public abstract class AndroidResourceManager(val project: Project) {
         return VirtualFileManager.getInstance().findFileByUrl("file://" + info.mainResDirectory)
     }
 
-    class object {
+    companion object {
         public fun getInstance(module: Module): AndroidResourceManager {
             val service = ModuleServiceManager.getService<AndroidResourceManager>(module, javaClass<AndroidResourceManager>())
             return service ?: module.getComponent<AndroidResourceManager>(javaClass<AndroidResourceManager>())
diff --git a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt
index 255cdd7cd43..02d8504c71d 100644
--- a/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt
+++ b/plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt
@@ -149,7 +149,7 @@ public abstract class AndroidUIXmlProcessor(protected val project: Project) {
         return CachedValuesManager.getManager(project).createCachedValue(result, false)
     }
 
-    class object {
+    companion object {
         private val EXPLICIT_FLEXIBLE_PACKAGE = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.getPackageFqName().asString()
         private val EXPLICIT_FLEXIBLE_CLASS_NAME = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.getRelativeClassName().asString()
 
diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fragment/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/fragment/0.kt
index cc443493eba..5b2ee294ddb 100644
--- a/plugins/android-compiler-plugin/testData/codegen/android/fragment/0.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/android/fragment/0.kt
@@ -10,7 +10,7 @@ import kotlinx.android.synthetic.layout.*
 
 class R {
     class id {
-        class object {
+        companion object {
             val login = 5
         }
     }
diff --git a/plugins/android-compiler-plugin/testData/codegen/android/fragment/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/fragment/1.kt
index 67bddb3723e..92470a6b4cf 100644
--- a/plugins/android-compiler-plugin/testData/codegen/android/fragment/1.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/android/fragment/1.kt
@@ -10,7 +10,7 @@ import kotlinx.android.synthetic.layout.*
 
 class R {
     class id {
-        class object {
+        companion object {
             val login = 5
         }
     }
diff --git a/plugins/android-compiler-plugin/testData/codegen/android/view/0.kt b/plugins/android-compiler-plugin/testData/codegen/android/view/0.kt
index 39b66e7ab89..7071504ff93 100644
--- a/plugins/android-compiler-plugin/testData/codegen/android/view/0.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/android/view/0.kt
@@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout.view.*
 
 class R {
     class id {
-        class object {
+        companion object {
             val container = 0
             val login = 1
         }
diff --git a/plugins/android-compiler-plugin/testData/codegen/android/view/1.kt b/plugins/android-compiler-plugin/testData/codegen/android/view/1.kt
index 934a378b0f8..a31b20205b3 100644
--- a/plugins/android-compiler-plugin/testData/codegen/android/view/1.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/android/view/1.kt
@@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout.view.*
 
 class R {
     class id {
-        class object {
+        companion object {
             val container = 0
             val login = 1
         }
diff --git a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt
index e00e6bed986..9537871fe1a 100644
--- a/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt
+++ b/plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidPsiTreeChangePreprocessor.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.lang.resolve.android.AndroidResourceManager
 
 public class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, SimpleModificationTracker() {
 
-    class object {
+    companion object {
         private val HANDLED_EVENTS = setOf(
                 PsiTreeChangeEventImpl.PsiEventType.CHILD_ADDED,
                 PsiTreeChangeEventImpl.PsiEventType.CHILD_MOVED,
diff --git a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt b/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
index 2ce415563eb..b7bd4fc3e62 100644
--- a/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
+++ b/plugins/android-jps-plugin/src/KotlinAndroidJpsPlugin.kt
@@ -66,7 +66,7 @@ public class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
         return AndroidJpsUtil.getManifestFileForCompilationPath(extension)!!.getAbsolutePath()
     }
 
-    class object {
+    companion object {
         private val JAR_FILE_NAME = "android-compiler-plugin.jar"
         private val ANDROID_COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.android"