diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
index ae591b8773c..7e6753c0757 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
@@ -23,4 +23,4 @@ remove.cast=Remove cast
 remove.elvis.operator=Remove elvis operator
 replace.operation.in.binary.expression=Replace operation in a binary expression
 replace.cast.with.static.assert=Replace a cast with a static assert
-replace.to.dot.call=Replace to dot call
\ No newline at end of file
+replace.with.dot.call=Replace with dot call
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
index 76f37013470..5c1e2c4a34f 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java
@@ -81,7 +81,7 @@ public class QuickFixes {
 
         add(Errors.USELESS_ELVIS, RemoveRightPartOfBinaryExpressionFix.createRemoveElvisOperatorFactory());
 
-        add(Errors.UNNECESSARY_SAFE_CALL, ReplaceSafeCallToDotCall.createFactory());
+        add(Errors.UNNECESSARY_SAFE_CALL, ReplaceSafeCallWithDotCall.createFactory());
 
         JetIntentionActionFactory<JetModifierList> removeRedundantModifierFactory = RemoveModifierFix.createRemoveModifierFromListFactory(true);
         add(Errors.REDUNDANT_MODIFIER, removeRedundantModifierFactory);
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceSafeCallToDotCall.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceSafeCallWithDotCall.java
similarity index 86%
rename from idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceSafeCallToDotCall.java
rename to idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceSafeCallWithDotCall.java
index 15d60fde6a1..d38fad55bcd 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceSafeCallToDotCall.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceSafeCallWithDotCall.java
@@ -13,22 +13,22 @@ import org.jetbrains.jet.plugin.JetBundle;
 /**
  * @author svtk
  */
-public class ReplaceSafeCallToDotCall extends JetIntentionAction<JetElement> {
+public class ReplaceSafeCallWithDotCall extends JetIntentionAction<JetElement> {
 
-    public ReplaceSafeCallToDotCall(@NotNull JetElement element) {
+    public ReplaceSafeCallWithDotCall(@NotNull JetElement element) {
         super(element);
     }
 
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("replace.to.dot.call");
+        return JetBundle.message("replace.with.dot.call");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("replace.to.dot.call");
+        return JetBundle.message("replace.with.dot.call");
     }
 
     @Override
@@ -56,7 +56,7 @@ public class ReplaceSafeCallToDotCall extends JetIntentionAction<JetElement> {
             @Override
             public JetIntentionAction<JetElement> createAction(DiagnosticWithPsiElement diagnostic) {
                 assert diagnostic.getPsiElement() instanceof JetElement;
-                return new ReplaceSafeCallToDotCall((JetElement) diagnostic.getPsiElement());
+                return new ReplaceSafeCallWithDotCall((JetElement) diagnostic.getPsiElement());
             }
         };
     }
diff --git a/idea/testData/quickfix/expressions/afterUnnecessarySafeCall1.kt b/idea/testData/quickfix/expressions/afterUnnecessarySafeCall1.kt
index 7422cfd3f6b..55d3d6c64f3 100644
--- a/idea/testData/quickfix/expressions/afterUnnecessarySafeCall1.kt
+++ b/idea/testData/quickfix/expressions/afterUnnecessarySafeCall1.kt
@@ -1,4 +1,4 @@
-// "Replace to dot call" "true"
+// "Replace with dot call" "true"
 fun foo(a: Any) {
     <caret>a.equals(0)
 }
diff --git a/idea/testData/quickfix/expressions/afterUnnecessarySafeCall2.kt b/idea/testData/quickfix/expressions/afterUnnecessarySafeCall2.kt
index f5efe05b2ea..1524b0526a4 100644
--- a/idea/testData/quickfix/expressions/afterUnnecessarySafeCall2.kt
+++ b/idea/testData/quickfix/expressions/afterUnnecessarySafeCall2.kt
@@ -1,4 +1,4 @@
-// "Replace to dot call" "true"
+// "Replace with dot call" "true"
 fun foo(a: Any) {
     when (a) {
         .equals(0) => true
diff --git a/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt b/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt
index 61063ff4cc4..e9e0c31da15 100644
--- a/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt
+++ b/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt
@@ -1,4 +1,4 @@
-// "Replace to dot call" "true"
+// "Replace with dot call" "true"
 fun foo(a: Any) {
     a<caret>?.equals(0)
 }
diff --git a/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall2.kt b/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall2.kt
index 40f33005054..cee0f9535b3 100644
--- a/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall2.kt
+++ b/idea/testData/quickfix/expressions/beforeUnnecessarySafeCall2.kt
@@ -1,4 +1,4 @@
-// "Replace to dot call" "true"
+// "Replace with dot call" "true"
 fun foo(a: Any) {
     when (a) {
         <caret>?.equals(0) => true