diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses1.0.java b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.0.java
similarity index 100%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses1.0.java
rename to idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.0.java
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses1.1.kt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.1.kt
similarity index 100%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses1.1.kt
rename to idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.1.kt
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses1.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
similarity index 100%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses1.results.txt
rename to idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses2.0.java b/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.0.java
similarity index 100%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses2.0.java
rename to idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.0.java
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses2.1.kt b/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.1.kt
similarity index 100%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses2.1.kt
rename to idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.1.kt
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses2.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt
similarity index 100%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses2.results.txt
rename to idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.results.txt
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.0.java b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.0.java
similarity index 98%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.0.java
rename to idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.0.java
index 2f1ebac5750..699b54fd6c4 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.0.java
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.0.java
@@ -2,4 +2,4 @@
 // OPTIONS: implementingClasses
 public interface <caret>A {
 
-}
\ No newline at end of file
+}
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.1.kt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.1.kt
similarity index 75%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.1.kt
rename to idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.1.kt
index ba62e0e2d65..c1667fea80b 100644
--- a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.1.kt
+++ b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.1.kt
@@ -4,4 +4,4 @@ public trait T: A
 
 public open class Y: X()
 
-public class Z: Y(), T
\ No newline at end of file
+public class Z: Y(), T
diff --git a/idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.results.txt b/idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
similarity index 100%
rename from idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.results.txt
rename to idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages1.0.kt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages1.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.1.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages1.1.kt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.1.kt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages1.results.txt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.results.txt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages2.0.kt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages1.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.1.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages1.1.kt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.1.kt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages2.results.txt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.results.txt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages2.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages2.0.kt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages2.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.1.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages2.1.kt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.1.kt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages2.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages2.results.txt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.results.txt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages1.0.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages1.0.kt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages2.1.kt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.1.kt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages2.1.kt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.1.kt
diff --git a/idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages1.results.txt b/idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt
similarity index 100%
rename from idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages1.results.txt
rename to idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.results.txt
diff --git a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
index c071bdebaaa..104d0f52055 100644
--- a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
@@ -125,6 +125,16 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
                 doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt");
             }
             
+            @TestMetadata("kotlinClassDerivedClasses.0.kt")
+            public void testKotlinClassDerivedClasses() throws Exception {
+                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt");
+            }
+            
+            @TestMetadata("kotlinClassDerivedTraits.0.kt")
+            public void testKotlinClassDerivedTraits() throws Exception {
+                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt");
+            }
+            
             @TestMetadata("kotlinClassFunctionUsages1.0.kt")
             public void testKotlinClassFunctionUsages1() throws Exception {
                 doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt");
@@ -150,26 +160,6 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
                 doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt");
             }
             
-            @TestMetadata("kotlinDerivedClassUsages1.0.kt")
-            public void testKotlinDerivedClassUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages1.0.kt");
-            }
-            
-            @TestMetadata("kotlinDerivedClassUsages2.0.kt")
-            public void testKotlinDerivedClassUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedClassUsages2.0.kt");
-            }
-            
-            @TestMetadata("kotlinDerivedInterfaceUsages1.0.kt")
-            public void testKotlinDerivedInterfaceUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages1.0.kt");
-            }
-            
-            @TestMetadata("kotlinDerivedInterfaceUsages2.0.kt")
-            public void testKotlinDerivedInterfaceUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinDerivedInterfaceUsages2.0.kt");
-            }
-            
             @TestMetadata("kotlinInnerClassAllUsages.0.kt")
             public void testKotlinInnerClassAllUsages() throws Exception {
                 doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt");
@@ -195,6 +185,16 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
                 doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt");
             }
             
+            @TestMetadata("kotlinTraitDerivedClasses.0.kt")
+            public void testKotlinTraitDerivedClasses() throws Exception {
+                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt");
+            }
+            
+            @TestMetadata("kotlinTraitDerivedTraits.0.kt")
+            public void testKotlinTraitDerivedTraits() throws Exception {
+                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt");
+            }
+            
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findFunctionUsages")
@@ -491,6 +491,11 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
                 doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java");
             }
             
+            @TestMetadata("JKClassDerivedClasses.0.java")
+            public void testJKClassDerivedClasses() throws Exception {
+                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.0.java");
+            }
+
             @TestMetadata("JKClassFieldsUsages.0.java")
             public void testJKClassFieldsUsages() throws Exception {
                 doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java");
@@ -501,19 +506,9 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
                 doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java");
             }
             
-            @TestMetadata("JKDerivedClasses1.0.java")
-            public void testJKDerivedClasses1() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses1.0.java");
-            }
-            
-            @TestMetadata("JKDerivedClasses2.0.java")
-            public void testJKDerivedClasses2() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses2.0.java");
-            }
-            
-            @TestMetadata("JKDerivedClasses3.0.java")
-            public void testJKDerivedClasses3() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKDerivedClasses3.0.java");
+            @TestMetadata("JKDerivedInterfaces.0.java")
+            public void testJKDerivedInterfaces() throws Exception {
+                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.0.java");
             }
             
             @TestMetadata("JKInnerClassAllUsages.0.java")
@@ -521,6 +516,11 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
                 doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java");
             }
             
+            @TestMetadata("JKInterfaceDerivedClasses.0.java")
+            public void testJKInterfaceDerivedClasses() throws Exception {
+                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.0.java");
+            }
+            
             @TestMetadata("JKNestedClassAllUsages.0.java")
             public void testJKNestedClassAllUsages() throws Exception {
                 doTest("idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java");