diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
index 0fcb81313b30..9ff9456bab76 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
@@ -562,13 +562,13 @@ public class DataFlowInspectionBase extends AbstractBaseJavaLocalInspectionTool
       if (reportedAnchors.contains(expr)) continue;
 
       if (expr.getParent() instanceof PsiMethodReferenceExpression) {
-        holder.registerProblem(expr.getParent(), "Method reference argument might be null but passed to non annotated parameter");
+        holder.registerProblem(expr.getParent(), "Method reference argument might be null but passed to non-annotated parameter");
         continue;
       }
 
       final String text = isNullLiteralExpression(expr)
-                          ? "Passing <code>null</code> argument to non annotated parameter"
-                          : "Argument <code>#ref</code> #loc might be null but passed to non annotated parameter";
+                          ? "Passing <code>null</code> argument to non-annotated parameter"
+                          : "Argument <code>#ref</code> #loc might be null but passed to non-annotated parameter";
       List<LocalQuickFix> fixes = createNPEFixes((PsiExpression)expr, (PsiExpression)expr, holder.isOnTheFly());
       final PsiElement parent = expr.getParent();
       if (parent instanceof PsiExpressionList) {
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/AssigningUnknownToNullable.java b/java/java-tests/testData/inspection/dataFlow/fixture/AssigningUnknownToNullable.java
index a1cacc8b5470..4c4a53854089 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/AssigningUnknownToNullable.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/AssigningUnknownToNullable.java
@@ -5,7 +5,7 @@ class BrokenAlignment {
   String unknown(String s) { return s; }
 
   public void example(@Nullable String value) {
-    value = unknown(<warning descr="Argument 'value' might be null but passed to non annotated parameter">value</warning>);
+    value = unknown(<warning descr="Argument 'value' might be null but passed to non-annotated parameter">value</warning>);
     if (value.contains("%")) {
     }
   }
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/ChainedFinalFieldAccessorsDfa.java b/java/java-tests/testData/inspection/dataFlow/fixture/ChainedFinalFieldAccessorsDfa.java
index 0df2e5516228..393446e81dda 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/ChainedFinalFieldAccessorsDfa.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/ChainedFinalFieldAccessorsDfa.java
@@ -9,7 +9,7 @@ class BrokenAlignment {
       System.out.println(data.getText().hashCode());
     }
 
-    data = new Data(null, <warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
+    data = new Data(null, <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
     System.out.println(data.getText().<warning descr="Method invocation 'hashCode' may produce 'java.lang.NullPointerException'">hashCode</warning>());
 
     if (data.getInner() != null) {
@@ -19,7 +19,7 @@ class BrokenAlignment {
         System.out.println(data.getInner().hashCode());
       }
 
-      data = new Data(null, <warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
+      data = new Data(null, <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
       System.out.println(data.getInner().<warning descr="Method invocation 'hashCode' may produce 'java.lang.NullPointerException'">hashCode</warning>());
     }
   }
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/ChainedFinalFieldsDfa.java b/java/java-tests/testData/inspection/dataFlow/fixture/ChainedFinalFieldsDfa.java
index cb662e79bb9e..dcb3dab3a0c9 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/ChainedFinalFieldsDfa.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/ChainedFinalFieldsDfa.java
@@ -6,7 +6,7 @@ class BrokenAlignment {
       System.out.println(data.text.hashCode());
     }
 
-    data = new Data(null, <warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
+    data = new Data(null, <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
     System.out.println(data.text.<warning descr="Method invocation 'hashCode' may produce 'java.lang.NullPointerException'">hashCode</warning>());
 
     if (data.inner != null) {
@@ -16,7 +16,7 @@ class BrokenAlignment {
         System.out.println(data.inner.hashCode());
       }
 
-      data = new Data(null, <warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
+      data = new Data(null, <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
       System.out.println(data.inner.<warning descr="Method invocation 'hashCode' may produce 'java.lang.NullPointerException'">hashCode</warning>());
     }
   }
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentButParameterIsReassigned.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentButParameterIsReassigned.java
index d4d8793d30e8..c2b9bf741a56 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentButParameterIsReassigned.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentButParameterIsReassigned.java
@@ -11,7 +11,7 @@ class Test {
   }
 
   void usage() {
-    dangerousMethod(<warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
+    dangerousMethod(<warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
   }
 
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIfMethodExecutionFailsAnyway.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIfMethodExecutionFailsAnyway.java
index 06068fefa895..662106d63b82 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIfMethodExecutionFailsAnyway.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIfMethodExecutionFailsAnyway.java
@@ -9,7 +9,7 @@ class Test {
     throw new IllegalStateException();
   }
   public static void main(String[] args) {
-    printAndThrow("test", <warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
-    printAndThrow(<warning descr="Passing 'null' argument to non annotated parameter">null</warning>, new NullPointerException());
+    printAndThrow("test", <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
+    printAndThrow(<warning descr="Passing 'null' argument to non-annotated parameter">null</warning>, new NullPointerException());
   }
 }
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIsFailingMethodCall.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIsFailingMethodCall.java
index 543e013bdd38..51bcf32500a6 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIsFailingMethodCall.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIsFailingMethodCall.java
@@ -24,6 +24,6 @@ class Test {
   }
 
   public static void main(String[] args) {
-    testMethod(<warning descr="Passing 'null' argument to non annotated parameter">null</warning>, <warning descr="Passing 'null' argument to non annotated parameter">null</warning>, <warning descr="Passing 'null' argument to non annotated parameter">null</warning>, <warning descr="Passing 'null' argument to non annotated parameter">null</warning>, 10);
+    testMethod(<warning descr="Passing 'null' argument to non-annotated parameter">null</warning>, <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>, <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>, <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>, 10);
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIsNotFailingMethodCall.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIsNotFailingMethodCall.java
index 2a2146d80c39..0fa0f5a7ada4 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIsNotFailingMethodCall.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/NullArgumentIsNotFailingMethodCall.java
@@ -21,6 +21,6 @@ class Test {
   }
 
   public static void main(String[] args) {
-    testMethod(<warning descr="Passing 'null' argument to non annotated parameter">null</warning>, "I am not null", <warning descr="Passing 'null' argument to non annotated parameter">null</warning>, <warning descr="Passing 'null' argument to non annotated parameter">null</warning>, 10);
+    testMethod(<warning descr="Passing 'null' argument to non-annotated parameter">null</warning>, "I am not null", <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>, <warning descr="Passing 'null' argument to non-annotated parameter">null</warning>, 10);
   }
 }
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralAndInferredMethodContract.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralAndInferredMethodContract.java
index 8be1e9e8a7d4..745ea416dcb8 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralAndInferredMethodContract.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralAndInferredMethodContract.java
@@ -1,6 +1,6 @@
 class NullLiteralAndInferredMethodContract {
   {
-    initExpressionConstraints(<warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
+    initExpressionConstraints(<warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
   }
 
   public void initExpressionConstraints(Object parent) {
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralArgumentDoesntReportedWhenMethodOnlyThrowAnException.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralArgumentDoesntReportedWhenMethodOnlyThrowAnException.java
index aff8882cc70a..483b4b583dfe 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralArgumentDoesntReportedWhenMethodOnlyThrowAnException.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralArgumentDoesntReportedWhenMethodOnlyThrowAnException.java
@@ -1,7 +1,7 @@
 class Test {
 
   void m() {
-    throwAnException(<warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
+    throwAnException(<warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
   }
 
   static void throwAnException(String arg) {
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralArgumentValueUsedAsReturnValue.java b/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralArgumentValueUsedAsReturnValue.java
index 63730bb5bbfa..55c388579f7b 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralArgumentValueUsedAsReturnValue.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/NullLiteralArgumentValueUsedAsReturnValue.java
@@ -8,6 +8,6 @@ class Test {
   }
 
   void m() {
-    useAndReturnValue(<warning descr="Passing 'null' argument to non annotated parameter">null</warning>);
+    useAndReturnValue(<warning descr="Passing 'null' argument to non-annotated parameter">null</warning>);
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/OptionalInlining.java b/java/java-tests/testData/inspection/dataFlow/fixture/OptionalInlining.java
index ce63f177bddb..cc49a282d822 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/OptionalInlining.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/OptionalInlining.java
@@ -129,7 +129,7 @@ public class OptionalInlining {
   }
 
   void testGuavaTransform(com.google.common.base.Optional<String> opt) {
-    String trimmed = com.google.common.base.Optional.fromNullable(<warning descr="Argument 'nullableMethod()' might be null but passed to non annotated parameter">nullableMethod()</warning>).transform(xx -> xx.trim()).or("");
+    String trimmed = com.google.common.base.Optional.fromNullable(<warning descr="Argument 'nullableMethod()' might be null but passed to non-annotated parameter">nullableMethod()</warning>).transform(xx -> xx.trim()).or("");
     if(<warning descr="Condition 'trimmed == null' is always 'false'">trimmed == null</warning>) {
       System.out.println("impossible");
     }
@@ -145,7 +145,7 @@ public class OptionalInlining {
 
   void testToJavaUtil() {
     String xyz = nullableMethod();
-    Object n = com.google.common.base.Optional.fromNullable(<warning descr="Argument 'xyz' might be null but passed to non annotated parameter">xyz</warning>).transform(String::trim).toJavaUtil().map(this::getObj).orElse(null);
+    Object n = com.google.common.base.Optional.fromNullable(<warning descr="Argument 'xyz' might be null but passed to non-annotated parameter">xyz</warning>).transform(String::trim).toJavaUtil().map(this::getObj).orElse(null);
     if(n instanceof Integer) {
       // n instanceof Integer -> n is not null -> xyz was not null -> safe to dereference
       System.out.println(xyz.trim());
diff --git a/java/java-tests/testData/inspection/dataFlow/fixture/OptionalTooComplex.java b/java/java-tests/testData/inspection/dataFlow/fixture/OptionalTooComplex.java
index 0beb16c50f15..c20ccc5a81a6 100644
--- a/java/java-tests/testData/inspection/dataFlow/fixture/OptionalTooComplex.java
+++ b/java/java-tests/testData/inspection/dataFlow/fixture/OptionalTooComplex.java
@@ -5,11 +5,11 @@ class OptionalTooComplex {
   // Should not be too complex
   public Long fetch() {
     final PreparedStatement ps = builder
-      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non annotated parameter">opt().orElse(null)</warning>)
-      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non annotated parameter">opt().orElse(null)</warning>)
-      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non annotated parameter">opt().orElse(null)</warning>)
-      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non annotated parameter">opt().orElse(null)</warning>)
-      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non annotated parameter">opt().orElse(null)</warning>)
+      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non-annotated parameter">opt().orElse(null)</warning>)
+      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non-annotated parameter">opt().orElse(null)</warning>)
+      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non-annotated parameter">opt().orElse(null)</warning>)
+      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non-annotated parameter">opt().orElse(null)</warning>)
+      .setInteger(<warning descr="Argument 'opt().orElse(null)' might be null but passed to non-annotated parameter">opt().orElse(null)</warning>)
       .build();
 
     ResultSet rs = null;