diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index 7fd6e39094a9..9d0f222ca342 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -1388,7 +1388,7 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.EndlessStreamInspection"
-                     displayName="Non-short-circuit operation consumes the infinite stream"/>
+                     bundle="messages.InspectionsBundle" key="inspection.endless.stream.description"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ExcessiveLambdaUsage"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING"
@@ -1418,7 +1418,7 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8MapForEachInspection"
-                     displayName="Map.forEach can be used"/>
+                     bundle="messages.InspectionsBundle" key="inspection.map.foreach.display.name"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Java8MapApi"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
@@ -1494,7 +1494,7 @@
                      bundle="messages.InspectionsBundle" key="inspection.fuse.stream.operations.display.name"
                      groupKey="group.names.code.style.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.streamMigration.FuseStreamOperationsInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="SimplifyForEach" displayName="forEach call can be simplified"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="SimplifyForEach" bundle="messages.InspectionsBundle" key="inspection.simplify.foreach.display.name"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.intellij.codeInspection.streamMigration.SimplifyForEachInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ComparatorResultComparison"
diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java
index a890d36d4cda..d7a5c0c839d2 100644
--- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/SimplifyForEachInspection.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.codeInspection.streamMigration;
 
 import com.intellij.codeInsight.daemon.GroupNames;
@@ -46,7 +46,7 @@ public class SimplifyForEachInspection extends AbstractBaseJavaLocalInspectionTo
   @NotNull
   @Override
   public String getDisplayName() {
-    return "forEach call can be simplified";
+    return InspectionsBundle.message("inspection.simplify.foreach.display.name");
   }
 
   @NotNull
diff --git a/java/java-tests/testData/inspection/endlessStream/Collect.java b/java/java-tests/testData/inspection/endlessStream/Collect.java
index cc927a3381da..3cdbb1d1789a 100644
--- a/java/java-tests/testData/inspection/endlessStream/Collect.java
+++ b/java/java-tests/testData/inspection/endlessStream/Collect.java
@@ -4,8 +4,8 @@ import java.util.stream.Collectors;
 
 public class Collect {
   public static void main(String[] args) {
-    new Random().ints().boxed().<warning descr="Non-short-circuit operation consumes the infinite stream">collect</warning>(Collectors.toList());
-    new Random().doubles().boxed().<warning descr="Non-short-circuit operation consumes the infinite stream">collect</warning>(Collectors.toList());
-    new Random().longs().boxed().<warning descr="Non-short-circuit operation consumes the infinite stream">collect</warning>(Collectors.toList());
+    new Random().ints().boxed().<warning descr="Non-short-circuit operation consumes infinite stream">collect</warning>(Collectors.toList());
+    new Random().doubles().boxed().<warning descr="Non-short-circuit operation consumes infinite stream">collect</warning>(Collectors.toList());
+    new Random().longs().boxed().<warning descr="Non-short-circuit operation consumes infinite stream">collect</warning>(Collectors.toList());
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/endlessStream/Sorted.java b/java/java-tests/testData/inspection/endlessStream/Sorted.java
index f1bf6f9ff7d1..fe9758f80240 100644
--- a/java/java-tests/testData/inspection/endlessStream/Sorted.java
+++ b/java/java-tests/testData/inspection/endlessStream/Sorted.java
@@ -2,7 +2,7 @@ import java.util.stream.LongStream;
 
 public class Sorted {
   public static void main(String[] args) {
-    long sum1 = LongStream.iterate(0, i -> i + 1).<warning descr="Non-short-circuit operation consumes the infinite stream">sorted</warning>().limit(10).sum();
-    long sum2 = LongStream.generate(() -> 10).<warning descr="Non-short-circuit operation consumes the infinite stream">sorted</warning>().limit(10).sum();
+    long sum1 = LongStream.iterate(0, i -> i + 1).<warning descr="Non-short-circuit operation consumes infinite stream">sorted</warning>().limit(10).sum();
+    long sum2 = LongStream.generate(() -> 10).<warning descr="Non-short-circuit operation consumes infinite stream">sorted</warning>().limit(10).sum();
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/inspection/java8MapForEach/afterForEach.java b/java/java-tests/testData/inspection/java8MapForEach/afterForEach.java
index 068434dc413e..e39054a01d4b 100644
--- a/java/java-tests/testData/inspection/java8MapForEach/afterForEach.java
+++ b/java/java-tests/testData/inspection/java8MapForEach/afterForEach.java
@@ -1,4 +1,4 @@
-// "Fix all 'Map.forEach can be used' problems in file" "true"
+// "Fix all 'Map.forEach() can be used' problems in file" "true"
 import java.util.Map;
 import java.util.function.Supplier;
 
diff --git a/java/java-tests/testData/inspection/java8MapForEach/beforeForEach.java b/java/java-tests/testData/inspection/java8MapForEach/beforeForEach.java
index 651e4dbb9fdd..17a708293235 100644
--- a/java/java-tests/testData/inspection/java8MapForEach/beforeForEach.java
+++ b/java/java-tests/testData/inspection/java8MapForEach/beforeForEach.java
@@ -1,4 +1,4 @@
-// "Fix all 'Map.forEach can be used' problems in file" "true"
+// "Fix all 'Map.forEach() can be used' problems in file" "true"
 import java.util.Map;
 import java.util.function.Supplier;
 
diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
index 40796fed6c96..2ce778da5d2b 100644
--- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
@@ -875,10 +875,13 @@ inspection.redundant.stream.optional.call.fix.name=Remove ''{0}'' call
 inspection.redundant.stream.optional.call.fix.collect.to.ordered.family.name=Collect to 'LinkedHashSet'
 inspection.redundant.stream.optional.call.option.streamboxing=Report redundant boxing in Stream.map
 
-inspection.map.foreach.message=Can be replaced with 'Map.forEach'
-inspection.map.foreach.fix.name=Replace with Map.forEach
+inspection.map.foreach.display.name=Map.forEach() can be used
+inspection.map.foreach.message=Can be replaced with 'Map.forEach()'
+inspection.map.foreach.fix.name=Replace with 'Map.forEach()'
 inspection.map.foreach.option.no.loops=Do not report loops
 
+inspection.simplify.foreach.display.name=Simplifiable forEach() call
+
 inspection.collection.factories.message=Can be replaced with ''{0}.{1}'' call
 inspection.collection.factories.option.ignore.non.constant=Do not warn when content is non-constant
 inspection.collection.factories.option.suggest.ofentries=Suggest 'Map.ofEntries'
@@ -988,7 +991,7 @@ inspection.conditional.break.in.infinite.loop=Move condition to loop
 inspection.conditional.break.in.infinite.loop.no.conversion.with.do.while=Don't suggest to replace with 'do while'
 inspection.conditional.break.in.infinite.loop.description=Conditional break inside infinite loop
 
-inspection.endless.stream.description=Non-short-circuit operation consumes the infinite stream
+inspection.endless.stream.description=Non-short-circuit operation consumes infinite stream
 
 inspection.simplifiable.comparator.display.name=Comparator can be simplified
 inspection.simplifiable.comparator.comparing.message=Unnecessary ''{0}()'' call