diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractValue.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractValue.java
index d10ce1c23d09..80266d3694c3 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractValue.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractValue.java
@@ -20,6 +20,7 @@ import com.intellij.codeInspection.dataFlow.types.DfType;
 import com.intellij.codeInspection.dataFlow.types.DfTypes;
 import com.intellij.codeInspection.dataFlow.value.*;
 import com.intellij.psi.*;
+import com.intellij.psi.util.JavaElementKind;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.Function;
 import com.siyeh.ig.psiutils.MethodCallUtils;
@@ -179,7 +180,7 @@ public abstract class ContractValue {
     public String getPresentationText(PsiMethod method) {
       PsiParameter[] params = method.getParameterList().getParameters();
       if (myIndex == 0 && params.length == 1) {
-        return "parameter";
+        return JavaElementKind.PARAMETER.subject();
       }
       if (myIndex < params.length) {
         return params[myIndex].getName();
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TrackingRunner.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TrackingRunner.java
index e230a39ca95b..7bf01818f20d 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TrackingRunner.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/TrackingRunner.java
@@ -759,16 +759,7 @@ public class TrackingRunner extends DataFlowRunner {
   }
 
   private static String getElementTitle(PsiElement target) {
-    if (target instanceof PsiField) {
-      return "field";
-    }
-    if (target instanceof PsiParameter) {
-      return "parameter";
-    }
-    if (target instanceof PsiVariable) {
-      return "variable";
-    }
-    return "element";
+    return JavaElementKind.fromElement(target).subject();
   }
 
   private CauseItem @NotNull [] findRelationCause(RelationType relationType, MemoryStateChange leftChange, MemoryStateChange rightChange) {