diff --git a/resources-en/src/inspectionDescriptions/Java8CollectionRemoveIf.html b/resources-en/src/inspectionDescriptions/Java8CollectionRemoveIf.html
index b802b0929db7..76e32a516257 100644
--- a/resources-en/src/inspectionDescriptions/Java8CollectionRemoveIf.html
+++ b/resources-en/src/inspectionDescriptions/Java8CollectionRemoveIf.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-The inspection reports the loops which could be collapsed into single <code>Collection.removeIf</code> call in Java 8.
+The inspection reports the loops which could be collapsed into single <code>Collection.removeIf</code> call.
 <!-- tooltip end -->
 <p>The loops like this are reported:</p>
 <pre>
@@ -11,6 +11,7 @@ The inspection reports the loops which could be collapsed into single <code>Coll
     }
   }
 </pre>
+<p>This conversion is available since Java 8 only.</p>
 <small>New in 2016.3</small>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/Java8CollectionsApi.html b/resources-en/src/inspectionDescriptions/Java8CollectionsApi.html
index ee30be059d44..9f5e0f34fee1 100644
--- a/resources-en/src/inspectionDescriptions/Java8CollectionsApi.html
+++ b/resources-en/src/inspectionDescriptions/Java8CollectionsApi.html
@@ -1,11 +1,13 @@
 <html>
 <body>
-Inspection detects usages of java's <b>Map</b> when they can be replaced with methods <b>putIfAbsent</b>. For example:
-<code><pre>
+Inspection detects usages of java's <b>Map</b> when they can be replaced with methods <b>putIfAbsent</b>.
+<!-- tooltip end -->
+<p>For example:</p>
+<pre>
   if (!map.containsKey(aKey)) {
     map.put(aKey, aValue);
   }
 </pre>
-</code>
+<p>This conversion is available since Java 8 only.</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/Java8ListSort.html b/resources-en/src/inspectionDescriptions/Java8ListSort.html
index e1918e6318b2..525188fadeab 100644
--- a/resources-en/src/inspectionDescriptions/Java8ListSort.html
+++ b/resources-en/src/inspectionDescriptions/Java8ListSort.html
@@ -2,8 +2,7 @@
 <body>
 Inspection detects calls to <code>Collections.sort(list, comparator)</code> which could be replaced with <code>list.sort(comparator)</code>.
 <!-- tooltip end -->
-<p>
+<p>This conversion is available since Java 8 only.</p>
 <small>New in 2016.3</small>
-</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources-en/src/inspectionDescriptions/Java8ReplaceMapGet.html b/resources-en/src/inspectionDescriptions/Java8ReplaceMapGet.html
index 49c3564c8c9f..c4e7d7ad7509 100644
--- a/resources-en/src/inspectionDescriptions/Java8ReplaceMapGet.html
+++ b/resources-en/src/inspectionDescriptions/Java8ReplaceMapGet.html
@@ -1,7 +1,6 @@
 <html>
 <body>
-Inspection detects calls to <code>Map.get</code> which could be replaced with <code>getOrDefault</code> or <code>computeIfAbsent</code> in
-Java 8.
+Inspection detects calls to <code>Map.get</code> which could be replaced with <code>getOrDefault</code> or <code>computeIfAbsent</code>.
 <!-- tooltip end -->
 <ul>
   <li><b>Map.getOrDefault</b> method could be used to replace the code like this:
@@ -22,6 +21,7 @@ Java 8.
     </pre>
   </li>
 </ul>
+<p>This conversion is available since Java 8 only.</p>
 <small>New in 2016.3</small>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index f56ff064f0ee..7cc48c65c979 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -816,22 +816,22 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8CollectionsApiInspection"
-                     displayName="Map.putIfAbsent() can be used in Java 8"/>
+                     displayName="Map.putIfAbsent() can be used"/>
     <localInspection groupPath="Java" language="JAVA" shortName="Java8ListSort"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8ListSortInspection"
-                     displayName="Collections.sort() can be replaced with List.sort() in Java 8"/>
+                     displayName="Collections.sort() can be replaced with List.sort()"/>
     <localInspection groupPath="Java" language="JAVA" shortName="Java8CollectionRemoveIf"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8CollectionRemoveIfInspection"
-                     displayName="The loop can be replaced with Collection.removeIf() in Java 8"/>
+                     displayName="Loop can be replaced with Collection.removeIf()"/>
     <localInspection groupPath="Java" language="JAVA" shortName="Java8ReplaceMapGet"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8ReplaceMapGetInspection"
-                     displayName="Map.get() call followed by condition can be replaced with single method in Java 8"/>
+                     displayName="Simplifiable conditional usage of Map.get()"/>
     <localInspection groupPath="Java" language="JAVA" shortName="SimplifyStreamApiCallChains"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
