diff --git a/java/java-tests/testData/inspection/deadCode/methodUsedOutOfScopeButParameterIsUnused/expected.xml b/java/java-tests/testData/inspection/deadCode/methodUsedOutOfScopeButParameterIsUnused/expected.xml
index 193354d2deb2..dcdcd99a9e08 100644
--- a/java/java-tests/testData/inspection/deadCode/methodUsedOutOfScopeButParameterIsUnused/expected.xml
+++ b/java/java-tests/testData/inspection/deadCode/methodUsedOutOfScopeButParameterIsUnused/expected.xml
@@ -4,7 +4,7 @@
   <file>Test.java</file>
   <line>2</line>
   <entry_point TYPE="method" FQNAME="Test void doSmth(java.lang.String str)" />
-  <description>Parameter &lt;code&gt;str&lt;/code&gt; is not used in either this method or any of its derived methods</description>
+  <description>Parameter &lt;code&gt;str&lt;/code&gt; is not used</description>
 </problem>
 
 </problems>
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/expected.xml b/java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/expected.xml
index d95e1c69db74..1ed884e0fd9f 100644
--- a/java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/expected.xml
+++ b/java/java-tests/testData/inspection/equalsAndHashcode/hierarchy/expected.xml
@@ -3,11 +3,11 @@
   <problem>
     <file>A.java</file>
     <line>1</line>
-    <description>Class has &lt;code&gt;equals()&lt;/code&gt; defined but does not define &lt;code&gt;hashCode()&lt;/code&gt;.</description>
+    <description>Class has &lt;code&gt;equals()&lt;/code&gt; defined but does not define &lt;code&gt;hashCode()&lt;/code&gt;</description>
   </problem>
   <problem>
     <file>B.java</file>
     <line>1</line>
-    <description>Class has &lt;code&gt;hashCode()&lt;/code&gt; defined but does not define &lt;code&gt;equals()&lt;/code&gt;.</description>
+    <description>Class has &lt;code&gt;hashCode()&lt;/code&gt; defined but does not define &lt;code&gt;equals()&lt;/code&gt;</description>
   </problem>
 </problems>
diff --git a/java/java-tests/testData/inspection/equalsAndHashcode/innerClass/expected.xml b/java/java-tests/testData/inspection/equalsAndHashcode/innerClass/expected.xml
index 578f1169a176..d82182bf1ffa 100644
--- a/java/java-tests/testData/inspection/equalsAndHashcode/innerClass/expected.xml
+++ b/java/java-tests/testData/inspection/equalsAndHashcode/innerClass/expected.xml
@@ -3,6 +3,6 @@
   <problem>
     <file>Test.java</file>
     <line>2</line>
-    <description>Class has &lt;code&gt;equals()&lt;/code&gt; defined but does not define &lt;code&gt;hashCode()&lt;/code&gt;.</description>
+    <description>Class has &lt;code&gt;equals()&lt;/code&gt; defined but does not define &lt;code&gt;hashCode()&lt;/code&gt;</description>
   </problem>
 </problems>
diff --git a/java/java-tests/testData/inspection/unusedMethodParameter/unusedParameter/expected.xml b/java/java-tests/testData/inspection/unusedMethodParameter/unusedParameter/expected.xml
index 2a0c6607e915..e50786e59607 100644
--- a/java/java-tests/testData/inspection/unusedMethodParameter/unusedParameter/expected.xml
+++ b/java/java-tests/testData/inspection/unusedMethodParameter/unusedParameter/expected.xml
@@ -18,7 +18,7 @@
     <file>Test.java</file>
     <line>2</line>
     <problem_class id="unused" severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unused declaration</problem_class>
-    <description>Parameter &lt;code&gt;b&lt;/code&gt; is not used in either this method or any of its derived methods</description>
+    <description>Parameter &lt;code&gt;b&lt;/code&gt; is not used</description>
     <highlighted_element>b</highlighted_element>
     <language>JAVA</language>
     <offset>26</offset>
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_fqn_javadoc_fully_qualify_if_not_imported/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_fqn_javadoc_fully_qualify_if_not_imported/expected.xml
index a29c5c897b0e..eebef5e72075 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_fqn_javadoc_fully_qualify_if_not_imported/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_fqn_javadoc_fully_qualify_if_not_imported/expected.xml
@@ -5,7 +5,7 @@
     <file>DoubleQualify.java</file>
     <line>4</line>
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary fully qualified name</problem_class>
-    <description>Qualifier &lt;code&gt;java.util&lt;/code&gt; is unnecessary, and can be replaced with an import #loc</description>
+    <description>Qualifier &lt;code&gt;java.util&lt;/code&gt; is unnecessary and can be removed #loc</description>
   </problem>
 
 </problems>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_fully_qualified_name/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_fully_qualified_name/expected.xml
index c6c236821041..4e3ffcfccc82 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_fully_qualified_name/expected.xml
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessary_fully_qualified_name/expected.xml
@@ -26,14 +26,14 @@
     <file>UnnecessaryFullyQualifiedName.java</file>
     <line>17</line>
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary fully qualified name</problem_class>
-    <description>Qualifier &lt;code&gt;java.lang&lt;/code&gt; is unnecessary, and can be replaced with an import #loc</description>
+    <description>Qualifier &lt;code&gt;java.lang&lt;/code&gt; is unnecessary and can be removed #loc</description>
   </problem>
 
   <problem>
     <file>UnnecessaryFullyQualifiedName.java</file>
     <line>18</line>
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary fully qualified name</problem_class>
-    <description>Qualifier &lt;code&gt;java.lang&lt;/code&gt; is unnecessary, and can be replaced with an import #loc</description>
+    <description>Qualifier &lt;code&gt;java.lang&lt;/code&gt; is unnecessary and can be removed #loc</description>
   </problem>
 
   <problem>
@@ -47,7 +47,7 @@
     <file>UnnecessaryFQNJavadoc.java</file>
     <line>4</line>
     <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Unnecessary fully qualified name</problem_class>
-    <description>Qualifier &lt;code&gt;java.util&lt;/code&gt; is unnecessary, and can be replaced with an import #loc</description>
+    <description>Qualifier &lt;code&gt;java.util&lt;/code&gt; is unnecessary and can be removed #loc</description>
   </problem>
 
   <problem>
diff --git a/plugins/kotlin/idea/tests/testData/inspections/naming/function/inspectionData/expected.xml b/plugins/kotlin/idea/tests/testData/inspections/naming/function/inspectionData/expected.xml
index 8c71c90ec960..dff00f295d21 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/naming/function/inspectionData/expected.xml
+++ b/plugins/kotlin/idea/tests/testData/inspections/naming/function/inspectionData/expected.xml
@@ -7,7 +7,7 @@
     <problem>
         <file>test.kt</file>
         <line>3</line>
-        <description>Function name &lt;code&gt;FOO_BAR&lt;/code&gt; should not contain underscores #loc</description>
+        <description>Function name &lt;code&gt;FOO_BAR&lt;/code&gt; should start with a lowercase letter #loc</description>
     </problem>
     <problem>
         <file>test.kt</file>
diff --git a/plugins/kotlin/idea/tests/testData/inspections/naming/property/inspectionData/expected.xml b/plugins/kotlin/idea/tests/testData/inspections/naming/property/inspectionData/expected.xml
index e5df819b8d6a..b05111391ca7 100644
--- a/plugins/kotlin/idea/tests/testData/inspections/naming/property/inspectionData/expected.xml
+++ b/plugins/kotlin/idea/tests/testData/inspections/naming/property/inspectionData/expected.xml
@@ -2,7 +2,7 @@
     <problem>
         <file>test.kt</file>
         <line>27</line>
-        <description>Property name &lt;code&gt;_Foo&lt;/code&gt; should not start with an underscore #loc</description>
+        <description>Property name &lt;code&gt;_Foo&lt;/code&gt; should start with a lowercase letter #loc</description>
     </problem>
     <problem>
         <file>test.kt</file>
@@ -12,21 +12,21 @@
     <problem>
         <file>test.kt</file>
         <line>45</line>
-        <description>Property name &lt;code&gt;interface_p1&lt;/code&gt; should start with a lowercase letter #loc</description>
+        <description>Property name &lt;code&gt;interface_p1&lt;/code&gt; should not contain underscores #loc</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>46</line>
-        <description>Property name &lt;code&gt;interface_p2&lt;/code&gt; should start with a lowercase letter #loc</description>
+        <description>Property name &lt;code&gt;interface_p2&lt;/code&gt; should not contain underscores #loc</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>52</line>
-        <description>Property name &lt;code&gt;ctor_val&lt;/code&gt; should start with a lowercase letter #loc</description>
+        <description>Property name &lt;code&gt;ctor_val&lt;/code&gt; should not contain underscores #loc</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>53</line>
-        <description>Property name &lt;code&gt;ctor_var&lt;/code&gt; should start with a lowercase letter #loc</description>
+        <description>Property name &lt;code&gt;ctor_var&lt;/code&gt; should not contain underscores #loc</description>
     </problem>
 </problems>