diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
index aeb5e99e8b7..70f9b0f1d5b 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -62,7 +62,6 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.jar.*;
 
@@ -304,7 +303,7 @@ public class CompileEnvironmentUtil {
                             }
                         }
                     }
-                    return Unit.VALUE;
+                    return Unit.instance$;
                 }
             });
         }
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
index e016baecb34..78a1501aad8 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+++ b/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.VALUE;
+                                             return Unit.instance$;
                                          }
                                      }));
         JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions(
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
index e286fb607a9..59b97bdcf50 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetFlowInformationProvider.java
+++ b/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.VALUE;
+            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.VALUE;
+            return Unit.instance$;
         }
 
         public abstract void execute(P p);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
index 035220e08d2..70100e4a23f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariablesData.java
+++ b/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.VALUE;
+                    return Unit.instance$;
                 }
             });
             usedVariables = Collections.unmodifiableSet(result);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
index 4ffe1b2db0b..0d01d58fa50 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+++ b/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.VALUE;
+                return Unit.instance$;
             }
         };
     }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
index bdcc42b9b90..8c0fde8914b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java
+++ b/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.VALUE;
+                        return Unit.instance$;
                     }
                 }
         );
diff --git a/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java b/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java
index 761d1266f8e..b953ea659cc 100644
--- a/compiler/tests/org/jetbrains/jet/storage/StorageManagerTest.java
+++ b/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.VALUE;
+                            return Unit.instance$;
                         }
                     }
             );
@@ -317,7 +317,7 @@ public class StorageManagerTest extends TestCase {
                         public Unit invoke(String s) {
                             counter.inc();
                             assertEquals("tolerant", s);
-                            return Unit.VALUE;
+                            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.VALUE;
+                        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.VALUE;
+                        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.VALUE;
+                            return Unit.instance$;
                         }
                     }
             );
@@ -581,4 +581,4 @@ public class StorageManagerTest extends TestCase {
             throw new UnsupportedOperationException();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
index 710c209f6bd..81f011837b1 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
@@ -62,7 +62,7 @@ public final class DescriptorResolverUtils {
                             @Override
                             public Unit invoke(@NotNull CallableMemberDescriptor descriptor) {
                                 errorReporter.reportCannotInferVisibility(descriptor);
-                                return Unit.VALUE;
+                                return Unit.instance$;
                             }
                         });
                         result.add((D) fakeOverride);
diff --git a/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java
index 9220d24cbce..f44e74018ba 100644
--- a/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.java
@@ -43,7 +43,7 @@ public abstract class AbstractMultiFileJvmBasicCompletionTest extends KotlinComp
                                 return myItems;
                             }
                         });
-                        return Unit.VALUE;
+                        return Unit.instance$;
                     }
                 }
         );
diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java
index 54f79e73898..caa3333e606 100644
--- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractLazyResolveByStubTest.java
@@ -63,7 +63,7 @@ public abstract class AbstractLazyResolveByStubTest extends KotlinCodeInsightTes
                     @Override
                     public Unit invoke() {
                         performTest(path, checkPrimaryConstructors, checkPropertyAccessors);
-                        return Unit.VALUE;
+                        return Unit.instance$;
                     }
                 }
         );
diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java
index a06141e775c..ee49eebeb6f 100644
--- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java
@@ -47,7 +47,7 @@ public abstract class AbstractMultiFileHighlightingTest extends KotlinCompletion
                     @Override
                     public Unit invoke() {
                         checkHighlighting(myEditor, true, false);
-                        return Unit.VALUE;
+                        return Unit.instance$;
                     }
                 }
         );