diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index e2eda814cbf..496e4564dbc 100755
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -969,7 +969,7 @@ fun main(args: Array<String>) {
 
     testGroup("nj2k/tests", "nj2k/testData/") {
         testClass<AbstractNullabilityAnalysisTest> {
-            model("nullabilityAnalyzer")
+            model("nullabilityAnalysis")
         }
     }
 
diff --git a/nj2k/testData/nullabilityAnalyzer/compareWithNull.kt b/nj2k/testData/nullabilityAnalysis/compareWithNull.kt
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/compareWithNull.kt
rename to nj2k/testData/nullabilityAnalysis/compareWithNull.kt
diff --git a/nj2k/testData/nullabilityAnalyzer/compareWithNull.kt.after b/nj2k/testData/nullabilityAnalysis/compareWithNull.kt.after
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/compareWithNull.kt.after
rename to nj2k/testData/nullabilityAnalysis/compareWithNull.kt.after
diff --git a/nj2k/testData/nullabilityAnalyzer/functionTypeParameterNullability.kt b/nj2k/testData/nullabilityAnalysis/functionTypeParameterNullability.kt
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/functionTypeParameterNullability.kt
rename to nj2k/testData/nullabilityAnalysis/functionTypeParameterNullability.kt
diff --git a/nj2k/testData/nullabilityAnalyzer/functionTypeParameterNullability.kt.after b/nj2k/testData/nullabilityAnalysis/functionTypeParameterNullability.kt.after
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/functionTypeParameterNullability.kt.after
rename to nj2k/testData/nullabilityAnalysis/functionTypeParameterNullability.kt.after
diff --git a/nj2k/testData/nullabilityAnalyzer/nullAsAssignment.kt b/nj2k/testData/nullabilityAnalysis/nullAsAssignment.kt
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/nullAsAssignment.kt
rename to nj2k/testData/nullabilityAnalysis/nullAsAssignment.kt
diff --git a/nj2k/testData/nullabilityAnalyzer/nullAsAssignment.kt.after b/nj2k/testData/nullabilityAnalysis/nullAsAssignment.kt.after
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/nullAsAssignment.kt.after
rename to nj2k/testData/nullabilityAnalysis/nullAsAssignment.kt.after
diff --git a/nj2k/testData/nullabilityAnalyzer/nullAsInitializer.kt b/nj2k/testData/nullabilityAnalysis/nullAsInitializer.kt
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/nullAsInitializer.kt
rename to nj2k/testData/nullabilityAnalysis/nullAsInitializer.kt
diff --git a/nj2k/testData/nullabilityAnalyzer/nullAsInitializer.kt.after b/nj2k/testData/nullabilityAnalysis/nullAsInitializer.kt.after
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/nullAsInitializer.kt.after
rename to nj2k/testData/nullabilityAnalysis/nullAsInitializer.kt.after
diff --git a/nj2k/testData/nullabilityAnalyzer/smartCast.kt b/nj2k/testData/nullabilityAnalysis/smartCast.kt
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/smartCast.kt
rename to nj2k/testData/nullabilityAnalysis/smartCast.kt
diff --git a/nj2k/testData/nullabilityAnalyzer/smartCast.kt.after b/nj2k/testData/nullabilityAnalysis/smartCast.kt.after
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/smartCast.kt.after
rename to nj2k/testData/nullabilityAnalysis/smartCast.kt.after
diff --git a/nj2k/testData/nullabilityAnalyzer/superMethod.kt b/nj2k/testData/nullabilityAnalysis/superMethod.kt
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/superMethod.kt
rename to nj2k/testData/nullabilityAnalysis/superMethod.kt
diff --git a/nj2k/testData/nullabilityAnalyzer/superMethod.kt.after b/nj2k/testData/nullabilityAnalysis/superMethod.kt.after
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/superMethod.kt.after
rename to nj2k/testData/nullabilityAnalysis/superMethod.kt.after
diff --git a/nj2k/testData/nullabilityAnalyzer/typeCast.kt b/nj2k/testData/nullabilityAnalysis/typeCast.kt
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/typeCast.kt
rename to nj2k/testData/nullabilityAnalysis/typeCast.kt
diff --git a/nj2k/testData/nullabilityAnalyzer/typeCast.kt.after b/nj2k/testData/nullabilityAnalysis/typeCast.kt.after
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/typeCast.kt.after
rename to nj2k/testData/nullabilityAnalysis/typeCast.kt.after
diff --git a/nj2k/testData/nullabilityAnalyzer/typeParameters.kt b/nj2k/testData/nullabilityAnalysis/typeParameters.kt
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/typeParameters.kt
rename to nj2k/testData/nullabilityAnalysis/typeParameters.kt
diff --git a/nj2k/testData/nullabilityAnalyzer/typeParameters.kt.after b/nj2k/testData/nullabilityAnalysis/typeParameters.kt.after
similarity index 100%
rename from nj2k/testData/nullabilityAnalyzer/typeParameters.kt.after
rename to nj2k/testData/nullabilityAnalysis/typeParameters.kt.after
diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/NullabilityAnalysisTestGenerated.java b/nj2k/tests/org/jetbrains/kotlin/nj2k/NullabilityAnalysisTestGenerated.java
index afab2337384..1adfe28ec73 100644
--- a/nj2k/tests/org/jetbrains/kotlin/nj2k/NullabilityAnalysisTestGenerated.java
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NullabilityAnalysisTestGenerated.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("nj2k/testData/fileOrElement")
+@TestMetadata("nj2k/testData/nullabilityAnalysis")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class NullabilityAnalysisTestGenerated extends AbstractNullabilityAnalysisTest {
@@ -31,41 +31,41 @@ public class NullabilityAnalysisTestGenerated extends AbstractNullabilityAnalysi
 
     @TestMetadata("compareWithNull.kt")
     public void testCompareWithNull() throws Exception {
-        runTest("nj2k/testData/fileOrElement/compareWithNull.kt");
+        runTest("nj2k/testData/nullabilityAnalysis/compareWithNull.kt");
     }
 
     @TestMetadata("functionTypeParameterNullability.kt")
     public void testFunctionTypeParameterNullability() throws Exception {
-        runTest("nj2k/testData/fileOrElement/functionTypeParameterNullability.kt");
+        runTest("nj2k/testData/nullabilityAnalysis/functionTypeParameterNullability.kt");
     }
 
     @TestMetadata("nullAsAssignment.kt")
     public void testNullAsAssignment() throws Exception {
-        runTest("nj2k/testData/fileOrElement/nullAsAssignment.kt");
+        runTest("nj2k/testData/nullabilityAnalysis/nullAsAssignment.kt");
     }
 
     @TestMetadata("nullAsInitializer.kt")
     public void testNullAsInitializer() throws Exception {
-        runTest("nj2k/testData/fileOrElement/nullAsInitializer.kt");
+        runTest("nj2k/testData/nullabilityAnalysis/nullAsInitializer.kt");
     }
 
     @TestMetadata("smartCast.kt")
     public void testSmartCast() throws Exception {
-        runTest("nj2k/testData/fileOrElement/smartCast.kt");
+        runTest("nj2k/testData/nullabilityAnalysis/smartCast.kt");
     }
 
     @TestMetadata("superMethod.kt")
     public void testSuperMethod() throws Exception {
-        runTest("nj2k/testData/fileOrElement/superMethod.kt");
+        runTest("nj2k/testData/nullabilityAnalysis/superMethod.kt");
     }
 
     @TestMetadata("typeCast.kt")
     public void testTypeCast() throws Exception {
-        runTest("nj2k/testData/fileOrElement/typeCast.kt");
+        runTest("nj2k/testData/nullabilityAnalysis/typeCast.kt");
     }
 
     @TestMetadata("typeParameters.kt")
     public void testTypeParameters() throws Exception {
-        runTest("nj2k/testData/fileOrElement/typeParameters.kt");
+        runTest("nj2k/testData/nullabilityAnalysis/typeParameters.kt");
     }
 }