diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithAnnotationInParam.java b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java
similarity index 93%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithAnnotationInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java
index 29eaa534727..2012bda7d77 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithAnnotationInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java
@@ -1,6 +1,6 @@
 package test;
 
-public interface AnnotationWithAnnotationInParam {
+public interface AnnotationInParam {
 
     public @interface MyAnnotationWithParam {
         MyAnnotation value();
@@ -35,4 +35,4 @@ public interface AnnotationWithAnnotationInParam {
 
     @MyAnnotationWithParam3(@MyAnnotation3(first = "f", second = "s"))
     public class C {}
-}
\ No newline at end of file
+}
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithAnnotationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
similarity index 54%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithAnnotationInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
index 236cf94587d..32db53d2b38 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithAnnotationInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.txt
@@ -1,16 +1,16 @@
 package test
 
-public trait AnnotationWithAnnotationInParam : java.lang.Object {
+public trait AnnotationInParam : java.lang.Object {
     
-    test.AnnotationWithAnnotationInParam.MyAnnotationWithParam(value = MyAnnotation[value = "test"]: test.AnnotationWithAnnotationInParam.MyAnnotation) public open class A : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam(value = MyAnnotation[value = "test"]: test.AnnotationInParam.MyAnnotation) public open class A : java.lang.Object {
         public constructor A()
     }
     
-    test.AnnotationWithAnnotationInParam.MyAnnotationWithParam2(value = MyAnnotation2[value = ["test", "test2"]]: test.AnnotationWithAnnotationInParam.MyAnnotation2) public open class B : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam2(value = MyAnnotation2[value = ["test", "test2"]]: test.AnnotationInParam.MyAnnotation2) public open class B : java.lang.Object {
         public constructor B()
     }
     
-    test.AnnotationWithAnnotationInParam.MyAnnotationWithParam3(value = MyAnnotation3[first = "f", second = "s"]: test.AnnotationWithAnnotationInParam.MyAnnotation3) public open class C : java.lang.Object {
+    test.AnnotationInParam.MyAnnotationWithParam3(value = MyAnnotation3[first = "f", second = "s"]: test.AnnotationInParam.MyAnnotation3) public open class C : java.lang.Object {
         public constructor C()
     }
     
@@ -31,17 +31,17 @@ public trait AnnotationWithAnnotationInParam : java.lang.Object {
     }
     
     public final annotation class MyAnnotationWithParam : jet.Annotation {
-        public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationWithAnnotationInParam.MyAnnotation?)
-        public abstract fun value(): test.AnnotationWithAnnotationInParam.MyAnnotation?
+        public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationInParam.MyAnnotation?)
+        public abstract fun value(): test.AnnotationInParam.MyAnnotation?
     }
     
     public final annotation class MyAnnotationWithParam2 : jet.Annotation {
-        public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationWithAnnotationInParam.MyAnnotation2?)
-        public abstract fun value(): test.AnnotationWithAnnotationInParam.MyAnnotation2?
+        public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationInParam.MyAnnotation2?)
+        public abstract fun value(): test.AnnotationInParam.MyAnnotation2?
     }
     
     public final annotation class MyAnnotationWithParam3 : jet.Annotation {
-        public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationWithAnnotationInParam.MyAnnotation3?)
-        public abstract fun value(): test.AnnotationWithAnnotationInParam.MyAnnotation3?
+        public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3?)
+        public abstract fun value(): test.AnnotationInParam.MyAnnotation3?
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArithmeticExpressionInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArithmeticExpressionInParam.txt
deleted file mode 100644
index 82b416ae8e2..00000000000
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArithmeticExpressionInParam.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-package test
-
-public open class AnnotationWithArithmeticExpressionInParam : java.lang.Object {
-    public constructor AnnotationWithArithmeticExpressionInParam()
-    
-    public final annotation class Anno : jet.Annotation {
-        public constructor Anno(/*0*/ value: jet.Int)
-        public abstract fun value(): jet.Int
-    }
-    
-    test.AnnotationWithArithmeticExpressionInParam.Anno(value = 42.toInt(): jet.Int) public open class Class : java.lang.Object {
-        public constructor Class()
-    }
-}
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArithmeticExpressionInParam.java b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java
similarity index 71%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArithmeticExpressionInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java
index eb604cd3505..ae31c593c40 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArithmeticExpressionInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java
@@ -1,6 +1,6 @@
 package test;
 
-public class AnnotationWithArithmeticExpressionInParam {
+public class ArithmeticExpressionInParam {
     public @interface Anno {
         int value();
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
new file mode 100644
index 00000000000..3f843d891e0
--- /dev/null
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
@@ -0,0 +1,14 @@
+package test
+
+public open class ArithmeticExpressionInParam : java.lang.Object {
+    public constructor ArithmeticExpressionInParam()
+    
+    public final annotation class Anno : jet.Annotation {
+        public constructor Anno(/*0*/ value: jet.Int)
+        public abstract fun value(): jet.Int
+    }
+    
+    test.ArithmeticExpressionInParam.Anno(value = 42.toInt(): jet.Int) public open class Class : java.lang.Object {
+        public constructor Class()
+    }
+}
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfEnumInParam.java b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java
similarity index 81%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfEnumInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java
index 86c996e0388..dca74c34642 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfEnumInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java
@@ -3,7 +3,7 @@ package test;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
-public interface AnnotationWithArrayOfEnumInParam {
+public interface ArrayOfEnumInParam {
 
     @Target({ElementType.FIELD, ElementType.CONSTRUCTOR})
     public @interface targetAnnotation {
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
similarity index 83%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfEnumInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
index 34073e0c2a4..f58bec15a75 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfEnumInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait AnnotationWithArrayOfEnumInParam : java.lang.Object {
+public trait ArrayOfEnumInParam : java.lang.Object {
     
     java.lang.annotation.Target(value = [ElementType.FIELD, ElementType.CONSTRUCTOR]: jet.Array<java.lang.annotation.ElementType>?) public final annotation class targetAnnotation : jet.Annotation {
         public constructor targetAnnotation(/*0*/ value: jet.String?)
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfStringInParam.java b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java
similarity index 80%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfStringInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java
index d86a0039181..886236f8b86 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfStringInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java
@@ -3,7 +3,7 @@ package test;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
-public interface AnnotationWithArrayOfStringInParam {
+public interface ArrayOfStringInParam {
 
     public @interface MyAnnotation {
         String[] value();
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEmptyArrayInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
similarity index 59%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEmptyArrayInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
index ebbf53a8bff..b8433667a0e 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEmptyArrayInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
@@ -1,8 +1,8 @@
 package test
 
-public trait AnnotationWithEmptyArrayInParam : java.lang.Object {
+public trait ArrayOfStringInParam : java.lang.Object {
     
-    test.AnnotationWithEmptyArrayInParam.MyAnnotation(value = []: jet.Array<jet.String>?) public open class A : java.lang.Object {
+    test.ArrayOfStringInParam.MyAnnotation(value = ["a", "b", "c"]: jet.Array<jet.String>?) public open class A : java.lang.Object {
         public constructor A()
     }
     
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEmptyArrayInParam.java b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java
similarity index 80%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEmptyArrayInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java
index 02e6af57d60..53828dc87a5 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEmptyArrayInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java
@@ -3,7 +3,7 @@ package test;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
-public interface AnnotationWithEmptyArrayInParam {
+public interface EmptyArrayInParam {
 
     public @interface MyAnnotation {
         String[] value();
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfStringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
similarity index 57%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfStringInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
index eb6dff427c5..97ab7965628 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfStringInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
@@ -1,8 +1,8 @@
 package test
 
-public trait AnnotationWithArrayOfStringInParam : java.lang.Object {
+public trait EmptyArrayInParam : java.lang.Object {
     
-    test.AnnotationWithArrayOfStringInParam.MyAnnotation(value = ["a", "b", "c"]: jet.Array<jet.String>?) public open class A : java.lang.Object {
+    test.EmptyArrayInParam.MyAnnotation(value = []: jet.Array<jet.String>?) public open class A : java.lang.Object {
         public constructor A()
     }
     
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEnumInParam.java b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java
similarity index 82%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEnumInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java
index 85b0776e267..243484a1aad 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEnumInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java
@@ -3,7 +3,7 @@ package test;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-public interface AnnotationWithEnumInParam {
+public interface EnumInParam {
 
     @Retention(RetentionPolicy.RUNTIME)
     public @interface RetentionAnnotation {
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEnumInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
similarity index 84%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEnumInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
index 5787ddab17d..3f39ab7cacb 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEnumInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
@@ -1,6 +1,6 @@
 package test
 
-public trait AnnotationWithEnumInParam : java.lang.Object {
+public trait EnumInParam : java.lang.Object {
     
     java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : jet.Annotation {
         public constructor RetentionAnnotation(/*0*/ value: jet.String?)
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithPrimitiveValueInParam.java b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java
similarity index 91%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithPrimitiveValueInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java
index f90ec47c536..3ed1ff6433f 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithPrimitiveValueInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java
@@ -4,7 +4,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 // TODO: remove comments when fix in idea will be accepted
-public interface AnnotationWithPrimitiveValueInParam {
+public interface PrimitiveValueInParam {
 
     public @interface Ann {
         int i();
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithPrimitiveValueInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
similarity index 62%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithPrimitiveValueInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
index 4a4590b21e1..f0c5964e2a1 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithPrimitiveValueInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
@@ -1,8 +1,8 @@
 package test
 
-public trait AnnotationWithPrimitiveValueInParam : java.lang.Object {
+public trait PrimitiveValueInParam : java.lang.Object {
     
-    test.AnnotationWithPrimitiveValueInParam.Ann(bool = true: jet.Boolean, d = 1.0.toDouble(): jet.Double, f = 1.0.toFloat(): jet.Float, i = 1.toInt(): jet.Int, l = 1.toLong(): jet.Long, str = "str": jet.String) public open class A : java.lang.Object {
+    test.PrimitiveValueInParam.Ann(bool = true: jet.Boolean, d = 1.0.toDouble(): jet.Double, f = 1.0.toFloat(): jet.Float, i = 1.toInt(): jet.Int, l = 1.toLong(): jet.Long, str = "str": jet.String) public open class A : java.lang.Object {
         public constructor A()
     }
     
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConcatenationInParam.java b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java
similarity index 70%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConcatenationInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java
index cf4eddb40cb..b753b3ba184 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConcatenationInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java
@@ -1,6 +1,6 @@
 package test;
 
-public interface AnnotationWithStringConcatenationInParam {
+public interface StringConcatenationInParam {
     public @interface Anno {
         String value();
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
similarity index 57%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
index 431ba6634eb..10b7fbe9ca3 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait AnnotationWithStringInParam : java.lang.Object {
+public trait StringConcatenationInParam : java.lang.Object {
     
     public final annotation class Anno : jet.Annotation {
         public constructor Anno(/*0*/ value: jet.String?)
         public abstract fun value(): jet.String?
     }
     
-    test.AnnotationWithStringInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object {
+    test.StringConcatenationInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object {
         public constructor Class()
     }
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConstantInParam.java b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java
similarity index 76%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConstantInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java
index 55fa5fa4046..9462a7d97f7 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConstantInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java
@@ -1,6 +1,6 @@
 package test;
 
-public interface AnnotationWithStringConstantInParam {
+public interface StringConstantInParam {
     public static final String HEL = "hel";
 
     public @interface Anno {
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConstantInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
similarity index 53%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConstantInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
index 016a295c193..eae4846691e 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConstantInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
@@ -1,17 +1,17 @@
 package test
 
-public trait AnnotationWithStringConstantInParam : java.lang.Object {
+public trait StringConstantInParam : java.lang.Object {
     
     public final annotation class Anno : jet.Annotation {
         public constructor Anno(/*0*/ value: jet.String?)
         public abstract fun value(): jet.String?
     }
     
-    test.AnnotationWithStringConstantInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object {
+    test.StringConstantInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object {
         public constructor Class()
     }
 }
 
-package AnnotationWithStringConstantInParam {
+package StringConstantInParam {
     public val HEL: jet.String
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringInParam.java b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.java
similarity index 73%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringInParam.java
rename to compiler/testData/loadJava/compiledJava/annotations/StringInParam.java
index bee4f5c7516..53606ae91de 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringInParam.java
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.java
@@ -1,6 +1,6 @@
 package test;
 
-public interface AnnotationWithStringInParam {
+public interface StringInParam {
     public @interface Anno {
         String value();
     }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConcatenationInParam.txt b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
similarity index 53%
rename from compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConcatenationInParam.txt
rename to compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
index d8eb89f1b6c..95687c3c18c 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConcatenationInParam.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
@@ -1,13 +1,13 @@
 package test
 
-public trait AnnotationWithStringConcatenationInParam : java.lang.Object {
+public trait StringInParam : java.lang.Object {
     
     public final annotation class Anno : jet.Annotation {
         public constructor Anno(/*0*/ value: jet.String?)
         public abstract fun value(): jet.String?
     }
     
-    test.AnnotationWithStringConcatenationInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object {
+    test.StringInParam.Anno(value = "hello": jet.String) public open class Class : java.lang.Object {
         public constructor Class()
     }
 }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index a99a35340ca..4ca403c6bc1 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -1060,54 +1060,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava/annotations"), Pattern.compile("^(.+)\\.java$"), true);
             }
             
-            @TestMetadata("AnnotationWithAnnotationInParam.java")
-            public void testAnnotationWithAnnotationInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithAnnotationInParam.java");
+            @TestMetadata("AnnotationInParam.java")
+            public void testAnnotationInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java");
             }
             
-            @TestMetadata("AnnotationWithArithmeticExpressionInParam.java")
-            public void testAnnotationWithArithmeticExpressionInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArithmeticExpressionInParam.java");
+            @TestMetadata("ArithmeticExpressionInParam.java")
+            public void testArithmeticExpressionInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java");
             }
             
-            @TestMetadata("AnnotationWithArrayOfEnumInParam.java")
-            public void testAnnotationWithArrayOfEnumInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfEnumInParam.java");
+            @TestMetadata("ArrayOfEnumInParam.java")
+            public void testArrayOfEnumInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java");
             }
             
-            @TestMetadata("AnnotationWithArrayOfStringInParam.java")
-            public void testAnnotationWithArrayOfStringInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfStringInParam.java");
-            }
-            
-            @TestMetadata("AnnotationWithEmptyArrayInParam.java")
-            public void testAnnotationWithEmptyArrayInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEmptyArrayInParam.java");
-            }
-            
-            @TestMetadata("AnnotationWithEnumInParam.java")
-            public void testAnnotationWithEnumInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEnumInParam.java");
-            }
-            
-            @TestMetadata("AnnotationWithPrimitiveValueInParam.java")
-            public void testAnnotationWithPrimitiveValueInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithPrimitiveValueInParam.java");
-            }
-            
-            @TestMetadata("AnnotationWithStringConcatenationInParam.java")
-            public void testAnnotationWithStringConcatenationInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConcatenationInParam.java");
-            }
-            
-            @TestMetadata("AnnotationWithStringConstantInParam.java")
-            public void testAnnotationWithStringConstantInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringConstantInParam.java");
-            }
-            
-            @TestMetadata("AnnotationWithStringInParam.java")
-            public void testAnnotationWithStringInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationWithStringInParam.java");
+            @TestMetadata("ArrayOfStringInParam.java")
+            public void testArrayOfStringInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java");
             }
             
             @TestMetadata("CustomAnnotation.java")
@@ -1120,6 +1090,21 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.java");
             }
             
+            @TestMetadata("EmptyArrayInParam.java")
+            public void testEmptyArrayInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java");
+            }
+            
+            @TestMetadata("EnumInParam.java")
+            public void testEnumInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java");
+            }
+            
+            @TestMetadata("PrimitiveValueInParam.java")
+            public void testPrimitiveValueInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java");
+            }
+            
             @TestMetadata("RecursiveAnnotation.java")
             public void testRecursiveAnnotation() throws Exception {
                 doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.java");
@@ -1130,6 +1115,21 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.java");
             }
             
+            @TestMetadata("StringConcatenationInParam.java")
+            public void testStringConcatenationInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java");
+            }
+            
+            @TestMetadata("StringConstantInParam.java")
+            public void testStringConstantInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java");
+            }
+            
+            @TestMetadata("StringInParam.java")
+            public void testStringInParam() throws Exception {
+                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/StringInParam.java");
+            }
+            
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/protectedPackage")