diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/Directives.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/Directives.kt
index 283faae5e04..e731ef7646a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/Directives.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/Directives.kt
@@ -35,8 +35,4 @@ class Directives {
             values.flatMap { InTextDirectivesUtils.splitValues(arrayListOf(), it) }
         }
     }
-
-    public fun asMapOfSingleValues(): Map<String, String?> {
-        return directives.entries.associate { it.key to it.value?.single() }
-    }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java
index 72a40a5f4de..a13344011ad 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.java
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt
index 9319f5aad26..79aae4ec008 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNull.kt
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 class Test(str: String) {
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java
index 0944b5f96a2..74da4043970 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.java
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
index e8ebf943b84..7cbc82e33ad 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 internal class Foo {
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.java b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.java
index dd017d87bb7..31b6e065665 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.java
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.java
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt
index ff38c4a4cd7..304fa7a26a4 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNullable.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 class Test(str: String?) {
diff --git a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java
index 2328ea5cff9..f25b8c75aa4 100644
--- a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java
+++ b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.java
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 import java.util.HashSet;
 
 class Foo {
diff --git a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt
index 8b1c1eb4517..6c9806c2b32 100644
--- a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt
+++ b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 import java.util.HashSet
 
 internal class Foo {
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java
index 6c3318b19cc..1c3d6d8ad28 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.java
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 class Library {
   void call() {}
 
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
index e09f3b4c7af..0a8e95f2f89 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 internal class Library {
 
     val string: String
diff --git a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java
index 15557c69446..bfc3abc2332 100644
--- a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java
+++ b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.java
@@ -1,4 +1,4 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
 //file
 public class A {
     public static void main(String[] args) {
diff --git a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt
index 5300954bdea..23c36a5cba8 100644
--- a/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt
+++ b/j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt
@@ -1,4 +1,4 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
 object A {
     @JvmStatic
     fun main(args: Array<String>) {
diff --git a/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java b/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java
index 525ada24f9f..67b768e7714 100644
--- a/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java
+++ b/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = "abc";
   if (b) {
diff --git a/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt
index 71c11a12390..ef97858fed6 100644
--- a/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     var s: String? = "abc"
     if (b) {
diff --git a/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java b/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java
index 0b1206661fd..d23667287b0 100644
--- a/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java
+++ b/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo() {
   String s = bar();
   if (s != null) {
diff --git a/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt
index c95cb3f308d..00792cdf61e 100644
--- a/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo() {
     val s: String? = bar()
     if (s != null) {
diff --git a/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java b/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java
index b8ff485ddd3..1e6c21676bf 100644
--- a/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java
+++ b/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = null;
   if (b) {
diff --git a/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt
index 1c9b83d495b..7e64f4dd42f 100644
--- a/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     var s: String? = null
     if (b) {
diff --git a/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java b/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java
index 345ab62cd15..b882346952e 100644
--- a/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java
+++ b/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = (b ? "abc" : null);
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt b/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt
index 7d3a861da9c..1aaa4760e8a 100644
--- a/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt
+++ b/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     val s: String? = if (b) "abc" else null
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/settings/openByDefault.java b/j2k/testData/fileOrElement/settings/openByDefault.java
index 00c68630efb..823c2b3bfd5 100644
--- a/j2k/testData/fileOrElement/settings/openByDefault.java
+++ b/j2k/testData/fileOrElement/settings/openByDefault.java
@@ -1,5 +1,5 @@
 //file
-// !openByDefault: true
+// !OPEN_BY_DEFAULT: true
 
 class A {
     void foo1() { }
diff --git a/j2k/testData/fileOrElement/settings/openByDefault.kt b/j2k/testData/fileOrElement/settings/openByDefault.kt
index 1d0ff34863e..92c0cc5c3c0 100644
--- a/j2k/testData/fileOrElement/settings/openByDefault.kt
+++ b/j2k/testData/fileOrElement/settings/openByDefault.kt
@@ -1,4 +1,4 @@
-// !openByDefault: true
+// !OPEN_BY_DEFAULT: true
 
 internal open class A {
     internal open fun foo1() {}
diff --git a/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java b/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java
index e8bf96c57d5..a21a480e856 100644
--- a/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java
+++ b/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.java
@@ -1,5 +1,5 @@
 //file
-// !specifyFieldTypeByDefault: true
+// !SPECIFY_FIELD_TYPE_BY_DEFAULT: true
 import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
diff --git a/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt b/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt
index 16949c81091..a038b7ecea7 100644
--- a/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt
+++ b/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt
@@ -1,4 +1,4 @@
-// !specifyFieldTypeByDefault: true
+// !SPECIFY_FIELD_TYPE_BY_DEFAULT: true
 import java.util.*
 
 internal class A {
diff --git a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java
index de5ea41f4de..a420c12db6f 100644
--- a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java
+++ b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 public void foo() {
   int i = 1;
   String s = "";
diff --git a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt
index 99b32f26a69..b8c3bf90259 100644
--- a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt
+++ b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefault.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo() {
     val i: Int = 1
     val s: String = ""
diff --git a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java
index 1594a19cb04..772760fea5f 100644
--- a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java
+++ b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 public void foo(List<String> list) {
     int[] array = new int[10];
     for (int i = 0; i < 10; i++){
diff --git a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt
index f6bbc21d984..acd53d62481 100644
--- a/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt
+++ b/j2k/testData/fileOrElement/settings/specifyLocalVariableTypeByDefaultInFor.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(list: List<String>) {
     val array: IntArray = IntArray(10)
     for (i: Int in 0..9) {
diff --git a/j2k/testData/fileOrElement/typeParameters/genericParam-settings.java b/j2k/testData/fileOrElement/typeParameters/genericParam-settings.java
index fff20ca543a..0836e56f983 100644
--- a/j2k/testData/fileOrElement/typeParameters/genericParam-settings.java
+++ b/j2k/testData/fileOrElement/typeParameters/genericParam-settings.java
@@ -1,4 +1,4 @@
 //statement
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 List<T> l;
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/typeParameters/genericParam-settings.kt b/j2k/testData/fileOrElement/typeParameters/genericParam-settings.kt
index 963f34c1264..ad5ac4552f7 100644
--- a/j2k/testData/fileOrElement/typeParameters/genericParam-settings.kt
+++ b/j2k/testData/fileOrElement/typeParameters/genericParam-settings.kt
@@ -1,3 +1,3 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 val l: List<T?>?
\ No newline at end of file
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
index f9f0d98ef28..aadb482513e 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
@@ -37,14 +37,17 @@ abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotli
 
         val settings = ConverterSettings.defaultSettings.copy()
         val directives = KotlinTestUtils.parseDirectives(javaCode)
-        for ((name, value) in directives.asMapOfSingleValues()) {
-            when (name) {
-                "forceNotNullTypes" -> settings.forceNotNullTypes = value.toBoolean()
-                "specifyLocalVariableTypeByDefault" -> settings.specifyLocalVariableTypeByDefault = value.toBoolean()
-                "specifyFieldTypeByDefault" -> settings.specifyFieldTypeByDefault = value.toBoolean()
-                "openByDefault" -> settings.openByDefault = value.toBoolean()
-                else -> throw IllegalArgumentException("Unknown option: $name")
-            }
+        directives["FORCE_NOT_NULL_TYPES"]?.let {
+            settings.forceNotNullTypes = it.toBoolean()
+        }
+        directives["SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT"]?.let {
+            settings.specifyLocalVariableTypeByDefault = it.toBoolean()
+        }
+        directives["SPECIFY_FIELD_TYPE_BY_DEFAULT"]?.let {
+            settings.specifyFieldTypeByDefault = it.toBoolean()
+        }
+        directives["OPEN_BY_DEFAULT"]?.let {
+            settings.openByDefault = it.toBoolean()
         }
 
         val rawConverted = when (prefix) {
diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.java b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.java
index 72a40a5f4de..a13344011ad 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.java
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.java
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt
index 9b3059351f1..f7d28a4491c 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 class Test(str: String) {
diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.java b/nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.java
index 0944b5f96a2..74da4043970 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.java
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.java
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.kt
index e8ebf943b84..7cbc82e33ad 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.kt
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNotNullChainExpr.kt
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 internal class Foo {
diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.java b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.java
index dd017d87bb7..31b6e065665 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.java
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.java
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
index bce78af1e5b..ab97a0ba5cf 100644
--- a/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
+++ b/nj2k/testData/newJ2k/annotations/jetbrainsNullable.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 package test
 
 class Test(str: String?) {
diff --git a/nj2k/testData/newJ2k/assignmentExpression/nullability-settings.java b/nj2k/testData/newJ2k/assignmentExpression/nullability-settings.java
index 2328ea5cff9..f25b8c75aa4 100644
--- a/nj2k/testData/newJ2k/assignmentExpression/nullability-settings.java
+++ b/nj2k/testData/newJ2k/assignmentExpression/nullability-settings.java
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 import java.util.HashSet;
 
 class Foo {
diff --git a/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.java b/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.java
index 6c3318b19cc..1c3d6d8ad28 100644
--- a/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.java
+++ b/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.java
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 class Library {
   void call() {}
 
diff --git a/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.kt b/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.kt
index 478c7fad35b..194b0e4a0be 100644
--- a/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.kt
+++ b/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance-settings.kt
@@ -1,5 +1,5 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 internal class Library {
     fun call() {}
     val string: String
diff --git a/nj2k/testData/newJ2k/function/mainAndNullabilitySetting.java b/nj2k/testData/newJ2k/function/mainAndNullabilitySetting.java
index 15557c69446..bfc3abc2332 100644
--- a/nj2k/testData/newJ2k/function/mainAndNullabilitySetting.java
+++ b/nj2k/testData/newJ2k/function/mainAndNullabilitySetting.java
@@ -1,4 +1,4 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
 //file
 public class A {
     public static void main(String[] args) {
diff --git a/nj2k/testData/newJ2k/function/mainAndNullabilitySetting.kt b/nj2k/testData/newJ2k/function/mainAndNullabilitySetting.kt
index 5300954bdea..23c36a5cba8 100644
--- a/nj2k/testData/newJ2k/function/mainAndNullabilitySetting.kt
+++ b/nj2k/testData/newJ2k/function/mainAndNullabilitySetting.kt
@@ -1,4 +1,4 @@
-// !forceNotNullTypes: false
+// !FORCE_NOT_NULL_TYPES: false
 object A {
     @JvmStatic
     fun main(args: Array<String>) {
diff --git a/nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.java b/nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.java
index 525ada24f9f..67b768e7714 100644
--- a/nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.java
+++ b/nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = "abc";
   if (b) {
diff --git a/nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.kt b/nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.kt
index 71c11a12390..ef97858fed6 100644
--- a/nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.kt
+++ b/nj2k/testData/newJ2k/nullability/VariableAssignedWithNull.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     var s: String? = "abc"
     if (b) {
diff --git a/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.java b/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.java
index c3822e55f83..d08709e0ca9 100644
--- a/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.java
+++ b/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 String bar() {
     return null;
 }
diff --git a/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt b/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt
index 156cce20623..e04b405c60f 100644
--- a/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt
+++ b/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun bar(): String? {
     return null
 }
diff --git a/nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.java b/nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.java
index b8ff485ddd3..1e6c21676bf 100644
--- a/nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.java
+++ b/nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = null;
   if (b) {
diff --git a/nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.kt b/nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.kt
index 1c9b83d495b..7e64f4dd42f 100644
--- a/nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.kt
+++ b/nj2k/testData/newJ2k/nullability/VariableInitializedWithNull.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     var s: String? = null
     if (b) {
diff --git a/nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.java b/nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.java
index 345ab62cd15..b882346952e 100644
--- a/nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.java
+++ b/nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 void foo(boolean b) {
   String s = (b ? "abc" : null);
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.kt b/nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.kt
index 7d3a861da9c..1aaa4760e8a 100644
--- a/nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.kt
+++ b/nj2k/testData/newJ2k/nullability/VariableInitializedWithTernaryNull.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(b: Boolean) {
     val s: String? = if (b) "abc" else null
 }
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/settings/openByDefault.java b/nj2k/testData/newJ2k/settings/openByDefault.java
index 00c68630efb..823c2b3bfd5 100644
--- a/nj2k/testData/newJ2k/settings/openByDefault.java
+++ b/nj2k/testData/newJ2k/settings/openByDefault.java
@@ -1,5 +1,5 @@
 //file
-// !openByDefault: true
+// !OPEN_BY_DEFAULT: true
 
 class A {
     void foo1() { }
diff --git a/nj2k/testData/newJ2k/settings/openByDefault.kt b/nj2k/testData/newJ2k/settings/openByDefault.kt
index 6a8fdedb264..1c0b16f8c4c 100644
--- a/nj2k/testData/newJ2k/settings/openByDefault.kt
+++ b/nj2k/testData/newJ2k/settings/openByDefault.kt
@@ -1,4 +1,4 @@
-// !openByDefault: true
+// !OPEN_BY_DEFAULT: true
 internal open class A {
     open fun foo1() {}
     private fun foo2() {}
diff --git a/nj2k/testData/newJ2k/settings/specifyFieldTypeByDefault.java b/nj2k/testData/newJ2k/settings/specifyFieldTypeByDefault.java
index e8bf96c57d5..a21a480e856 100644
--- a/nj2k/testData/newJ2k/settings/specifyFieldTypeByDefault.java
+++ b/nj2k/testData/newJ2k/settings/specifyFieldTypeByDefault.java
@@ -1,5 +1,5 @@
 //file
-// !specifyFieldTypeByDefault: true
+// !SPECIFY_FIELD_TYPE_BY_DEFAULT: true
 import org.jetbrains.annotations.Nullable;
 import java.util.*;
 
diff --git a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.java b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.java
index de5ea41f4de..a420c12db6f 100644
--- a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.java
+++ b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 public void foo() {
   int i = 1;
   String s = "";
diff --git a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt
index 80335044c52..3846a74cc4d 100644
--- a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt
+++ b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo() {
     val i = 1
     val s = ""
diff --git a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.java b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.java
index 1594a19cb04..772760fea5f 100644
--- a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.java
+++ b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.java
@@ -1,5 +1,5 @@
 //method
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 public void foo(List<String> list) {
     int[] array = new int[10];
     for (int i = 0; i < 10; i++){
diff --git a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
index 3d2d92ac17f..bf0c595f521 100644
--- a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
+++ b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt
@@ -1,4 +1,4 @@
-// !specifyLocalVariableTypeByDefault: true
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 fun foo(list: List<String?>) {
     val array: IntArray = IntArray(10)
     for (i: Int in 0..9) {
diff --git a/nj2k/testData/newJ2k/typeParameters/genericParam-settings.java b/nj2k/testData/newJ2k/typeParameters/genericParam-settings.java
index fff20ca543a..0836e56f983 100644
--- a/nj2k/testData/newJ2k/typeParameters/genericParam-settings.java
+++ b/nj2k/testData/newJ2k/typeParameters/genericParam-settings.java
@@ -1,4 +1,4 @@
 //statement
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 List<T> l;
\ No newline at end of file
diff --git a/nj2k/testData/newJ2k/typeParameters/genericParam-settings.kt b/nj2k/testData/newJ2k/typeParameters/genericParam-settings.kt
index 8a41597ccc3..9089ce79d44 100644
--- a/nj2k/testData/newJ2k/typeParameters/genericParam-settings.kt
+++ b/nj2k/testData/newJ2k/typeParameters/genericParam-settings.kt
@@ -1,3 +1,3 @@
-// !forceNotNullTypes: false
-// !specifyLocalVariableTypeByDefault: true
+// !FORCE_NOT_NULL_TYPES: false
+// !SPECIFY_LOCAL_VARIABLE_TYPE_BY_DEFAULT: true
 var l: List<T?>
\ No newline at end of file