diff --git a/compiler/testData/codegen/jdk-headers/arrayList.kt b/compiler/testData/codegen/jdk-annotations/arrayList.kt
similarity index 100%
rename from compiler/testData/codegen/jdk-headers/arrayList.kt
rename to compiler/testData/codegen/jdk-annotations/arrayList.kt
diff --git a/compiler/testData/codegen/jdk-headers/hashMap.kt b/compiler/testData/codegen/jdk-annotations/hashMap.kt
similarity index 100%
rename from compiler/testData/codegen/jdk-headers/hashMap.kt
rename to compiler/testData/codegen/jdk-annotations/hashMap.kt
diff --git a/compiler/testData/diagnostics/tests/alt-headers/ArrayListAndMap.jet b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.jet
similarity index 100%
rename from compiler/testData/diagnostics/tests/alt-headers/ArrayListAndMap.jet
rename to compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.jet
diff --git a/compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.jet
similarity index 100%
rename from compiler/testData/diagnostics/tests/alt-headers/ArrayListClone.jet
rename to compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.jet
diff --git a/compiler/testData/diagnostics/tests/alt-headers/ArrayListToArray.jet b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.jet
similarity index 100%
rename from compiler/testData/diagnostics/tests/alt-headers/ArrayListToArray.jet
rename to compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.jet
diff --git a/compiler/tests/org/jetbrains/jet/codegen/JdkHeadersTest.java b/compiler/tests/org/jetbrains/jet/codegen/JdkAnnotationsTest.java
similarity index 80%
rename from compiler/tests/org/jetbrains/jet/codegen/JdkHeadersTest.java
rename to compiler/tests/org/jetbrains/jet/codegen/JdkAnnotationsTest.java
index 0c579fe4a73..de402711423 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/JdkHeadersTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/JdkAnnotationsTest.java
@@ -19,11 +19,11 @@ package org.jetbrains.jet.codegen;
 import org.jetbrains.jet.ConfigurationKind;
 
 /**
- * Test correct code is generated for descriptors loaded as alt jdk headers
+ * Test correct code is generated for descriptors loaded with alt jdk annotations
  *
  * @author Stepan Koltsov
  */
-public class JdkHeadersTest extends CodegenTestCase {
+public class JdkAnnotationsTest extends CodegenTestCase {
 
     @Override
     protected void setUp() throws Exception {
@@ -32,11 +32,11 @@ public class JdkHeadersTest extends CodegenTestCase {
     }
 
     public void testArrayList() {
-        blackBoxFile("jdk-headers/arrayList.kt");
+        blackBoxFile("jdk-annotations/arrayList.kt");
     }
 
     public void testHashMap() {
-        blackBoxFile("jdk-headers/hashMap.kt");
+        blackBoxFile("jdk-annotations/hashMap.kt");
     }
 
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/LibraryNavigationRegressionTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/LibraryNavigationRegressionTest.java
index 2f5f948b165..7fa0c403897 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/LibraryNavigationRegressionTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/LibraryNavigationRegressionTest.java
@@ -51,7 +51,7 @@ public class LibraryNavigationRegressionTest extends LightCodeInsightFixtureTest
     /**
      * Regression test against KT-1815
      */
-    public void testRefToAltHeaders() {
+    public void testRefToClassesWithAltSignatureAnnotations() {
         PsiElement navigationElement = configureAndResolve("fun foo(e : java.util.Map.Entry<String, String>) { e.<caret>getKey(); }");
         PsiClass expectedClass =
                 JavaPsiFacade.getInstance(getProject()).findClass("java.util.Map.Entry", GlobalSearchScope.allScope(getProject()));
diff --git a/jdk-annotations/java/util/annotations.xml b/jdk-annotations/java/util/annotations.xml
index c3a7b68a23e..fd04ab52a52 100644
--- a/jdk-annotations/java/util/annotations.xml
+++ b/jdk-annotations/java/util/annotations.xml
@@ -735,7 +735,7 @@
     </annotation>
   </item>
 
-  <!-- TODO temporary fix for alt-headers/ArrayListClone.jet test -->
+  <!-- TODO temporary fix for jdk-annotations/ArrayListClone.jet test -->
   <item name='java.util.ArrayList java.lang.Object clone()'>
     <annotation name='jet.runtime.typeinfo.KotlinSignature'>
       <val name="value" val="&quot;fun clone() : Any&quot;"/>