diff --git a/idea/testData/findUsages/kotlin/defaultObject/inContainingClass.0.kt b/idea/testData/findUsages/kotlin/companionObject/inContainingClass.0.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/inContainingClass.0.kt
rename to idea/testData/findUsages/kotlin/companionObject/inContainingClass.0.kt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/inContainingClass.results.txt b/idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/inContainingClass.results.txt
rename to idea/testData/findUsages/kotlin/companionObject/inContainingClass.results.txt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.0.kt b/idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/javaUsage.0.kt
rename to idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.1.java b/idea/testData/findUsages/kotlin/companionObject/javaUsage.1.java
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/javaUsage.1.java
rename to idea/testData/findUsages/kotlin/companionObject/javaUsage.1.java
diff --git a/idea/testData/findUsages/kotlin/defaultObject/javaUsage.results.txt b/idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/javaUsage.results.txt
rename to idea/testData/findUsages/kotlin/companionObject/javaUsage.results.txt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/named.0.kt b/idea/testData/findUsages/kotlin/companionObject/named.0.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/named.0.kt
rename to idea/testData/findUsages/kotlin/companionObject/named.0.kt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/named.1.kt b/idea/testData/findUsages/kotlin/companionObject/named.1.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/named.1.kt
rename to idea/testData/findUsages/kotlin/companionObject/named.1.kt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/named.results.txt b/idea/testData/findUsages/kotlin/companionObject/named.results.txt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/named.results.txt
rename to idea/testData/findUsages/kotlin/companionObject/named.results.txt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/simple.0.kt b/idea/testData/findUsages/kotlin/companionObject/simple.0.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/simple.0.kt
rename to idea/testData/findUsages/kotlin/companionObject/simple.0.kt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/simple.1.kt b/idea/testData/findUsages/kotlin/companionObject/simple.1.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/simple.1.kt
rename to idea/testData/findUsages/kotlin/companionObject/simple.1.kt
diff --git a/idea/testData/findUsages/kotlin/defaultObject/simple.results.txt b/idea/testData/findUsages/kotlin/companionObject/simple.results.txt
similarity index 100%
rename from idea/testData/findUsages/kotlin/defaultObject/simple.results.txt
rename to idea/testData/findUsages/kotlin/companionObject/simple.results.txt
diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java
index dcbe2cdde33..38e4ed55ed6 100644
--- a/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java
@@ -37,6 +37,39 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
         }
 
+        @TestMetadata("idea/testData/findUsages/kotlin/companionObject")
+        @TestDataPath("$PROJECT_ROOT")
+        @RunWith(JUnit3RunnerWithInners.class)
+        public static class CompanionObject extends AbstractJetFindUsagesTest {
+            public void testAllFilesPresentInCompanionObject() throws Exception {
+                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/companionObject"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
+            }
+
+            @TestMetadata("inContainingClass.0.kt")
+            public void testInContainingClass() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/inContainingClass.0.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("javaUsage.0.kt")
+            public void testJavaUsage() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/javaUsage.0.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("named.0.kt")
+            public void testNamed() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/named.0.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("simple.0.kt")
+            public void testSimple() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/companionObject/simple.0.kt");
+                doTest(fileName);
+            }
+        }
+
         @TestMetadata("idea/testData/findUsages/kotlin/conventions")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
@@ -148,39 +181,6 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             }
         }
 
-        @TestMetadata("idea/testData/findUsages/kotlin/defaultObject")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class DefaultObject extends AbstractJetFindUsagesTest {
-            public void testAllFilesPresentInDefaultObject() throws Exception {
-                JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/defaultObject"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
-            }
-
-            @TestMetadata("inContainingClass.0.kt")
-            public void testInContainingClass() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/defaultObject/inContainingClass.0.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("javaUsage.0.kt")
-            public void testJavaUsage() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/defaultObject/javaUsage.0.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("named.0.kt")
-            public void testNamed() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/defaultObject/named.0.kt");
-                doTest(fileName);
-            }
-
-            @TestMetadata("simple.0.kt")
-            public void testSimple() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/defaultObject/simple.0.kt");
-                doTest(fileName);
-            }
-        }
-
         @TestMetadata("idea/testData/findUsages/kotlin/findClassUsages")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)