diff --git a/idea/resources/intentionDescriptions/ReplaceWithOperatorAssignIntention/after.kt.template b/idea/resources/intentionDescriptions/ReplaceWithOperatorAssignmentIntention/after.kt.template
similarity index 100%
rename from idea/resources/intentionDescriptions/ReplaceWithOperatorAssignIntention/after.kt.template
rename to idea/resources/intentionDescriptions/ReplaceWithOperatorAssignmentIntention/after.kt.template
diff --git a/idea/resources/intentionDescriptions/ReplaceWithOperatorAssignIntention/before.kt.template b/idea/resources/intentionDescriptions/ReplaceWithOperatorAssignmentIntention/before.kt.template
similarity index 100%
rename from idea/resources/intentionDescriptions/ReplaceWithOperatorAssignIntention/before.kt.template
rename to idea/resources/intentionDescriptions/ReplaceWithOperatorAssignmentIntention/before.kt.template
diff --git a/idea/resources/intentionDescriptions/ReplaceWithOperatorAssignIntention/description.html b/idea/resources/intentionDescriptions/ReplaceWithOperatorAssignmentIntention/description.html
similarity index 100%
rename from idea/resources/intentionDescriptions/ReplaceWithOperatorAssignIntention/description.html
rename to idea/resources/intentionDescriptions/ReplaceWithOperatorAssignmentIntention/description.html
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index a8dcef2814c..a7aebde76ca 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -776,7 +776,7 @@
     </intentionAction>
 
     <intentionAction>
-      <className>org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignIntention</className>
+      <className>org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignmentIntention</className>
       <category>Kotlin</category>
     </intentionAction>
 
@@ -912,7 +912,7 @@
         level="WEAK WARNING"
         />
 
-    <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignInspection"
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignmentInspection"
         displayName="Replace with operator-assignment"
         groupName="Kotlin"
         enabledByDefault="true"
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
similarity index 96%
rename from idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
index 168f60f2746..e674d662f2d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.matches
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 
-public class ReplaceWithOperatorAssignIntention : JetSelfTargetingOffsetIndependentIntention<JetBinaryExpression>(javaClass(), "Replace with operator-assignment") {
+public class ReplaceWithOperatorAssignmentIntention : JetSelfTargetingOffsetIndependentIntention<JetBinaryExpression>(javaClass(), "Replace with operator-assignment") {
 
     override fun isApplicableTo(element: JetBinaryExpression): Boolean {
         if (element.getOperationToken() != JetTokens.EQ) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/inspections.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/inspections.kt
index d79f8ea486c..b2abc765ff4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/inspections.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/inspections.kt
@@ -38,5 +38,5 @@ public class RemoveExplicitTypeArgsInspection : IntentionBasedInspection<JetType
 
 public class SimplifyBinaryNegationInspection : IntentionBasedInspection<JetPrefixExpression>(SimplifyNegatedBinaryExpressionIntention())
 
-public class ReplaceWithOperatorAssignInspection : IntentionBasedInspection<JetBinaryExpression>(ReplaceWithOperatorAssignIntention())
+public class ReplaceWithOperatorAssignmentInspection : IntentionBasedInspection<JetBinaryExpression>(ReplaceWithOperatorAssignmentIntention())
 
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/.intention b/idea/testData/intentions/replaceWithOperatorAssign/.intention
deleted file mode 100644
index 79d2cd47cdb..00000000000
--- a/idea/testData/intentions/replaceWithOperatorAssign/.intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignIntention
diff --git a/idea/testData/intentions/replaceWithOperatorAssignment/.intention b/idea/testData/intentions/replaceWithOperatorAssignment/.intention
new file mode 100644
index 00000000000..bc246c96d59
--- /dev/null
+++ b/idea/testData/intentions/replaceWithOperatorAssignment/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignmentIntention
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperators.kt b/idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperators.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperators.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperators.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperatorsMiddle.kt b/idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperatorsMiddle.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/invalidSubtraction.kt b/idea/testData/intentions/replaceWithOperatorAssignment/invalidSubtraction.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/invalidSubtraction.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/invalidSubtraction.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/multipleOperators.kt b/idea/testData/intentions/replaceWithOperatorAssignment/multipleOperators.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/multipleOperators.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/multipleOperators.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/multipleOperators.kt.after b/idea/testData/intentions/replaceWithOperatorAssignment/multipleOperators.kt.after
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/multipleOperators.kt.after
rename to idea/testData/intentions/replaceWithOperatorAssignment/multipleOperators.kt.after
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/multipleOperatorsRightSideRepeat.kt b/idea/testData/intentions/replaceWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/multipleOperatorsRightSideRepeat.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/multipleOperatorsRightSideRepeat.kt.after b/idea/testData/intentions/replaceWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt.after
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/multipleOperatorsRightSideRepeat.kt.after
rename to idea/testData/intentions/replaceWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt.after
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/nonRepeatingAssignment.kt b/idea/testData/intentions/replaceWithOperatorAssignment/nonRepeatingAssignment.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/nonRepeatingAssignment.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/nonRepeatingAssignment.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/rightSideRepeat.kt b/idea/testData/intentions/replaceWithOperatorAssignment/rightSideRepeat.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/rightSideRepeat.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/rightSideRepeat.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/rightSideRepeat.kt.after b/idea/testData/intentions/replaceWithOperatorAssignment/rightSideRepeat.kt.after
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/rightSideRepeat.kt.after
rename to idea/testData/intentions/replaceWithOperatorAssignment/rightSideRepeat.kt.after
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/simpleAssign.kt b/idea/testData/intentions/replaceWithOperatorAssignment/simpleAssign.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/simpleAssign.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/simpleAssign.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/simpleAssign.kt.after b/idea/testData/intentions/replaceWithOperatorAssignment/simpleAssign.kt.after
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/simpleAssign.kt.after
rename to idea/testData/intentions/replaceWithOperatorAssignment/simpleAssign.kt.after
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/validSubtraction.kt b/idea/testData/intentions/replaceWithOperatorAssignment/validSubtraction.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/validSubtraction.kt
rename to idea/testData/intentions/replaceWithOperatorAssignment/validSubtraction.kt
diff --git a/idea/testData/intentions/replaceWithOperatorAssign/validSubtraction.kt.after b/idea/testData/intentions/replaceWithOperatorAssignment/validSubtraction.kt.after
similarity index 100%
rename from idea/testData/intentions/replaceWithOperatorAssign/validSubtraction.kt.after
rename to idea/testData/intentions/replaceWithOperatorAssignment/validSubtraction.kt.after
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 896112aea45..f170d98014e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -5355,65 +5355,65 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
     }
 
-    @TestMetadata("idea/testData/intentions/replaceWithOperatorAssign")
+    @TestMetadata("idea/testData/intentions/replaceWithOperatorAssignment")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class ReplaceWithOperatorAssign extends AbstractIntentionTest {
-        public void testAllFilesPresentInReplaceWithOperatorAssign() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssign"), Pattern.compile("^(.+)\\.kt$"), true);
+    public static class ReplaceWithOperatorAssignment extends AbstractIntentionTest {
+        public void testAllFilesPresentInReplaceWithOperatorAssignment() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("illegalMultipleOperators.kt")
         public void testIllegalMultipleOperators() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperators.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperators.kt");
             doTest(fileName);
         }
 
         @TestMetadata("illegalMultipleOperatorsMiddle.kt")
         public void testIllegalMultipleOperatorsMiddle() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperatorsMiddle.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/illegalMultipleOperatorsMiddle.kt");
             doTest(fileName);
         }
 
         @TestMetadata("invalidSubtraction.kt")
         public void testInvalidSubtraction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/invalidSubtraction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/invalidSubtraction.kt");
             doTest(fileName);
         }
 
         @TestMetadata("multipleOperators.kt")
         public void testMultipleOperators() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/multipleOperators.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/multipleOperators.kt");
             doTest(fileName);
         }
 
         @TestMetadata("multipleOperatorsRightSideRepeat.kt")
         public void testMultipleOperatorsRightSideRepeat() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/multipleOperatorsRightSideRepeat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/multipleOperatorsRightSideRepeat.kt");
             doTest(fileName);
         }
 
         @TestMetadata("nonRepeatingAssignment.kt")
         public void testNonRepeatingAssignment() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/nonRepeatingAssignment.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/nonRepeatingAssignment.kt");
             doTest(fileName);
         }
 
         @TestMetadata("rightSideRepeat.kt")
         public void testRightSideRepeat() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/rightSideRepeat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/rightSideRepeat.kt");
             doTest(fileName);
         }
 
         @TestMetadata("simpleAssign.kt")
         public void testSimpleAssign() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/simpleAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/simpleAssign.kt");
             doTest(fileName);
         }
 
         @TestMetadata("validSubtraction.kt")
         public void testValidSubtraction() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/validSubtraction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssignment/validSubtraction.kt");
             doTest(fileName);
         }
     }