diff --git a/compiler/testData/loadJava/kotlinSignature/CustomVariance.java b/compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.java
similarity index 86%
rename from compiler/testData/loadJava/kotlinSignature/CustomVariance.java
rename to compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.java
index b8b012c3d99..6210ad842f5 100644
--- a/compiler/testData/loadJava/kotlinSignature/CustomVariance.java
+++ b/compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.java
@@ -4,7 +4,7 @@ import java.util.*;
 
 import jet.runtime.typeinfo.KotlinSignature;
 
-public class CustomVariance {
+public class CustomProjectionKind {
     @KotlinSignature("fun foo(): MutableList<out Number>")
     public List<Number> foo() {
         throw new UnsupportedOperationException();
diff --git a/compiler/testData/loadJava/kotlinSignature/CustomVariance.kt b/compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.kt
similarity index 71%
rename from compiler/testData/loadJava/kotlinSignature/CustomVariance.kt
rename to compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.kt
index 2f3cc20a793..c9994aa65e9 100644
--- a/compiler/testData/loadJava/kotlinSignature/CustomVariance.kt
+++ b/compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.kt
@@ -2,6 +2,6 @@ package test
 
 import java.util.*
 
-public open class CustomVariance : Object() {
+public open class CustomProjectionKind : Object() {
     public open fun foo() : MutableList<out Number> = throw UnsupportedOperationException()
 }
diff --git a/compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.txt b/compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.txt
new file mode 100644
index 00000000000..3113e086f19
--- /dev/null
+++ b/compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.txt
@@ -0,0 +1,6 @@
+package test
+
+public open class CustomProjectionKind : java.lang.Object {
+    public constructor CustomProjectionKind()
+    public open fun foo() : jet.MutableList<out jet.Number>
+}
diff --git a/compiler/testData/loadJava/kotlinSignature/CustomVariance.txt b/compiler/testData/loadJava/kotlinSignature/CustomVariance.txt
deleted file mode 100644
index f2cfa28b83b..00000000000
--- a/compiler/testData/loadJava/kotlinSignature/CustomVariance.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-package test
-
-public open class CustomVariance : java.lang.Object {
-    public constructor CustomVariance()
-    public open fun foo() : jet.MutableList<out jet.Number>
-}
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.java b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.java
similarity index 90%
rename from compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.java
rename to compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.java
index 2a5b30c9db1..4a61ab17be0 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.java
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 
 import jet.runtime.typeinfo.KotlinSignature;
 
-public interface InheritVariance {
+public interface InheritProjectionKind {
 
     public interface Super {
         @KotlinSignature("fun foo(): MutableCollection<out Number>")
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.kt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt
similarity index 81%
rename from compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.kt
rename to compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt
index 0ccd33c89aa..701d1d1fb1b 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.kt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt
@@ -1,6 +1,6 @@
 package test
 
-public trait InheritVariance: Object {
+public trait InheritProjectionKind: Object {
 
     public trait Super: Object {
         public fun foo(): MutableCollection<out Number>
diff --git a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
similarity index 67%
rename from compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt
rename to compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
index d0d1030e629..5ecfe4e9863 100644
--- a/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.txt
+++ b/compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.txt
@@ -1,8 +1,8 @@
 package test
 
-public trait InheritVariance : java.lang.Object {
+public trait InheritProjectionKind : java.lang.Object {
     
-    public trait Sub : test.InheritVariance.Super {
+    public trait Sub : test.InheritProjectionKind.Super {
         public abstract override /*1*/ fun foo() : jet.MutableList<out jet.Number>
     }
     
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index 3ea854aa10b..1a6d5377b0f 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -283,9 +283,9 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             doTest("compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.java");
         }
         
-        @TestMetadata("CustomVariance.java")
-        public void testCustomVariance() throws Exception {
-            doTest("compiler/testData/loadJava/kotlinSignature/CustomVariance.java");
+        @TestMetadata("CustomProjectionKind.java")
+        public void testCustomProjectionKind() throws Exception {
+            doTest("compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.java");
         }
         
         @TestMetadata("MethodWithFunctionTypes.java")
@@ -697,6 +697,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java");
                 }
                 
+                @TestMetadata("InheritProjectionKind.java")
+                public void testInheritProjectionKind() throws Exception {
+                    doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.java");
+                }
+                
                 @TestMetadata("InheritReadOnlinessOfArgument.java")
                 public void testInheritReadOnlinessOfArgument() throws Exception {
                     doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java");
@@ -712,11 +717,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java");
                 }
                 
-                @TestMetadata("InheritVariance.java")
-                public void testInheritVariance() throws Exception {
-                    doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.java");
-                }
-                
                 @TestMetadata("SameProjectionKind.java")
                 public void testSameProjectionKind() throws Exception {
                     doTest("compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.java");
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index a5deff0392b..4e05d900526 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1252,9 +1252,9 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
                 doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/ConstructorWithoutParams.kt");
             }
             
-            @TestMetadata("CustomVariance.kt")
-            public void testCustomVariance() throws Exception {
-                doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/CustomVariance.kt");
+            @TestMetadata("CustomProjectionKind.kt")
+            public void testCustomProjectionKind() throws Exception {
+                doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/CustomProjectionKind.kt");
             }
             
             @TestMetadata("MethodWithFunctionTypes.kt")
@@ -1666,6 +1666,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
                         doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
                     }
                     
+                    @TestMetadata("InheritProjectionKind.kt")
+                    public void testInheritProjectionKind() throws Exception {
+                        doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt");
+                    }
+                    
                     @TestMetadata("InheritReadOnlinessOfArgument.kt")
                     public void testInheritReadOnlinessOfArgument() throws Exception {
                         doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt");
@@ -1681,11 +1686,6 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
                         doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt");
                     }
                     
-                    @TestMetadata("InheritVariance.kt")
-                    public void testInheritVariance() throws Exception {
-                        doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/InheritVariance.kt");
-                    }
-                    
                     @TestMetadata("SameProjectionKind.kt")
                     public void testSameProjectionKind() throws Exception {
                         doTestNotCheckingPrimaryConstructors("compiler/testData/loadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");