diff --git a/build.xml b/build.xml
index b72093b7739..5f4508e29ab 100644
--- a/build.xml
+++ b/build.xml
@@ -125,6 +125,20 @@
     <target name="init">
         <mkdir dir="${kotlin-home}"/>
         <mkdir dir="${kotlin-home}/lib"/>
+
+        <if>
+            <isfalse value="${bootstrap.build.no.tests}"/>
+            <then>
+                <replace dir="${basedir}/compiler" token="instance$" value="INSTANCE$"/>
+                <replace dir="${basedir}/idea" token="instance$" value="INSTANCE$"/>
+                <replace dir="${basedir}/j2k/tests/testData/ast" token="instance$" value="INSTANCE$"/>
+                <replace dir="${basedir}/js/js.translator/src" token="instance$" value="INSTANCE$"/>
+                <replace dir="${basedir}/compiler" excludes="**/classInClassObject.kt" token="object$" value="OBJECT$"/>
+                <replace dir="${basedir}/idea" token="object$" value="OBJECT$"/>
+                <replace dir="${basedir}/j2k/tests/testData/ast" token="object$" value="OBJECT$"/>
+                <replace dir="${basedir}/js/js.translator/src" token="object$" value="OBJECT$"/>
+            </then>
+        </if>
     </target>
 
     <target name="prepareDist">
diff --git a/compiler/testData/codegen/bytecodeText/constClosureOptimization.kt b/compiler/testData/codegen/bytecodeText/constClosureOptimization.kt
index 424884ab803..1f98687cbf5 100644
--- a/compiler/testData/codegen/bytecodeText/constClosureOptimization.kt
+++ b/compiler/testData/codegen/bytecodeText/constClosureOptimization.kt
@@ -17,6 +17,6 @@ fun test() {
     (::local)()
 }
 
-// 3 GETSTATIC _DefaultPackage\$test\$1\.instance\$
-// 1 GETSTATIC _DefaultPackage\$test\$2\.instance\$
-// 1 GETSTATIC _DefaultPackage\$test\$3\.instance\$
\ No newline at end of file
+// 3 GETSTATIC _DefaultPackage\$test\$1\.INSTANCE\$
+// 1 GETSTATIC _DefaultPackage\$test\$2\.INSTANCE\$
+// 1 GETSTATIC _DefaultPackage\$test\$3\.INSTANCE\$
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
index 4cb17862e6c..5038096d17f 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java
@@ -41,8 +41,8 @@ public final class JvmAbi {
     public static final String PROPERTY_METADATA_ARRAY_NAME = "$propertyMetadata";
     public static final String ANNOTATED_PROPERTY_METHOD_NAME_SUFFIX = "$annotations";
 
-    public static final String INSTANCE_FIELD = "instance$";
-    public static final String CLASS_OBJECT_FIELD = "object$";
+    public static final String INSTANCE_FIELD = "INSTANCE$";
+    public static final String CLASS_OBJECT_FIELD = "OBJECT$";
 
     public static final FqName K_OBJECT = new FqName("kotlin.jvm.internal.KObject");
     public static final String KOTLIN_CLASS_FIELD_NAME = "$kotlinClass";