diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MultiFixMessages.properties b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MultiFixMessages.properties
index b339d0a..33363a2 100644
--- a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MultiFixMessages.properties
+++ b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/MultiFixMessages.properties
@@ -113,7 +113,7 @@
 BreakLoopCleanUp_description=Exit loop earlier
 StaticInnerClassCleanUp_description=Make inner classes static where possible
 StringBuilderCleanUp_description=Replace String concatenation by StringBuilder
-PlainReplacementCleanUp_description=Use String::replace instead of String::replaceAll when no regex used
+PlainReplacementCleanUp_description=Use String.replace() instead of String.replaceAll() when possible
 CodeStyleCleanUp_LazyLogical_description=Use lazy logical operator (&& and ||)
 PrimitiveComparisonCleanUp_description=Primitive comparison
 PrimitiveParsingCleanUp_description=Primitive parsing
@@ -154,7 +154,7 @@
 AddAllCleanup_description=Add elements in collections without loop
 ObjectsEqualsCleanup_description=Use Objects.equals() in the equals method implementation
 
-InvertEqualsCleanUp_description=Avoid Object::equals or String::equalsIgnoreCase on null objects
+InvertEqualsCleanUp_description=Avoid Object.equals() or String.equalsIgnoreCase() on null objects
 CheckSignOfBitwiseOperation_description=Use != 0 instead of > 0 when comparing the result of a bitwise expression
 StandardComparisonCleanUp_description=Compare to zero
 SwitchExpressionsCleanUp_ConvertToSwitchExpressions_description=Convert to switch expression where possible
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties
index 3366950..875149e 100644
--- a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties
+++ b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/FixMessages.properties
@@ -79,7 +79,7 @@
 CodeStyleFix_QualifyFieldWithDeclClass_description=Qualify field access with declaring type
 CodeStyleFix_removeThis_groupDescription=Remove 'this' qualifier
 
-InvertEqualsFix_invert=Avoid Object::equals or String::equalsIgnoreCase on null objects
+InvertEqualsFix_invert=Avoid Object.equals() or String.equalsIgnoreCase() on null objects
 StandardComparisonFix_compare_to_zero=Compare to zero
 CodeStyleFix_ChangeAccessToStaticUsingInstanceType_description=Change access to static using ''{0}'' (instance type)
 
@@ -120,7 +120,7 @@
 SortMembersFix_Change_description=Sort Members
 SortMembersFix_Fix_description=Sort Members
 
-PlainReplacementFix_use_plain_text=Use String::replace instead of String::replaceAll when no regex used
+PlainReplacementFix_use_plain_text=Use String.replace() instead of String.replaceAll() when possible
 
 NullAnnotationsFix_add_annotation_change_name=Add Annotations
 NullAnnotationsRewriteOperations_change_method_parameter_nullness=Change parameter ''{0}'' to ''@{1}''
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpMessages.properties
index 6e3afdc..5ddbd67 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/cleanup/CleanUpMessages.properties
@@ -64,7 +64,7 @@
 OptimizationTabPage_CheckboxName_BreakLoop=Exit &loop earlier
 OptimizationTabPage_CheckboxName_StaticInnerClass=Make inner classes static where possible
 OptimizationTabPage_CheckboxName_StringBuilder=Replace &String concatenation by StringBuilder
-OptimizationTabPage_CheckboxName_PlainReplacement=Use String::replace instead of String::replaceAll when no regex used
+OptimizationTabPage_CheckboxName_PlainReplacement=Use String.replace() instead of String.replaceAll() when possible
 OptimizationTabPage_CheckboxName_UseLazyLogicalOperator=Use la&zy logical operator
 OptimizationTabPage_CheckboxName_PrimitiveComparison=Primitive comparison
 OptimizationTabPage_CheckboxName_PrimitiveParsing=Primitive parsing
@@ -140,7 +140,7 @@
 
 SourceFixingTabPage_GroupName_standardCode=Code standardization
 
-SourceFixingTabPage_CheckboxName_InvertEquals=Avoid Object::equals or String::equalsIgnoreCase on null objects
+SourceFixingTabPage_CheckboxName_InvertEquals=Avoid Object.equals() or String.equalsIgnoreCase() on null objects
 SourceFixingTabPage_CheckboxName_StandardComparison=Compare to zero
 SourceFixingTabPage_CheckboxName_CheckSignOfBitwiseOperation=&Compare with != 0 for bitwise expressions