diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index 60f6587d2a1..2aecc633e25 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -1908,7 +1908,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
         if (descriptor instanceof PropertyDescriptor) {
             PropertyDescriptor propertyDescriptor = (PropertyDescriptor) descriptor;
 
-            Collection<ExpressionCodegenExtension> codegenExtensions = ExpressionCodegenExtension.OBJECT$.getInstances(state.getProject());
+            Collection<ExpressionCodegenExtension> codegenExtensions = ExpressionCodegenExtension.Companion.getInstances(state.getProject());
             if (!codegenExtensions.isEmpty() && resolvedCall != null) {
                 ExpressionCodegenExtension.Context context = new ExpressionCodegenExtension.Context(typeMapper, v);
                 JetType returnType = propertyDescriptor.getReturnType();
@@ -2348,7 +2348,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
         if (!(resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor)) { // otherwise already
             receiver = StackValue.receiver(resolvedCall, receiver, this, callableMethod);
 
-            Collection<ExpressionCodegenExtension> codegenExtensions = ExpressionCodegenExtension.OBJECT$.getInstances(state.getProject());
+            Collection<ExpressionCodegenExtension> codegenExtensions = ExpressionCodegenExtension.Companion.getInstances(state.getProject());
             if (!codegenExtensions.isEmpty()) {
                 ExpressionCodegenExtension.Context context = new ExpressionCodegenExtension.Context(typeMapper, v);
                 for (ExpressionCodegenExtension extension : codegenExtensions) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index 29d73e2c329..6928ef728f5 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -388,7 +388,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
 
         genClosureFields(context.closure, v, typeMapper);
 
-        for (ExpressionCodegenExtension extension : ExpressionCodegenExtension.OBJECT$.getInstances(state.getProject())) {
+        for (ExpressionCodegenExtension extension : ExpressionCodegenExtension.Companion.getInstances(state.getProject())) {
             extension.generateClassSyntheticParts(v, state, myClass, descriptor);
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 8420463b76f..cdf7066dd90 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -138,7 +138,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
         writeInnerClasses();
 
         if (sourceMapper != null) {
-            SourceMapper.OBJECT$.flushToClassBuilder(sourceMapper, v);
+            SourceMapper.Companion.flushToClassBuilder(sourceMapper, v);
         }
 
         v.done();
@@ -520,7 +520,7 @@ public abstract class MemberCodegen<T extends JetElement/* TODO: & JetDeclaratio
     @NotNull
     public SourceMapper getOrCreateSourceMapper() {
         if (sourceMapper == null) {
-            sourceMapper = new DefaultSourceMapper(SourceInfo.OBJECT$.createInfo(element, getClassName()), null);
+            sourceMapper = new DefaultSourceMapper(SourceInfo.Companion.createInfo(element, getClassName()), null);
         }
         return sourceMapper;
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
index 08fd0fb1020..77c9e02456d 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
@@ -161,7 +161,7 @@ public class AnonymousObjectTransformer {
 
         if (!inliningContext.isInliningLambda) {
             if (debugInfo != null && !debugInfo.isEmpty()) {
-                sourceMapper = SourceMapper.OBJECT$.createFromSmap(SMAPParser.parse(debugInfo));
+                sourceMapper = SourceMapper.Companion.createFromSmap(SMAPParser.parse(debugInfo));
             }
             else {
                 //seems we can't do any clever mapping cause we don't know any about original class name
@@ -195,7 +195,7 @@ public class AnonymousObjectTransformer {
 
         result.addAllClassesToRemove(constructorResult);
 
-        SourceMapper.OBJECT$.flushToClassBuilder(sourceMapper, classBuilder);
+        SourceMapper.Companion.flushToClassBuilder(sourceMapper, classBuilder);
 
         classBuilder.done();
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java
index 5e2eef14e3c..901c4f5683a 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java
@@ -299,8 +299,8 @@ public class JetCoreEnvironment {
 
         project.registerService(VirtualFileFinderFactory.class, new CliVirtualFileFinderFactory(classPath));
 
-        ExternalDeclarationsProvider.OBJECT$.registerExtensionPoint(project);
-        ExpressionCodegenExtension.OBJECT$.registerExtensionPoint(project);
+        ExternalDeclarationsProvider.Companion.registerExtensionPoint(project);
+        ExpressionCodegenExtension.Companion.registerExtensionPoint(project);
 
         for (ComponentRegistrar registrar : configuration.getList(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS)) {
             registrar.registerProjectComponents(project, configuration);
diff --git a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
index 8e7892fb6c0..7e6cac467b8 100644
--- a/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
+++ b/compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java
@@ -2,13 +2,13 @@ package test;
 
 class ClassObject {
     void accessToClassObject() {
-        WithClassObject.OBJECT$.foo();
-        WithClassObject.OBJECT$.getValue();
-        WithClassObject.OBJECT$.getValueWithGetter();
-        WithClassObject.OBJECT$.getVariable();
-        WithClassObject.OBJECT$.setVariable(0);
-        WithClassObject.OBJECT$.getVariableWithAccessors();
-        WithClassObject.OBJECT$.setVariableWithAccessors(0);
+        WithClassObject.Companion.foo();
+        WithClassObject.Companion.getValue();
+        WithClassObject.Companion.getValueWithGetter();
+        WithClassObject.Companion.getVariable();
+        WithClassObject.Companion.setVariable(0);
+        WithClassObject.Companion.getVariableWithAccessors();
+        WithClassObject.Companion.setVariableWithAccessors(0);
     }
 
     void accessToPackageObject() {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java
index 70d3636198e..5d26c4903ca 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java
@@ -34,7 +34,7 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
     public void visitSimpleNameExpression(@NotNull JetSimpleNameExpression expression) {
         PsiReference ref = expression.getReference();
         if (ref == null) return;
-        if (JetPsiChecker.OBJECT$.getNamesHighlightingEnabled()) {
+        if (JetPsiChecker.Companion.getNamesHighlightingEnabled()) {
             DeclarationDescriptor referenceTarget = bindingContext.get(BindingContext.REFERENCE_TARGET, expression);
             if (referenceTarget instanceof ConstructorDescriptor) {
                 referenceTarget = referenceTarget.getContainingDeclaration();
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java
index d2955b10fa8..c1e053890f0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java
@@ -46,7 +46,7 @@ public class JetPsiCheckerAndHighlightingUpdater extends JetPsiChecker {
         PsiElement grandParent = parameter.getParent().getParent();
         if (grandParent instanceof JetNamedFunction) {
             JetNamedFunction function = (JetNamedFunction) grandParent;
-            return UnusedSymbolInspection.OBJECT$.isEntryPoint(function);
+            return UnusedSymbolInspection.Companion.isEntryPoint(function);
         }
         return false;
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
index f2b771605b7..098bbc67f9c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java
@@ -129,7 +129,7 @@ public class QuickFixRegistrar {
         QuickFixes.factories.put(NO_BACKING_FIELD_CUSTOM_ACCESSORS, changeToPropertyNameFactory);
         QuickFixes.factories.put(INACCESSIBLE_BACKING_FIELD, changeToPropertyNameFactory);
 
-        JetSingleIntentionActionFactory unresolvedReferenceFactory = AutoImportFix.OBJECT$.createFactory();
+        JetSingleIntentionActionFactory unresolvedReferenceFactory = AutoImportFix.Companion.createFactory();
         QuickFixes.factories.put(UNRESOLVED_REFERENCE, unresolvedReferenceFactory);
         QuickFixes.factories.put(UNRESOLVED_REFERENCE_WRONG_RECEIVER, unresolvedReferenceFactory);
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
index 6db92b0bd44..17793078d25 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
@@ -263,7 +263,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
                     final JetExpression originalBody = originalDeclaration.getBodyExpression();
                     assert originalBody != null : "Original body is not found: " + originalDeclaration;
 
-                    JetDeclarationWithBody newDeclaration = ConvertToBlockBodyAction.OBJECT$.convert(originalDeclaration);
+                    JetDeclarationWithBody newDeclaration = ConvertToBlockBodyAction.Companion.convert(originalDeclaration);
 
                     JetBlockExpression newCommonContainer = (JetBlockExpression) newDeclaration.getBodyExpression();
                     assert newCommonContainer != null : "New body is not found: " + newDeclaration;
diff --git a/idea/testData/kotlinAndJavaChecker/ClassObjects.java b/idea/testData/kotlinAndJavaChecker/ClassObjects.java
index 1c93e18d219..69fa62552ec 100644
--- a/idea/testData/kotlinAndJavaChecker/ClassObjects.java
+++ b/idea/testData/kotlinAndJavaChecker/ClassObjects.java
@@ -1,12 +1,12 @@
 class ClassObject {
     void foo() {
-        WithClassObject.OBJECT$.getValue();
-        WithClassObject.OBJECT$.getValue();
-        WithClassObject.OBJECT$.foo();
-        WithClassObject.OBJECT$.getValueWithGetter();
-        WithClassObject.OBJECT$.getVariable();
-        WithClassObject.OBJECT$.setVariable(0);
-        WithClassObject.OBJECT$.getVariableWithAccessors();
-        WithClassObject.OBJECT$.setVariableWithAccessors(0);
+        WithClassObject.Companion.getValue();
+        WithClassObject.Companion.getValue();
+        WithClassObject.Companion.foo();
+        WithClassObject.Companion.getValueWithGetter();
+        WithClassObject.Companion.getVariable();
+        WithClassObject.Companion.setVariable(0);
+        WithClassObject.Companion.getVariableWithAccessors();
+        WithClassObject.Companion.setVariableWithAccessors(0);
     }
 }
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java
index 204faa3584f..eacdd643761 100644
--- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java
@@ -38,11 +38,11 @@ public abstract class AbstractJetPsiCheckerTest extends JetLightCodeInsightFixtu
             //noinspection unchecked
             myFixture.enableInspections(SpellCheckingInspection.class);
 
-            JetPsiChecker.OBJECT$.setNamesHighlightingEnabled(false);
+            JetPsiChecker.Companion.setNamesHighlightingEnabled(false);
             checkHighlighting(true, true, false);
         }
         finally {
-            JetPsiChecker.OBJECT$.setNamesHighlightingEnabled(true);
+            JetPsiChecker.Companion.setNamesHighlightingEnabled(true);
         }
     }
 
diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java
index 2c4b8d5c07a..ac87a14892d 100644
--- a/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java
+++ b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java
@@ -94,7 +94,7 @@ public final class AnnotationsUtils {
         }
 
         for (DeclarationDescriptor descriptor : descriptors) {
-            for (PredefinedAnnotation annotation : PredefinedAnnotation.OBJECT$.getWITH_CUSTOM_NAME()) {
+            for (PredefinedAnnotation annotation : PredefinedAnnotation.Companion.getWITH_CUSTOM_NAME()) {
                 if (!hasAnnotationOrInsideAnnotatedClass(descriptor, annotation)) {
                     continue;
                 }