From c28107034a0dd6775bb3604cdc0142e5daf287fa Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 7 Oct 2015 16:05:05 +0300
Subject: [PATCH] Idea tests: INSTANCE$ -> INSTANCE

---
 .../idea-completion/testData/injava/NestedObjectInstance.java | 2 +-
 idea/idea-completion/testData/injava/ObjectInstance.java      | 2 +-
 .../kotlin/findObjectUsages/javaObjectUsages.1.java           | 2 +-
 .../kotlin/findObjectUsages/javaObjectUsages.results.txt      | 2 +-
 .../libraryUsages/kotlinLibrary/LibraryObjectUsages.1.java    | 2 +-
 .../kotlinLibrary/LibraryObjectUsages.results.txt             | 4 ++--
 idea/testData/inspections/unusedSymbol/object/usedInJava.java | 2 +-
 .../moveObjectToFile/after/a/noImports.java                   | 2 +-
 .../moveObjectToFile/after/b/noImports.java                   | 2 +-
 .../moveObjectToFile/after/b/onDemandImport.java              | 2 +-
 .../moveObjectToFile/after/b/specificImports.java             | 2 +-
 .../moveObjectToFile/after/c/noImports.java                   | 2 +-
 .../moveObjectToFile/after/c/onDemandImport.java              | 2 +-
 .../moveObjectToFile/after/c/specificImports.java             | 2 +-
 .../moveObjectToFile/before/a/noImports.java                  | 2 +-
 .../moveObjectToFile/before/b/noImports.java                  | 2 +-
 .../moveObjectToFile/before/b/onDemandImport.java             | 2 +-
 .../moveObjectToFile/before/b/specificImports.java            | 2 +-
 .../moveObjectToFile/before/c/noImports.java                  | 2 +-
 .../moveObjectToFile/before/c/onDemandImport.java             | 2 +-
 .../moveObjectToFile/before/c/specificImports.java            | 2 +-
 .../moveObjectToPackage/after/a/noImports.java                | 2 +-
 .../moveObjectToPackage/after/b/noImports.java                | 2 +-
 .../moveObjectToPackage/after/b/onDemandImport.java           | 2 +-
 .../moveObjectToPackage/after/b/specificImports.java          | 2 +-
 .../moveObjectToPackage/after/c/noImports.java                | 2 +-
 .../moveObjectToPackage/after/c/onDemandImport.java           | 2 +-
 .../moveObjectToPackage/after/c/specificImports.java          | 2 +-
 .../moveObjectToPackage/before/a/noImports.java               | 2 +-
 .../moveObjectToPackage/before/b/noImports.java               | 2 +-
 .../moveObjectToPackage/before/b/onDemandImport.java          | 2 +-
 .../moveObjectToPackage/before/b/specificImports.java         | 2 +-
 .../moveObjectToPackage/before/c/noImports.java               | 2 +-
 .../moveObjectToPackage/before/c/onDemandImport.java          | 2 +-
 .../moveObjectToPackage/before/c/specificImports.java         | 2 +-
 .../moveObjectToPackageWithConflicts/after/a/noImports.java   | 2 +-
 .../moveObjectToPackageWithConflicts/before/a/noImports.java  | 2 +-
 37 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/idea/idea-completion/testData/injava/NestedObjectInstance.java b/idea/idea-completion/testData/injava/NestedObjectInstance.java
index b2ac7a09b0d..7073a3525da 100644
--- a/idea/idea-completion/testData/injava/NestedObjectInstance.java
+++ b/idea/idea-completion/testData/injava/NestedObjectInstance.java
@@ -4,4 +4,4 @@ public class Testing {
     }
 }
 
-// EXIST: INSTANCE$
+// EXIST: INSTANCE
diff --git a/idea/idea-completion/testData/injava/ObjectInstance.java b/idea/idea-completion/testData/injava/ObjectInstance.java
index 4a3b19a2edb..476188ddeeb 100644
--- a/idea/idea-completion/testData/injava/ObjectInstance.java
+++ b/idea/idea-completion/testData/injava/ObjectInstance.java
@@ -4,4 +4,4 @@ public class Testing {
     }
 }
 
-// EXIST: INSTANCE$
+// EXIST: INSTANCE
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java
index 47d19fc997a..053a7097aa6 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.1.java
@@ -4,6 +4,6 @@ import server.O;
 
 class Client {
     void fooBar() {
-        System.out.println("foo = " + O.INSTANCE$.getFoo());
+        System.out.println("foo = " + O.INSTANCE.getFoo());
     }
 }
\ No newline at end of file
diff --git a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
index 92fea3105f0..0fc7f02e4c5 100644
--- a/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
+++ b/idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.results.txt
@@ -1,2 +1,2 @@
-Class static member access (7: 39) System.out.println("foo = " + O.INSTANCE$.getFoo());
+Class static member access (7: 39) System.out.println("foo = " + O.INSTANCE.getFoo());
 Usage in import (3: 15) import server.O;
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.1.java b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.1.java
index 654b90c4c01..a8ae5f58630 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.1.java
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.1.java
@@ -4,6 +4,6 @@ import library.*
 
 class J {
     static void test() {
-        O o = O.INSTANCE$;
+        O o = O.INSTANCE;
     }
 }
\ No newline at end of file
diff --git a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
index fdcaa23590a..413d5b3e88f 100644
--- a/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
+++ b/idea/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt
@@ -1,4 +1,4 @@
 [LibraryObjectUsages.0.kt] Value read (10: 13) val o = O
-[LibraryObjectUsages.1.java] Class static member access (7: 15) O o = O.INSTANCE$;
-[LibraryObjectUsages.1.java] Local variable declaration (7: 9) O o = O.INSTANCE$;
+[LibraryObjectUsages.1.java] Class static member access (7: 15) O o = O.INSTANCE;
+[LibraryObjectUsages.1.java] Local variable declaration (7: 9) O o = O.INSTANCE;
 [library.kt] Value read (55: 13) val o = O
\ No newline at end of file
diff --git a/idea/testData/inspections/unusedSymbol/object/usedInJava.java b/idea/testData/inspections/unusedSymbol/object/usedInJava.java
index 4882d16fb20..fb34aca92dc 100644
--- a/idea/testData/inspections/unusedSymbol/object/usedInJava.java
+++ b/idea/testData/inspections/unusedSymbol/object/usedInJava.java
@@ -1,5 +1,5 @@
 class RandomJavaClass {
     void f() {
-        foo.UsedInJava.INSTANCE$.bar();
+        foo.UsedInJava.INSTANCE.bar();
     }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java
index d3c03c8ec1b..c1177df3c95 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/a/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java
index 2a62cb08978..b9a46c6c0f4 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java
index 2a62cb08978..b9a46c6c0f4 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/onDemandImport.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java
index 2a62cb08978..b9a46c6c0f4 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/b/specificImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java
index 8706448245c..a4c4cd44522 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java
index 8706448245c..a4c4cd44522 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/onDemandImport.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java
index 8706448245c..a4c4cd44522 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/after/c/specificImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java
index f42e6345ac7..a141c4afb54 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/a/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java
index a67feda7d61..44bb2b81994 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java
index 764b8c117f8..4b2fb5603cc 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/onDemandImport.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java
index 64e6b3e27e2..24fc8214b4c 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/b/specificImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java
index 7a57ba590f1..8ae816a2038 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java
index 7340301d6ab..3ac55c72370 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/onDemandImport.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java
index e2f052d412a..6f6219b4685 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/before/c/specificImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java
index d3c03c8ec1b..c1177df3c95 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/a/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java
index 2a62cb08978..b9a46c6c0f4 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java
index 2a62cb08978..b9a46c6c0f4 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/onDemandImport.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java
index 2a62cb08978..b9a46c6c0f4 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/b/specificImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java
index 8706448245c..a4c4cd44522 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java
index 8706448245c..a4c4cd44522 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/onDemandImport.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java
index 8706448245c..a4c4cd44522 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/after/c/specificImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java
index f42e6345ac7..a141c4afb54 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/a/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java
index a67feda7d61..44bb2b81994 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java
index 764b8c117f8..4b2fb5603cc 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/onDemandImport.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java
index 64e6b3e27e2..24fc8214b4c 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/b/specificImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java
index 7a57ba590f1..8ae816a2038 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java
index 7340301d6ab..3ac55c72370 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/onDemandImport.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java
index e2f052d412a..6f6219b4685 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/before/c/specificImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java
index f42e6345ac7..a141c4afb54 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/after/a/noImports.java
+++ b/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;
     }
 }
diff --git a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java b/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java
index f42e6345ac7..a141c4afb54 100644
--- a/idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/before/a/noImports.java
+++ b/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;
     }
 }