Replace object$ -> OBJECT$, instance$ -> INSTANCE$ in the project

compiler/backend/src/org/jetbrains/jet/codegen/ImplementationBodyCodegen.java

@@ -1235,7 +1235,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         boolean generateInitializerInOuter = isClassObjectWithBackingFieldsInOuter(descriptor);
         if (generateInitializerInOuter) {
             final ImplementationBodyCodegen parentCodegen = getParentBodyCodegen(this);
-            //generate object$
+            //generate OBJECT$
             parentCodegen.genInitSingleton(descriptor, StackValue.singleton(descriptor, typeMapper));
             generateInitializers(new Function0<ExpressionCodegen>() {
                 @Override

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java

@@ -158,8 +158,8 @@ public class CompileEnvironmentUtil {
             method.setAccessible(true);
             method.invoke(null);
 
-            ArrayList<Module> answer = new ArrayList<Module>(AllModules.instance$.get());
-            AllModules.instance$.get().clear();
+            ArrayList<Module> answer = new ArrayList<Module>(AllModules.INSTANCE$.get());
+            AllModules.INSTANCE$.get().clear();
             return answer;
         }
         catch (Exception e) {
@@ -303,7 +303,7 @@ public class CompileEnvironmentUtil {
                             }
                         }
                     }
-                    return Unit.instance$;
+                    return Unit.INSTANCE$;
                 }
             });
         }

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java

@@ -209,7 +209,7 @@ public class JetCoreEnvironment {
                                          @Override
                                          public Unit invoke(String s) {
                                              report(ERROR, s);
-                                             return Unit.instance$;
+                                             return Unit.INSTANCE$;
                                          }
                                      }));
         JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions(

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java

@@ -293,7 +293,7 @@ public class KotlinToJVMBytecodeCompiler {
                         BindingTrace sharedTrace = support.getTrace();
                         ModuleDescriptorImpl sharedModule = support.getModule();
 
-                        IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.object$.getInstance();
+                        IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.OBJECT$.getInstance();
                         File incrementalCacheBaseDir = environment.getConfiguration().get(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR);
                         final IncrementalCache incrementalCache;
                         if (incrementalCacheProvider != null && incrementalCacheBaseDir != null) {
@@ -345,7 +345,7 @@ public class KotlinToJVMBytecodeCompiler {
     ) {
         CompilerConfiguration configuration = environment.getConfiguration();
         File incrementalCacheDir = configuration.get(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR);
-        IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.object$.getInstance();
+        IncrementalCacheProvider incrementalCacheProvider = IncrementalCacheProvider.OBJECT$.getInstance();
 
         Collection<FqName> packagesWithRemovedFiles;
         if (incrementalCacheDir == null || moduleId == null || incrementalCacheProvider == null) {

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AnalyzerFacadeForJVM.java

@@ -119,7 +119,7 @@ public enum AnalyzerFacadeForJVM implements AnalyzerFacade {
     ) {
         GlobalContextImpl globalContext = ContextPackage.GlobalContext();
 
-        DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.object$
+        DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.OBJECT$
                 .createDeclarationProviderFactory(project, globalContext.getStorageManager(), syntheticFiles, filesScope);
 
         InjectorForLazyResolveWithJava resolveWithJava = new InjectorForLazyResolveWithJava(

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java

@@ -36,7 +36,7 @@ public class JavaPropertyInitializerEvaluatorImpl implements JavaPropertyInitial
         if (evaluatedExpression != null) {
             return ConstantsPackage.createCompileTimeConstant(
                     evaluatedExpression,
-                    ConstantExpressionEvaluator.object$.isPropertyCompileTimeConstant(descriptor),
+                    ConstantExpressionEvaluator.OBJECT$.isPropertyCompileTimeConstant(descriptor),
                     false,
                     true,
                     descriptor.getType());

compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java

@@ -216,7 +216,7 @@ public class JetControlFlowProcessor {
 
         @NotNull
         private Map<PseudoValue, TypePredicate> defaultTypeMap(List<PseudoValue> values) {
-            return PseudocodePackage.expectedTypeFor(AllTypes.instance$, values);
+            return PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, values);
         }
 
         private void mergeValues(@NotNull List<JetExpression> from, @NotNull JetExpression to) {
@@ -268,7 +268,7 @@ public class JetControlFlowProcessor {
         @NotNull
         private AccessTarget getResolvedCallAccessTarget(JetElement element) {
             ResolvedCall<?> resolvedCall = getResolvedCall(element, trace.getBindingContext());
-            return resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.instance$;
+            return resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$;
         }
 
         @NotNull
@@ -276,7 +276,7 @@ public class JetControlFlowProcessor {
             DeclarationDescriptor descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element);
             return descriptor instanceof VariableDescriptor
                    ? new AccessTarget.Declaration((VariableDescriptor) descriptor)
-                   : AccessTarget.BlackBox.instance$;
+                   : AccessTarget.BlackBox.INSTANCE$;
         }
 
         @Override
@@ -457,7 +457,7 @@ public class JetControlFlowProcessor {
             }
 
             Map<PseudoValue, ReceiverValue> receiverValues = SmartFMap.emptyMap();
-            AccessTarget accessTarget = AccessTarget.BlackBox.instance$;
+            AccessTarget accessTarget = AccessTarget.BlackBox.INSTANCE$;
             boolean unsupported = false;
             if (left instanceof JetSimpleNameExpression || left instanceof JetQualifiedExpression) {
                 accessTarget = getResolvedCallAccessTarget(PsiUtilPackage.getQualifiedElementSelector(left));
@@ -892,7 +892,7 @@ public class JetControlFlowProcessor {
             JetMultiDeclaration multiDeclaration = expression.getMultiParameter();
             JetExpression loopRange = expression.getLoopRange();
 
-            TypePredicate loopRangeTypePredicate = AllTypes.instance$;
+            TypePredicate loopRangeTypePredicate = AllTypes.INSTANCE$;
             ResolvedCall<?> iteratorResolvedCall = trace.get(BindingContext.LOOP_RANGE_ITERATOR_RESOLVED_CALL, loopRange);
             if (iteratorResolvedCall != null) {
                 ReceiverValue iteratorReceiver = getExplicitReceiverValue(iteratorResolvedCall);
@@ -1400,7 +1400,7 @@ public class JetControlFlowProcessor {
             TypePredicate expectedTypePredicate =
                     PseudocodePackage.getSubtypesPredicate(trace.get(BindingContext.TYPE, specifier.getTypeReference()));
             if (expectedTypePredicate == null) {
-                expectedTypePredicate = AllTypes.instance$;
+                expectedTypePredicate = AllTypes.INSTANCE$;
             }
             builder.magic(specifier, specifier, arguments, PseudocodePackage.expectedTypeFor(expectedTypePredicate, arguments), MagicKind.VALUE_CONSUMER);
         }

compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java

@@ -957,7 +957,7 @@ public class JetFlowInformationProvider {
         @Override
         public Unit invoke(Instruction instruction, D enterData, D exitData) {
             execute(instruction, enterData, exitData);
-            return Unit.instance$;
+            return Unit.INSTANCE$;
         }
 
         public abstract void execute(Instruction instruction, D enterData, D exitData);
@@ -967,7 +967,7 @@ public class JetFlowInformationProvider {
         @Override
         public Unit invoke(P p) {
             execute(p);
-            return Unit.instance$;
+            return Unit.INSTANCE$;
         }
 
         public abstract void execute(P p);

compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java

@@ -85,7 +85,7 @@ public class PseudocodeVariablesData {
                     if (variableDescriptor != null) {
                         result.add(variableDescriptor);
                     }
-                    return Unit.instance$;
+                    return Unit.INSTANCE$;
                 }
             });
             usedVariables = Collections.unmodifiableSet(result);

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetControlFlowInstructionsGenerator.java

@@ -418,7 +418,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
         @Override
         public InstructionWithValue loadStringTemplate(@NotNull JetStringTemplateExpression expression, @NotNull List<PseudoValue> inputValues) {
             if (inputValues.isEmpty()) return read(expression);
-            Map<PseudoValue, TypePredicate> predicate = PseudocodePackage.expectedTypeFor(AllTypes.instance$, inputValues);
+            Map<PseudoValue, TypePredicate> predicate = PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, inputValues);
             return magic(expression, expression, inputValues, predicate, MagicKind.STRING_TEMPLATE);
         }
 
@@ -431,7 +431,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
                 @NotNull Map<PseudoValue, TypePredicate> expectedTypes,
                 @NotNull MagicKind kind
         ) {
-            MagicInstruction instruction = MagicInstruction.object$.create(
+            MagicInstruction instruction = MagicInstruction.OBJECT$.create(
                     instructionElement, valueElement, getCurrentScope(), inputValues, expectedTypes, kind, valueFactory
             );
             add(instruction);
@@ -441,7 +441,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
         @NotNull
         @Override
         public MergeInstruction merge(@NotNull JetExpression expression, @NotNull List<PseudoValue> inputValues) {
-            MergeInstruction instruction = MergeInstruction.object$.create(expression, getCurrentScope(), inputValues, valueFactory);
+            MergeInstruction instruction = MergeInstruction.OBJECT$.create(expression, getCurrentScope(), inputValues, valueFactory);
             add(instruction);
             return instruction;
         }
@@ -465,7 +465,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
                 @NotNull Map<PseudoValue, ValueParameterDescriptor> arguments
         ) {
             JetType returnType = resolvedCall.getResultingDescriptor().getReturnType();
-            CallInstruction instruction = CallInstruction.object$.create(
+            CallInstruction instruction = CallInstruction.OBJECT$.create(
                     valueElement,
                     getCurrentScope(),
                     resolvedCall,
@@ -492,7 +492,7 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
                     expectedTypes = PseudocodePackage.expectedTypeFor(onlyBoolean, inputValues);
                     break;
                 case NOT_NULL_ASSERTION:
-                    expectedTypes = PseudocodePackage.expectedTypeFor(AllTypes.instance$, inputValues);
+                    expectedTypes = PseudocodePackage.expectedTypeFor(AllTypes.INSTANCE$, inputValues);
                     break;
                 default:
                     throw new IllegalArgumentException("Invalid operation: " + operation);
@@ -526,8 +526,8 @@ public class JetControlFlowInstructionsGenerator extends JetControlFlowBuilderAd
                 @Nullable ResolvedCall<?> resolvedCall,
                 @NotNull Map<PseudoValue, ReceiverValue> receiverValues
         ) {
-            AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.instance$;
-            ReadValueInstruction instruction = ReadValueInstruction.object$.create(
+            AccessTarget accessTarget = resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$;
+            ReadValueInstruction instruction = ReadValueInstruction.OBJECT$.create(
                     expression, getCurrentScope(), accessTarget, receiverValues, valueFactory
             );
             add(instruction);

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDotQualifiedExpression.java

@@ -54,7 +54,7 @@ public class JetDotQualifiedExpression extends JetExpressionImplStub<PsiJetPlace
                 return childExpressionsByStub[0];
             }
         }
-        return JetQualifiedExpressionImpl.instance$.getReceiverExpression(this);
+        return JetQualifiedExpressionImpl.INSTANCE$.getReceiverExpression(this);
     }
 
     @Nullable
@@ -67,7 +67,7 @@ public class JetDotQualifiedExpression extends JetExpressionImplStub<PsiJetPlace
                 return childExpressionsByStub[1];
             }
         }
-        return JetQualifiedExpressionImpl.instance$.getSelectorExpression(this);
+        return JetQualifiedExpressionImpl.INSTANCE$.getSelectorExpression(this);
     }
 
 
@@ -93,12 +93,12 @@ public class JetDotQualifiedExpression extends JetExpressionImplStub<PsiJetPlace
     @NotNull
     @Override
     public ASTNode getOperationTokenNode() {
-        return JetQualifiedExpressionImpl.instance$.getOperationTokenNode(this);
+        return JetQualifiedExpressionImpl.INSTANCE$.getOperationTokenNode(this);
     }
 
     @NotNull
     @Override
     public JetToken getOperationSign() {
-        return JetQualifiedExpressionImpl.instance$.getOperationSign(this);
+        return JetQualifiedExpressionImpl.INSTANCE$.getOperationSign(this);
     }
 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNameReferenceExpression.java

@@ -48,13 +48,13 @@ public class JetNameReferenceExpression extends JetExpressionImplStub<PsiJetName
         if (stub != null) {
             return stub.getReferencedName();
         }
-        return JetSimpleNameExpressionImpl.object$.getReferencedNameImpl(this);
+        return JetSimpleNameExpressionImpl.OBJECT$.getReferencedNameImpl(this);
     }
 
     @Override
     @NotNull
     public Name getReferencedNameAsName() {
-        return JetSimpleNameExpressionImpl.object$.getReferencedNameAsNameImpl(this);
+        return JetSimpleNameExpressionImpl.OBJECT$.getReferencedNameAsNameImpl(this);
     }
 
     @Override
@@ -76,7 +76,7 @@ public class JetNameReferenceExpression extends JetExpressionImplStub<PsiJetName
     @NotNull
     @Override
     public IElementType getReferencedNameElementType() {
-        return JetSimpleNameExpressionImpl.object$.getReferencedNameElementTypeImpl(this);
+        return JetSimpleNameExpressionImpl.OBJECT$.getReferencedNameElementTypeImpl(this);
     }
 
     @Override

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSafeQualifiedExpression.java

@@ -34,24 +34,24 @@ public class JetSafeQualifiedExpression extends JetExpressionImpl implements Jet
     @NotNull
     @Override
     public JetExpression getReceiverExpression() {
-        return JetQualifiedExpressionImpl.instance$.getReceiverExpression(this);
+        return JetQualifiedExpressionImpl.INSTANCE$.getReceiverExpression(this);
     }
 
     @Nullable
     @Override
     public JetExpression getSelectorExpression() {
-        return JetQualifiedExpressionImpl.instance$.getSelectorExpression(this);
+        return JetQualifiedExpressionImpl.INSTANCE$.getSelectorExpression(this);
     }
 
     @NotNull
     @Override
     public ASTNode getOperationTokenNode() {
-        return JetQualifiedExpressionImpl.instance$.getOperationTokenNode(this);
+        return JetQualifiedExpressionImpl.INSTANCE$.getOperationTokenNode(this);
     }
 
     @NotNull
     @Override
     public JetToken getOperationSign() {
-        return JetQualifiedExpressionImpl.instance$.getOperationSign(this);
+        return JetQualifiedExpressionImpl.INSTANCE$.getOperationSign(this);
     }
 }

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java

@@ -60,7 +60,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         List<String> superNames = PsiUtilPackage.getSuperNames(psi);
         return new PsiJetClassStubImpl(
                 getStubType(isEnumEntry), parentStub, StringRef.fromString(fqName != null ? fqName.asString() : null),
-                StringRef.fromString(psi.getName()), Utils.instance$.wrapStrings(superNames), psi.isTrait(), isEnumEntry,
+                StringRef.fromString(psi.getName()), Utils.INSTANCE$.wrapStrings(superNames), psi.isTrait(), isEnumEntry,
                 psi.isLocal(), psi.isTopLevel());
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java

@@ -47,7 +47,7 @@ public class JetObjectElementType extends JetStubElementType<PsiJetObjectStub, J
         String name = psi.getName();
         FqName fqName = ResolveSessionUtils.safeFqNameForLazyResolve(psi);
         List<String> superNames = PsiUtilPackage.getSuperNames(psi);
-        return new PsiJetObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.instance$.wrapStrings(superNames),
+        return new PsiJetObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.INSTANCE$.wrapStrings(superNames),
                                         psi.isTopLevel(), isClassObject(psi), psi.isLocal(), psi.isObjectLiteral());
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java

@@ -361,7 +361,7 @@ public class AnnotationResolver {
         for (ValueArgument argument : resolvedValueArgument.getArguments()) {
             JetExpression argumentExpression = argument.getArgumentExpression();
             if (argumentExpression != null) {
-                CompileTimeConstant<?> constant = ConstantExpressionEvaluator.object$.evaluate(argumentExpression, trace, expectedType);
+                CompileTimeConstant<?> constant = ConstantExpressionEvaluator.OBJECT$.evaluate(argumentExpression, trace, expectedType);
                 if (constant instanceof IntegerValueTypeConstant) {
                     JetType defaultType = ((IntegerValueTypeConstant) constant).getType(expectedType);
                     ArgumentTypeResolver.updateNumberType(defaultType, argumentExpression, trace);

compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java

@@ -129,7 +129,7 @@ public class CompileTimeConstantUtils {
     ) {
         if (expression == null) return false;
         CompileTimeConstant<?> compileTimeConstant =
-                ConstantExpressionEvaluator.object$.evaluate(expression, trace, KotlinBuiltIns.getInstance().getBooleanType());
+                ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, KotlinBuiltIns.getInstance().getBooleanType());
         if (!(compileTimeConstant instanceof BooleanValue) || compileTimeConstant.usesVariableAsConstant()) return false;
 
         Boolean value = ((BooleanValue) compileTimeConstant).getValue();

compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java

@@ -1078,7 +1078,7 @@ public class DescriptorResolver {
                 public CompileTimeConstant<?> invoke() {
                     JetExpression initializer = variable.getInitializer();
                     JetType initializerType = expressionTypingServices.safeGetType(scope, initializer, variableType, dataFlowInfo, trace);
-                    CompileTimeConstant<?> constant = ConstantExpressionEvaluator.object$.evaluate(initializer, trace, initializerType);
+                    CompileTimeConstant<?> constant = ConstantExpressionEvaluator.OBJECT$.evaluate(initializer, trace, initializerType);
                     if (constant instanceof IntegerValueTypeConstant) {
                         return EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) constant, initializerType);
                     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java

@@ -192,7 +192,7 @@ public class OverrideResolver {
                 if (element instanceof JetDeclaration) {
                     trace.report(CANNOT_INFER_VISIBILITY.on((JetDeclaration) element, descriptor));
                 }
-                return Unit.instance$;
+                return Unit.INSTANCE$;
             }
         };
     }
@@ -247,7 +247,7 @@ public class OverrideResolver {
                     public boolean isEqual(D d1, D d2) {
                         CallableDescriptor f = transform.fun(d1);
                         CallableDescriptor g = transform.fun(d2);
-                        return DescriptorEquivalenceForOverrides.instance$.areEquivalent(f.getOriginal(), g.getOriginal());
+                        return DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(f.getOriginal(), g.getOriginal());
                     }
                 });
 
@@ -294,10 +294,10 @@ public class OverrideResolver {
         // when B is defined in modules m1 and m2, and C (indirectly) inherits from both versions,
         // we'll be getting sets of members that do not override each other, but are structurally equivalent.
         // As other code relies on no equal descriptors passed here, we guard against f == g, but this may not be necessary
-        if (!f.equals(g) && DescriptorEquivalenceForOverrides.instance$.areEquivalent(f.getOriginal(), g.getOriginal())) return true;
+        if (!f.equals(g) && DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(f.getOriginal(), g.getOriginal())) return true;
         CallableDescriptor originalG = g.getOriginal();
         for (D overriddenFunction : getAllOverriddenDescriptors(f)) {
-            if (DescriptorEquivalenceForOverrides.instance$.areEquivalent(originalG, overriddenFunction.getOriginal())) return true;
+            if (DescriptorEquivalenceForOverrides.INSTANCE$.areEquivalent(originalG, overriddenFunction.getOriginal())) return true;
         }
         return false;
     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java

@@ -290,6 +290,6 @@ public class ArgumentTypeResolver {
             return;
         }
 
-        ConstantExpressionEvaluator.object$.evaluate(expression, trace, numberType);
+        ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, numberType);
     }
 }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java

@@ -467,7 +467,7 @@ public class CallExpressionResolver {
             context.trace.record(BindingContext.EXPRESSION_TYPE, selectorExpression, selectorReturnType);
         }
 
-        CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, context.expectedType);
+        CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, context.expectedType);
         if (value instanceof IntegerValueConstant && ((IntegerValueConstant) value).isPure()) {
             return BasicExpressionTypingVisitor.createCompileTimeConstantTypeInfo(value, expression, context);
         }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java

@@ -272,7 +272,7 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
     public ArgumentMapping getArgumentMapping(@NotNull ValueArgument valueArgument) {
         ArgumentMatch argumentMatch = argumentToParameterMap.get(valueArgument);
         if (argumentMatch == null) {
-            return ArgumentUnmapped.instance$;
+            return ArgumentUnmapped.INSTANCE$;
         }
         return argumentMatch;
     }

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java

@@ -515,7 +515,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
                     @Override
                     public Unit invoke(@NotNull Supertypes supertypes) {
                         findAndDisconnectLoopsInTypeHierarchy(supertypes);
-                        return Unit.instance$;
+                        return Unit.INSTANCE$;
                     }
                 }
         );

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java

@@ -118,7 +118,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
 
     @Override
     public JetTypeInfo visitConstantExpression(@NotNull JetConstantExpression expression, ExpressionTypingContext context) {
-        CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, context.expectedType);
+        CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, context.expectedType);
 
         if (!(value instanceof IntegerValueTypeConstant)) {
             CompileTimeConstantChecker compileTimeConstantChecker = context.getCompileTimeConstantChecker();
@@ -752,7 +752,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
             result = returnType;
         }
 
-        CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.evaluate(expression, contextWithExpectedType.trace,
+        CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, contextWithExpectedType.trace,
                                                                                     contextWithExpectedType.expectedType);
         if (value != null) {
             return createCompileTimeConstantTypeInfo(value, expression, contextWithExpectedType);
@@ -917,7 +917,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
             context.trace.report(UNSUPPORTED.on(operationSign, "Unknown operation"));
             result = JetTypeInfo.create(null, context.dataFlowInfo);
         }
-        CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.
+        CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.
                 evaluate(expression, contextWithExpectedType.trace, contextWithExpectedType.expectedType);
         if (value != null) {
             return createCompileTimeConstantTypeInfo(value, expression, contextWithExpectedType);
@@ -1257,7 +1257,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
                 }
             });
         }
-        ConstantExpressionEvaluator.object$.evaluate(expression, context.trace, contextWithExpectedType.expectedType);
+        ConstantExpressionEvaluator.OBJECT$.evaluate(expression, context.trace, contextWithExpectedType.expectedType);
         return DataFlowUtils.checkType(KotlinBuiltIns.getInstance().getStringType(), expression, contextWithExpectedType, dataFlowInfo[0]);
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java

@@ -170,7 +170,7 @@ public class DataFlowUtils {
         }
 
         if (expression instanceof JetConstantExpression) {
-            CompileTimeConstant<?> value = ConstantExpressionEvaluator.object$.evaluate(expression, trace, expectedType);
+            CompileTimeConstant<?> value = ConstantExpressionEvaluator.OBJECT$.evaluate(expression, trace, expectedType);
             if (value instanceof IntegerValueTypeConstant) {
                 value = EvaluatePackage.createCompileTimeConstantWithType((IntegerValueTypeConstant) value, expectedType);
             }

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java

@@ -396,7 +396,7 @@ public class ExpressionTypingServices {
             if (defaultValue != null) {
                 getType(declaringScope, defaultValue, valueParameterDescriptor.getType(), dataFlowInfo, trace);
                 if (DescriptorUtils.isAnnotationClass(DescriptorResolver.getContainingClass(declaringScope))) {
-                    ConstantExpressionEvaluator.object$.evaluate(defaultValue, trace, valueParameterDescriptor.getType());
+                    ConstantExpressionEvaluator.OBJECT$.evaluate(defaultValue, trace, valueParameterDescriptor.getType());
                 }
             }
         }

compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.java

@@ -2,7 +2,7 @@ public final class ClassObjectField implements kotlin.jvm.internal.KObject {
     @org.jetbrains.annotations.Nullable
     public static final java.lang.String x = "";
     private static final java.lang.String y = "";
-    public static final ClassObjectField.object object$;
+    public static final ClassObjectField.object OBJECT$;
 
     public ClassObjectField() { /* compiled code */ }
 

compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java

@@ -1,5 +1,5 @@
 public interface TraitClassObjectField extends kotlin.jvm.internal.KObject {
-    TraitClassObjectField.object object$;
+    TraitClassObjectField.object OBJECT$;
     @org.jetbrains.annotations.Nullable
     java.lang.String x = "";
 

compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java

@@ -2,18 +2,18 @@ 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.OBJECT$.foo();
+        WithClassObject.OBJECT$.getValue();
+        WithClassObject.OBJECT$.getValueWithGetter();
+        WithClassObject.OBJECT$.getVariable();
+        WithClassObject.OBJECT$.setVariable(0);
+        WithClassObject.OBJECT$.getVariableWithAccessors();
+        WithClassObject.OBJECT$.setVariableWithAccessors(0);
     }
 
     void accessToPackageObject() {
-        PackageInner.instance$.foo();
-        PackageInner.instance$.getValue();
+        PackageInner.INSTANCE$.foo();
+        PackageInner.INSTANCE$.getValue();
     }
 
     void accessToInnerClass() {

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt

@@ -1,5 +1,5 @@
 class C {
     <!CONFLICTING_JVM_DECLARATIONS!>class object<!> {}
 
-    <!CONFLICTING_JVM_DECLARATIONS!>val `object$`<!> = C
+    <!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = C
 }

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt

@@ -1,7 +1,7 @@
 class C {
     <!CONFLICTING_JVM_DECLARATIONS!>class object<!> {
-        <!CONFLICTING_JVM_DECLARATIONS!>val `object$`<!> = this
+        <!CONFLICTING_JVM_DECLARATIONS!>val `OBJECT$`<!> = this
     }
 
-    val `object$` = C
+    val `OBJECT$` = C
 }

compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt

@@ -1,3 +1,3 @@
 object <!CONFLICTING_JVM_DECLARATIONS!>O<!> {
-    <!CONFLICTING_JVM_DECLARATIONS!>val `instance$`: O<!> = null!!
+    <!CONFLICTING_JVM_DECLARATIONS!>val `INSTANCE$`: O<!> = null!!
 }

compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java

@@ -281,7 +281,7 @@ public class StorageManagerTest extends TestCase {
                     new Function1<String, Unit>() {
                         @Override
                         public Unit invoke(String s) {
-                            return Unit.instance$;
+                            return Unit.INSTANCE$;
                         }
                     }
             );
@@ -317,7 +317,7 @@ public class StorageManagerTest extends TestCase {
                         public Unit invoke(String s) {
                             counter.inc();
                             assertEquals("tolerant", s);
-                            return Unit.instance$;
+                            return Unit.INSTANCE$;
                         }
                     }
             );
@@ -346,7 +346,7 @@ public class StorageManagerTest extends TestCase {
                     public Unit invoke(Collection<String> strings) {
                         counter.inc();
                         strings.add("postComputed");
-                        return Unit.instance$;
+                        return Unit.INSTANCE$;
                     }
                 }
         );
@@ -372,7 +372,7 @@ public class StorageManagerTest extends TestCase {
                     public Unit invoke(Collection<String> strings) {
                         counter.inc();
                         strings.add("postComputed");
-                        return Unit.instance$;
+                        return Unit.INSTANCE$;
                     }
                 }
         );
@@ -405,7 +405,7 @@ public class StorageManagerTest extends TestCase {
                         @Override
                         public Unit invoke(String s) {
                             fail("Recursion-tolerating value should not be post computed");
-                            return Unit.instance$;
+                            return Unit.INSTANCE$;
                         }
                     }
             );

core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java

@@ -60,7 +60,7 @@ public final class DescriptorResolverUtils {
                             @Override
                             public Unit invoke(@NotNull CallableMemberDescriptor descriptor) {
                                 errorReporter.reportCannotInferVisibility(descriptor);
-                                return Unit.instance$;
+                                return Unit.INSTANCE$;
                             }
                         });
                         result.add((D) fakeOverride);

idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java

@@ -96,7 +96,7 @@ public class JetPluginUtil {
     }
 
     public static boolean isGradleModule(@NotNull Module module) {
-        return ModuleTypeCacheManager.object$.geInstance(module.getProject()).isGradleModule(module);
+        return ModuleTypeCacheManager.OBJECT$.geInstance(module.getProject()).isGradleModule(module);
     }
 
     public static boolean isMavenModule(@NotNull Module module) {

idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.java

@@ -53,10 +53,10 @@ public class JavaToKotlinAction extends AnAction {
             return;
         }
 
-        final Converter converter = Converter.object$.create(project,
+        final Converter converter = Converter.OBJECT$.create(project,
                                                              ConverterSettings.defaultSettings,
                                                              new FilesConversionScope(selectedJavaFiles),
-                                                             J2kPostProcessor.instance$);
+                                                             J2kPostProcessor.INSTANCE$);
         CommandProcessor.getInstance().executeCommand(
                 project,
                 new Runnable() {

idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java

@@ -107,7 +107,7 @@ public class JetAddFunctionToClassifierAction implements QuestionAction {
                         PsiElement anchor = body.getRBrace();
                         JetNamedFunction insertedFunctionElement = (JetNamedFunction) body.addBefore(functionElement, anchor);
 
-                        ShortenReferences.instance$.process(insertedFunctionElement);
+                        ShortenReferences.INSTANCE$.process(insertedFunctionElement);
                     }
                 });
             }

idea/src/org/jetbrains/jet/plugin/actions/JetChangeFunctionSignatureAction.java

@@ -152,7 +152,7 @@ public class JetChangeFunctionSignatureAction implements QuestionAction {
                             newElement = psiFactory.createFunction(signatureString);
                         }
                         newElement = (JetNamedFunction) element.replace(newElement);
-                        ShortenReferences.instance$.process(newElement);
+                        ShortenReferences.INSTANCE$.process(newElement);
                     }
                 });
             }

idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java

@@ -101,7 +101,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
             elementsToCompact.add((JetElement) added);
         }
 
-        ShortenReferences.instance$.process(elementsToCompact);
+        ShortenReferences.INSTANCE$.process(elementsToCompact);
     }
 
     @Nullable

idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java

@@ -86,7 +86,7 @@ public class MoveDeclarationsOutHelper {
             dummyFirstStatement.delete();
         }
 
-        ShortenReferences.instance$.process(propertiesDeclarations);
+        ShortenReferences.INSTANCE$.process(propertiesDeclarations);
 
         return PsiUtilCore.toPsiElementArray(resultStatements);
     }

idea/src/org/jetbrains/jet/plugin/completion/handlers/JetClassInsertHandler.java

@@ -53,7 +53,7 @@ public class JetClassInsertHandler implements InsertHandler<LookupElement> {
                         psiDocumentManager.commitAllDocuments();
                         RangeMarker rangeMarker = document.createRangeMarker(classNameEnd, classNameEnd + tempSuffix.length());
 
-                        ShortenReferences.instance$.process((JetFile) context.getFile(), startOffset, classNameEnd);
+                        ShortenReferences.INSTANCE$.process((JetFile) context.getFile(), startOffset, classNameEnd);
                         psiDocumentManager.commitAllDocuments();
                         psiDocumentManager.doPostponedOperationsAndUnblockDocument(document);
 

idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java

@@ -94,7 +94,7 @@ public class ConfigureKotlinInProjectUtils {
     }
 
     private static void showConfigureKotlinNotification(@NotNull Project project) {
-        ConfigureKotlinNotificationManager.instance$.notify(project);
+        ConfigureKotlinNotificationManager.INSTANCE$.notify(project);
     }
 
     @NotNull

idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java

@@ -110,7 +110,7 @@ public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent {
                     public void run() {
                         Collection<Sdk> sdks = collectSdksWithoutAnnotations();
                         if (!sdks.isEmpty()) {
-                            AbsentSdkAnnotationsNotificationManager.instance$.notify(myProject, sdks);
+                            AbsentSdkAnnotationsNotificationManager.INSTANCE$.notify(myProject, sdks);
                         }
                     }
                 });

idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java

@@ -154,7 +154,7 @@ public abstract class KotlinFindMemberUsagesHandler<T extends JetNamedDeclaratio
                         UsagesSearchRequest request =
                                 getSearchHelper(kotlinOptions).newRequest(FindUsagesPackage.toSearchTarget(options, (T) element, true));
 
-                        for (PsiReference ref : UsagesSearch.instance$.search(request)) {
+                        for (PsiReference ref : UsagesSearch.INSTANCE$.search(request)) {
                             processUsage(processor, ref);
                         }
 

idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java

@@ -47,7 +47,7 @@ public class ReconstructTypeInCastOrIsAction extends PsiElementBaseIntentionActi
         JetType type = getReconstructedType(typeRef);
         JetTypeReference newType = JetPsiFactory(typeRef).createType(DescriptorRenderer.SOURCE_CODE.renderType(type));
         JetTypeReference replaced = (JetTypeReference) typeRef.replace(newType);
-        ShortenReferences.instance$.process(replaced);
+        ShortenReferences.INSTANCE$.process(replaced);
     }
 
     @Override

idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java

@@ -260,7 +260,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
         manager.startTemplate(editor, builder.buildInlineTemplate(), new TemplateEditingAdapter() {
             @Override
             public void templateFinished(Template template, boolean brokenOff) {
-                ShortenReferences.instance$.process(getTypeRef(namedDeclaration));
+                ShortenReferences.INSTANCE$.process(getTypeRef(namedDeclaration));
             }
         });
     }

idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java

@@ -125,7 +125,7 @@ public class DeclarationUtils {
         );
 
         if (inferredType != null) {
-            ShortenReferences.instance$.process(property.getTypeRef());
+            ShortenReferences.INSTANCE$.process(property.getTypeRef());
         }
 
         return newInitializer;

idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java

@@ -169,7 +169,7 @@ public class KotlinSignatureAnnotationIntention extends BaseIntentionAction impl
     @NotNull
     private static String getDefaultSignature(@NotNull Project project, @NotNull PsiMember psiMember) {
         BindingContext bindingContext = ResolvePackage.getLazyResolveSession(project, TargetPlatform.JVM).getBindingContext();
-        JavaDescriptorResolver javaDescriptorResolver = JavaResolveExtension.instance$.get(project);
+        JavaDescriptorResolver javaDescriptorResolver = JavaResolveExtension.INSTANCE$.get(project);
 
         PsiClass containingClass = psiMember.getContainingClass();
         assert containingClass != null;

idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java

@@ -95,7 +95,7 @@ public class KotlinSignatureInJavaMarkerProvider implements LineMarkerProvider {
 
         BindingContext bindingContext = ResolvePackage.getLazyResolveSession(project, TargetPlatform.JVM).getBindingContext();
 
-        JavaDescriptorResolver javaDescriptorResolver = JavaResolveExtension.instance$.get(project);
+        JavaDescriptorResolver javaDescriptorResolver = JavaResolveExtension.INSTANCE$.get(project);
 
         for (PsiElement element : elements) {
             if (!(element instanceof PsiMember)) {

idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java

@@ -248,15 +248,15 @@ public class QuickFixes {
 
         factories.put(MANY_CLASSES_IN_SUPERTYPE_LIST, RemoveSupertypeFix.createFactory());
 
-        factories.put(NO_GET_METHOD, CreateFunctionFromUsageFix.object$.createCreateGetFunctionFromUsageFactory());
-        factories.put(NO_SET_METHOD, CreateFunctionFromUsageFix.object$.createCreateSetFunctionFromUsageFactory());
-        JetSingleIntentionActionFactory createHasNextFromUsageFactory = CreateFunctionFromUsageFix.object$.createCreateHasNextFunctionFromUsageFactory();
+        factories.put(NO_GET_METHOD, CreateFunctionFromUsageFix.OBJECT$.createCreateGetFunctionFromUsageFactory());
+        factories.put(NO_SET_METHOD, CreateFunctionFromUsageFix.OBJECT$.createCreateSetFunctionFromUsageFactory());
+        JetSingleIntentionActionFactory createHasNextFromUsageFactory = CreateFunctionFromUsageFix.OBJECT$.createCreateHasNextFunctionFromUsageFactory();
         factories.put(HAS_NEXT_MISSING, createHasNextFromUsageFactory);
         factories.put(HAS_NEXT_FUNCTION_NONE_APPLICABLE, createHasNextFromUsageFactory);
-        JetSingleIntentionActionFactory createNextFromUsageFactory = CreateFunctionFromUsageFix.object$.createCreateNextFunctionFromUsageFactory();
+        JetSingleIntentionActionFactory createNextFromUsageFactory = CreateFunctionFromUsageFix.OBJECT$.createCreateNextFunctionFromUsageFactory();
         factories.put(NEXT_MISSING, createNextFromUsageFactory);
         factories.put(NEXT_NONE_APPLICABLE, createNextFromUsageFactory);
-        factories.put(ITERATOR_MISSING, CreateFunctionFromUsageFix.object$.createCreateIteratorFunctionFromUsageFactory());
-        factories.put(COMPONENT_FUNCTION_MISSING, CreateFunctionFromUsageFix.object$.createCreateComponentFunctionFromUsageFactory());
+        factories.put(ITERATOR_MISSING, CreateFunctionFromUsageFix.OBJECT$.createCreateIteratorFunctionFromUsageFactory());
+        factories.put(COMPONENT_FUNCTION_MISSING, CreateFunctionFromUsageFix.OBJECT$.createCreateComponentFunctionFromUsageFactory());
     }
 }

idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java

@@ -295,7 +295,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
                     functionLiteral.addAfter(whitespaceToAdd, openBraceElement);
                 }
             }
-            ShortenReferences.instance$.process(functionLiteralExpression.getValueParameters());
+            ShortenReferences.INSTANCE$.process(functionLiteralExpression.getValueParameters());
         }
     }
 
@@ -337,7 +337,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
         JetPsiFactory psiFactory = JetPsiFactory(containingFile);
         for (JetCallExpression call : callsToAddArguments) {
             call.addAfter(psiFactory.createTypeArguments("<" + typeArguments + ">"), call.getCalleeExpression());
-            ShortenReferences.instance$.process(call.getTypeArgumentList());
+            ShortenReferences.INSTANCE$.process(call.getTypeArgumentList());
         }
     }
 

idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java

@@ -413,7 +413,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
                 }
                 propertyRef.set(property);
                 if (noTypeInference) {
-                    ShortenReferences.instance$.process(property);
+                    ShortenReferences.INSTANCE$.process(property);
                 }
             }
         };

idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt

@@ -1,7 +1,7 @@
 class C {
     <error>class object</error> {
-        <error>val `object$`</error> = this
+        <error>val `OBJECT$`</error> = this
     }
 
-    val `object$` = C
+    val `OBJECT$` = C
 }

idea/testData/completion/injava/ClassObject.java

@@ -1,6 +1,6 @@
 public class Testing {
     public static void test() {
-        mockLib.foo.LibClass.object$.<caret>
+        mockLib.foo.LibClass.OBJECT$.<caret>
     }
 }
 

idea/testData/completion/injava/NestedObjectInstance.java

@@ -4,4 +4,4 @@ public class Testing {
     }
 }
 
-// EXIST: instance$
+// EXIST: INSTANCE$

idea/testData/completion/injava/ObjectInstance.java

@@ -4,4 +4,4 @@ public class Testing {
     }
 }
 
-// EXIST: instance$
+// EXIST: INSTANCE$

idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java

@@ -4,6 +4,6 @@ import server.O
 
 class Client {
     fun fooBar() {
-        println("foo = " + O.instance$.getFoo())
+        println("foo = " + O.INSTANCE$.getFoo())
     }
 }

idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt

@@ -1,2 +1,2 @@
-Class static member access (7: 28) println("foo = " + O.instance$.getFoo())
+Class static member access (7: 28) println("foo = " + O.INSTANCE$.getFoo())
 Usage in import (3: 15) import server.O

idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.1.java

@@ -4,9 +4,9 @@ import server.*
 
 class Client {
     fun fooBar() {
-        A.object$.setFoo("a");
+        A.OBJECT$.setFoo("a");
         A.foo = "a";
-        println("a.foo = " + A.object$.getFoo());
+        println("a.foo = " + A.OBJECT$.getFoo());
         println("a.foo = " + A.foo);
     }
 }

idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.results.txt

@@ -1,4 +1,4 @@
 Unclassified usage (10: 32) println("a.foo = " + A.foo);
-Unclassified usage (7: 19) A.object$.setFoo("a");
+Unclassified usage (7: 19) A.OBJECT$.setFoo("a");
 Unclassified usage (8: 11) A.foo = "a";
-Unclassified usage (9: 40) println("a.foo = " + A.object$.getFoo());
+Unclassified usage (9: 40) println("a.foo = " + A.OBJECT$.getFoo());

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.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);
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java

@@ -4,6 +4,6 @@ import b.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java

@@ -4,6 +4,6 @@ import b.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java

@@ -4,6 +4,6 @@ import b.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java

@@ -4,6 +4,6 @@ import b.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java

@@ -2,6 +2,6 @@ package a;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        a.Test t = a.Test.instance$;
+        a.Test t = a.Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java

@@ -4,6 +4,6 @@ import a.*;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java

@@ -4,6 +4,6 @@ import a.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java

@@ -2,6 +2,6 @@ package c;
 
 class J {
     void bar() {
-        a.Test t = a.Test.instance$;
+        a.Test t = a.Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java

@@ -4,6 +4,6 @@ import a.*;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java

@@ -4,6 +4,6 @@ import a.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java

@@ -4,6 +4,6 @@ import b.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java

@@ -4,6 +4,6 @@ import b.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java

@@ -4,6 +4,6 @@ import b.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java

@@ -4,6 +4,6 @@ import b.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java

@@ -2,6 +2,6 @@ package a;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java

@@ -2,6 +2,6 @@ package b;
 
 class J {
     void bar() {
-        a.Test t = a.Test.instance$;
+        a.Test t = a.Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java

@@ -4,6 +4,6 @@ import a.*;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java

@@ -4,6 +4,6 @@ import a.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java

@@ -2,6 +2,6 @@ package c;
 
 class J {
     void bar() {
-        a.Test t = a.Test.instance$;
+        a.Test t = a.Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java

@@ -4,6 +4,6 @@ import a.*;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java

@@ -4,6 +4,6 @@ import a.Test;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java

@@ -2,6 +2,6 @@ package a;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java

@@ -2,6 +2,6 @@ package a;
 
 class J {
     void bar() {
-        Test t = Test.instance$;
+        Test t = Test.INSTANCE$;
     }
 }

idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java

@@ -31,7 +31,7 @@ public abstract class AbstractMultiFileJvmBasicCompletionTest extends KotlinComp
     protected void doTest(@NotNull String testPath) throws Exception {
         configureByFile(getTestName(false) + ".kt", "");
         boolean shouldFail = testPath.contains("NoSpecifiedType");
-        AstAccessControl.instance$.testWithControlledAccessToAst(
+        AstAccessControl.INSTANCE$.testWithControlledAccessToAst(
                 shouldFail, getFile().getVirtualFile(), getProject(), getTestRootDisposable(),
                 new Function0<Unit>() {
                     @Override
@@ -43,7 +43,7 @@ public abstract class AbstractMultiFileJvmBasicCompletionTest extends KotlinComp
                                 return myItems;
                             }
                         });
-                        return Unit.instance$;
+                        return Unit.INSTANCE$;
                     }
                 }
         );

idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java

@@ -57,13 +57,13 @@ public abstract class AbstractLazyResolveByStubTest extends KotlinCodeInsightTes
         configureByFile(path);
         configureModule(getModule(), JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE);
         boolean shouldFail = getTestName(false).equals("ClassWithConstVal");
-        AstAccessControl.instance$.testWithControlledAccessToAst(
+        AstAccessControl.INSTANCE$.testWithControlledAccessToAst(
                 shouldFail, getProject(), getTestRootDisposable(),
                 new Function0<Unit>() {
                     @Override
                     public Unit invoke() {
                         performTest(path, checkPrimaryConstructors, checkPropertyAccessors);
-                        return Unit.instance$;
+                        return Unit.INSTANCE$;
                     }
                 }
         );
@@ -71,7 +71,7 @@ public abstract class AbstractLazyResolveByStubTest extends KotlinCodeInsightTes
 
     private void performTest(@NotNull String path, boolean checkPrimaryConstructors, boolean checkPropertyAccessors) {
         ResolveSessionForBodies resolveSession =
-                KotlinCacheService.object$.getInstance(getFile().getProject()).getLazyResolveSession((JetFile) getFile());
+                KotlinCacheService.OBJECT$.getInstance(getFile().getProject()).getLazyResolveSession((JetFile) getFile());
         ModuleDescriptor module = resolveSession.getModuleDescriptor();
         PackageViewDescriptor packageViewDescriptor = module.getPackage(new FqName("test"));
         Assert.assertNotNull(packageViewDescriptor);

idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java

@@ -41,13 +41,13 @@ public abstract class AbstractMultiFileHighlightingTest extends KotlinCompletion
     public void doTest(@NotNull String filePath) throws Exception {
         configureByFile(new File(filePath).getName(), "");
         boolean shouldFail = getName().contains("UnspecifiedType");
-        AstAccessControl.instance$.testWithControlledAccessToAst(
+        AstAccessControl.INSTANCE$.testWithControlledAccessToAst(
                 shouldFail, getFile().getVirtualFile(), getProject(), getTestRootDisposable(),
                 new Function0<Unit>() {
                     @Override
                     public Unit invoke() {
                         checkHighlighting(myEditor, true, false);
-                        return Unit.instance$;
+                        return Unit.INSTANCE$;
                     }
                 }
         );

j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java

@@ -4,7 +4,7 @@ import kotlinApi.KotlinClass;
 class C {
     int foo() {
         KotlinClass.staticVar = KotlinClass.staticVar * 2;
-        KotlinClass.object$.setStaticProperty(KotlinClass.object$.getStaticVar() + KotlinClass.object$.getStaticProperty());
-        return KotlinClass.object$.staticFun(1);
+        KotlinClass.OBJECT$.setStaticProperty(KotlinClass.OBJECT$.getStaticVar() + KotlinClass.OBJECT$.getStaticProperty());
+        return KotlinClass.OBJECT$.staticFun(1);
     }
 }

j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java

@@ -5,10 +5,10 @@ class A {
     int foo(KotlinClass c) {
         return c.getNullableProperty().length()
                + c.getProperty().length()
-               + KotlinClass.object$.getNullableStaticVar()
-               + KotlinClass.object$.getStaticVar()
-               + KotlinClass.object$.nullableStaticFun(1)
-               + KotlinClass.object$.staticFun(1)
+               + KotlinClass.OBJECT$.getNullableStaticVar()
+               + KotlinClass.OBJECT$.getStaticVar()
+               + KotlinClass.OBJECT$.nullableStaticFun(1)
+               + KotlinClass.OBJECT$.staticFun(1)
                + KotlinApiPackage.nullableGlobalFunction("").length()
                + KotlinApiPackage.globalFunction("").length();
     }

j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java

@@ -3,10 +3,10 @@ import kotlinApi.KotlinObject;
 
 class C {
     int foo() {
-        KotlinObject.instance$.setProperty1(1);
-        KotlinObject.instance$.setProperty2(2);
-        return KotlinObject.instance$.foo() +
-               KotlinObject.instance$.getProperty1() +
-               KotlinObject.instance$.getProperty2();
+        KotlinObject.INSTANCE$.setProperty1(1);
+        KotlinObject.INSTANCE$.setProperty2(2);
+        return KotlinObject.INSTANCE$.foo() +
+               KotlinObject.INSTANCE$.getProperty1() +
+               KotlinObject.INSTANCE$.getProperty2();
     }
 }

js/js.translator/src/org/jetbrains/k2js/analyze/AnalyzerFacadeForJS.java

@@ -136,7 +136,7 @@ public final class AnalyzerFacadeForJS {
             @NotNull Config config
     ) {
         GlobalContextImpl globalContext = ContextPackage.GlobalContext();
-        DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.object$
+        DeclarationProviderFactory declarationProviderFactory = DeclarationProviderFactoryService.OBJECT$
                 .createDeclarationProviderFactory(
                         config.getProject(),
                         globalContext.getStorageManager(),

js/js.translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java

@@ -141,7 +141,7 @@ public final class PropertyTranslator extends AbstractTranslator {
         JsExpression value;
         ResolvedCall<FunctionDescriptor> delegatedCall = bindingContext().get(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL, getterDescriptor);
         if (delegatedCall != null) {
-            value = CallTranslator.instance$.translate(context(), delegatedCall, getDelegateNameRef(getPropertyName()));
+            value = CallTranslator.INSTANCE$.translate(context(), delegatedCall, getDelegateNameRef(getPropertyName()));
         } else {
             value = backingFieldReference(context(), this.descriptor);
         }
@@ -171,7 +171,7 @@ public final class PropertyTranslator extends AbstractTranslator {
         ResolvedCall<FunctionDescriptor> delegatedCall = bindingContext().get(BindingContext.DELEGATED_PROPERTY_RESOLVED_CALL,
                                                                               setterDescriptor);
         if (delegatedCall != null) {
-            setExpression = CallTranslator.instance$.translate(contextWithAliased, delegatedCall, getDelegateNameRef(getPropertyName()));
+            setExpression = CallTranslator.INSTANCE$.translate(contextWithAliased, delegatedCall, getDelegateNameRef(getPropertyName()));
         } else {
             setExpression = assignmentToBackingField(contextWithAliased, descriptor, defaultParameterRef);
         }

js/js.translator/src/org/jetbrains/k2js/translate/expression/MultiDeclarationTranslator.java

@@ -78,7 +78,7 @@ public class MultiDeclarationTranslator extends AbstractTranslator {
         for (JetMultiDeclarationEntry entry : multiDeclaration.getEntries()) {
             ResolvedCall<FunctionDescriptor> entryInitCall =  context().bindingContext().get(BindingContext.COMPONENT_RESOLVED_CALL, entry);
             assert entryInitCall != null : "Entry init call must be not null";
-            JsExpression entryInitializer = CallTranslator.instance$.translate(context(), entryInitCall, multiObjNameRef);
+            JsExpression entryInitializer = CallTranslator.INSTANCE$.translate(context(), entryInitCall, multiObjNameRef);
 
             VariableDescriptor descriptor = BindingContextUtils.getNotNull( context().bindingContext(), BindingContext.VARIABLE, entry);
             JsName name =  context().getNameForDescriptor(descriptor);