diff --git a/j2k/testData/fileOrElement/codeSimplifications/GetOperator.java b/j2k/testData/fileOrElement/postProcessing/GetOperator.java
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/GetOperator.java
rename to j2k/testData/fileOrElement/postProcessing/GetOperator.java
diff --git a/j2k/testData/fileOrElement/codeSimplifications/GetOperator.kt b/j2k/testData/fileOrElement/postProcessing/GetOperator.kt
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/GetOperator.kt
rename to j2k/testData/fileOrElement/postProcessing/GetOperator.kt
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.java b/j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.java
rename to j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt b/j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.kt
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt
rename to j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.kt
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java b/j2k/testData/fileOrElement/postProcessing/IfToElvis.java
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java
rename to j2k/testData/fileOrElement/postProcessing/IfToElvis.java
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt b/j2k/testData/fileOrElement/postProcessing/IfToElvis.kt
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt
rename to j2k/testData/fileOrElement/postProcessing/IfToElvis.kt
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java b/j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java
rename to j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt b/j2k/testData/fileOrElement/postProcessing/IfToSafeCall.kt
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt
rename to j2k/testData/fileOrElement/postProcessing/IfToSafeCall.kt
diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.java b/j2k/testData/fileOrElement/postProcessing/NotIs.java
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/NotIs.java
rename to j2k/testData/fileOrElement/postProcessing/NotIs.java
diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt b/j2k/testData/fileOrElement/postProcessing/NotIs.kt
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/NotIs.kt
rename to j2k/testData/fileOrElement/postProcessing/NotIs.kt
diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java b/j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java
rename to j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java
diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt b/j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.kt
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt
rename to j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.kt
diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.java b/j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.java
rename to j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java
diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt b/j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.kt
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt
rename to j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.kt
diff --git a/j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.java b/j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.java
rename to j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java
diff --git a/j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.kt b/j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.kt
similarity index 100%
rename from j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.kt
rename to j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.kt
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
index 2966cad1541..c1571c3a83a 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java
@@ -947,63 +947,6 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
         }
     }
 
-    @TestMetadata("j2k/testData/fileOrElement/codeSimplifications")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class CodeSimplifications extends AbstractJavaToKotlinConverterForWebDemoTest {
-        public void testAllFilesPresentInCodeSimplifications() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
-        }
-
-        @TestMetadata("GetOperator.java")
-        public void testGetOperator() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/GetOperator.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("IfNullReturnToElvis.java")
-        public void testIfNullReturnToElvis() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("IfToElvis.java")
-        public void testIfToElvis() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("IfToSafeCall.java")
-        public void testIfToSafeCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("NotIs.java")
-        public void testNotIs() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("RedundantTypeCast.java")
-        public void testRedundantTypeCast() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("RedundantTypeCastAndInline.java")
-        public void testRedundantTypeCastAndInline() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("SyntheticExtensionPropertyAccess.java")
-        public void testSyntheticExtensionPropertyAccess() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.java");
-            doTest(fileName);
-        }
-    }
-
     @TestMetadata("j2k/testData/fileOrElement/comments")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -3704,6 +3647,63 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
         }
     }
 
+    @TestMetadata("j2k/testData/fileOrElement/postProcessing")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PostProcessing extends AbstractJavaToKotlinConverterForWebDemoTest {
+        public void testAllFilesPresentInPostProcessing() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postProcessing"), Pattern.compile("^(.+)\\.java$"), true);
+        }
+
+        @TestMetadata("GetOperator.java")
+        public void testGetOperator() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/GetOperator.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("IfNullReturnToElvis.java")
+        public void testIfNullReturnToElvis() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("IfToElvis.java")
+        public void testIfToElvis() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToElvis.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("IfToSafeCall.java")
+        public void testIfToSafeCall() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NotIs.java")
+        public void testNotIs() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/NotIs.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("RedundantTypeCast.java")
+        public void testRedundantTypeCast() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("RedundantTypeCastAndInline.java")
+        public void testRedundantTypeCastAndInline() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("SyntheticExtensionPropertyAccess.java")
+        public void testSyntheticExtensionPropertyAccess() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("j2k/testData/fileOrElement/postfixOperator")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
index fa39edeffb1..a101e4e6af0 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java
@@ -947,63 +947,6 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
         }
     }
 
-    @TestMetadata("j2k/testData/fileOrElement/codeSimplifications")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class CodeSimplifications extends AbstractJavaToKotlinConverterSingleFileTest {
-        public void testAllFilesPresentInCodeSimplifications() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/codeSimplifications"), Pattern.compile("^(.+)\\.java$"), true);
-        }
-
-        @TestMetadata("GetOperator.java")
-        public void testGetOperator() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/GetOperator.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("IfNullReturnToElvis.java")
-        public void testIfNullReturnToElvis() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("IfToElvis.java")
-        public void testIfToElvis() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToElvis.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("IfToSafeCall.java")
-        public void testIfToSafeCall() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("NotIs.java")
-        public void testNotIs() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/NotIs.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("RedundantTypeCast.java")
-        public void testRedundantTypeCast() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("RedundantTypeCastAndInline.java")
-        public void testRedundantTypeCastAndInline() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.java");
-            doTest(fileName);
-        }
-
-        @TestMetadata("SyntheticExtensionPropertyAccess.java")
-        public void testSyntheticExtensionPropertyAccess() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/codeSimplifications/SyntheticExtensionPropertyAccess.java");
-            doTest(fileName);
-        }
-    }
-
     @TestMetadata("j2k/testData/fileOrElement/comments")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
@@ -3704,6 +3647,63 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
         }
     }
 
+    @TestMetadata("j2k/testData/fileOrElement/postProcessing")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class PostProcessing extends AbstractJavaToKotlinConverterSingleFileTest {
+        public void testAllFilesPresentInPostProcessing() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/postProcessing"), Pattern.compile("^(.+)\\.java$"), true);
+        }
+
+        @TestMetadata("GetOperator.java")
+        public void testGetOperator() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/GetOperator.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("IfNullReturnToElvis.java")
+        public void testIfNullReturnToElvis() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfNullReturnToElvis.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("IfToElvis.java")
+        public void testIfToElvis() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToElvis.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("IfToSafeCall.java")
+        public void testIfToSafeCall() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/IfToSafeCall.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NotIs.java")
+        public void testNotIs() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/NotIs.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("RedundantTypeCast.java")
+        public void testRedundantTypeCast() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCast.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("RedundantTypeCastAndInline.java")
+        public void testRedundantTypeCastAndInline() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/RedundantTypeCastAndInline.java");
+            doTest(fileName);
+        }
+
+        @TestMetadata("SyntheticExtensionPropertyAccess.java")
+        public void testSyntheticExtensionPropertyAccess() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/postProcessing/SyntheticExtensionPropertyAccess.java");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("j2k/testData/fileOrElement/postfixOperator")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)