diff --git a/idea/resources/intentionDescriptions/ReplaceWithTraditionalAssignmentIntention/after.kt.template b/idea/resources/intentionDescriptions/ReplaceWithOrdinaryAssignmentIntention/after.kt.template
similarity index 100%
rename from idea/resources/intentionDescriptions/ReplaceWithTraditionalAssignmentIntention/after.kt.template
rename to idea/resources/intentionDescriptions/ReplaceWithOrdinaryAssignmentIntention/after.kt.template
diff --git a/idea/resources/intentionDescriptions/ReplaceWithTraditionalAssignmentIntention/before.kt.template b/idea/resources/intentionDescriptions/ReplaceWithOrdinaryAssignmentIntention/before.kt.template
similarity index 100%
rename from idea/resources/intentionDescriptions/ReplaceWithTraditionalAssignmentIntention/before.kt.template
rename to idea/resources/intentionDescriptions/ReplaceWithOrdinaryAssignmentIntention/before.kt.template
diff --git a/idea/resources/intentionDescriptions/ReplaceWithTraditionalAssignmentIntention/description.html b/idea/resources/intentionDescriptions/ReplaceWithOrdinaryAssignmentIntention/description.html
similarity index 100%
rename from idea/resources/intentionDescriptions/ReplaceWithTraditionalAssignmentIntention/description.html
rename to idea/resources/intentionDescriptions/ReplaceWithOrdinaryAssignmentIntention/description.html
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index a7aebde76ca..c382a5760c6 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -781,7 +781,7 @@
     </intentionAction>
 
     <intentionAction>
-      <className>org.jetbrains.kotlin.idea.intentions.ReplaceWithTraditionalAssignmentIntention</className>
+      <className>org.jetbrains.kotlin.idea.intentions.ReplaceWithOrdinaryAssignmentIntention</className>
       <category>Kotlin</category>
     </intentionAction>
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithTraditionalAssignmentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
similarity index 92%
rename from idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithTraditionalAssignmentIntention.kt
rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
index 008cab496ce..ee39ab032fa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithTraditionalAssignmentIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression
 import org.jetbrains.kotlin.psi.JetPsiFactory
 import org.jetbrains.kotlin.psi.JetSimpleNameExpression
 
-public class ReplaceWithTraditionalAssignmentIntention : JetSelfTargetingIntention<JetBinaryExpression>(javaClass(), "Replace with traditional assignment") {
+public class ReplaceWithOrdinaryAssignmentIntention : JetSelfTargetingIntention<JetBinaryExpression>(javaClass(), "Replace with ordinary assignment") {
     override fun isApplicableTo(element: JetBinaryExpression, caretOffset: Int): Boolean {
         if (element.getOperationToken() !in JetTokens.AUGMENTED_ASSIGNMENTS) return false
         if (element.getLeft() !is JetSimpleNameExpression) return false
diff --git a/idea/testData/intentions/replaceWithOrdinaryAssignment/.intention b/idea/testData/intentions/replaceWithOrdinaryAssignment/.intention
new file mode 100644
index 00000000000..f1835c8e0dc
--- /dev/null
+++ b/idea/testData/intentions/replaceWithOrdinaryAssignment/.intention
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.intentions.ReplaceWithOrdinaryAssignmentIntention
diff --git a/idea/testData/intentions/replaceWithTraditionalAssignment/complexRightExpression.kt b/idea/testData/intentions/replaceWithOrdinaryAssignment/complexRightExpression.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithTraditionalAssignment/complexRightExpression.kt
rename to idea/testData/intentions/replaceWithOrdinaryAssignment/complexRightExpression.kt
diff --git a/idea/testData/intentions/replaceWithTraditionalAssignment/complexRightExpression.kt.after b/idea/testData/intentions/replaceWithOrdinaryAssignment/complexRightExpression.kt.after
similarity index 100%
rename from idea/testData/intentions/replaceWithTraditionalAssignment/complexRightExpression.kt.after
rename to idea/testData/intentions/replaceWithOrdinaryAssignment/complexRightExpression.kt.after
diff --git a/idea/testData/intentions/replaceWithTraditionalAssignment/nonAssignmentExpression.kt b/idea/testData/intentions/replaceWithOrdinaryAssignment/nonAssignmentExpression.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithTraditionalAssignment/nonAssignmentExpression.kt
rename to idea/testData/intentions/replaceWithOrdinaryAssignment/nonAssignmentExpression.kt
diff --git a/idea/testData/intentions/replaceWithTraditionalAssignment/nonAugmentedAssign.kt b/idea/testData/intentions/replaceWithOrdinaryAssignment/nonAugmentedAssign.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithTraditionalAssignment/nonAugmentedAssign.kt
rename to idea/testData/intentions/replaceWithOrdinaryAssignment/nonAugmentedAssign.kt
diff --git a/idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt b/idea/testData/intentions/replaceWithOrdinaryAssignment/simple.kt
similarity index 100%
rename from idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt
rename to idea/testData/intentions/replaceWithOrdinaryAssignment/simple.kt
diff --git a/idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt.after b/idea/testData/intentions/replaceWithOrdinaryAssignment/simple.kt.after
similarity index 100%
rename from idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt.after
rename to idea/testData/intentions/replaceWithOrdinaryAssignment/simple.kt.after
diff --git a/idea/testData/intentions/replaceWithTraditionalAssignment/.intention b/idea/testData/intentions/replaceWithTraditionalAssignment/.intention
deleted file mode 100644
index 469246b11e4..00000000000
--- a/idea/testData/intentions/replaceWithTraditionalAssignment/.intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.intentions.ReplaceWithTraditionalAssignmentIntention
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index f170d98014e..3cd700b79e6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -5418,35 +5418,35 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
     }
 
-    @TestMetadata("idea/testData/intentions/replaceWithTraditionalAssignment")
+    @TestMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class ReplaceWithTraditionalAssignment extends AbstractIntentionTest {
-        public void testAllFilesPresentInReplaceWithTraditionalAssignment() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithTraditionalAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
+    public static class ReplaceWithOrdinaryAssignment extends AbstractIntentionTest {
+        public void testAllFilesPresentInReplaceWithOrdinaryAssignment() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOrdinaryAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
         }
 
         @TestMetadata("complexRightExpression.kt")
         public void testComplexRightExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithTraditionalAssignment/complexRightExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/complexRightExpression.kt");
             doTest(fileName);
         }
 
         @TestMetadata("nonAssignmentExpression.kt")
         public void testNonAssignmentExpression() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithTraditionalAssignment/nonAssignmentExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/nonAssignmentExpression.kt");
             doTest(fileName);
         }
 
         @TestMetadata("nonAugmentedAssign.kt")
         public void testNonAugmentedAssign() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithTraditionalAssignment/nonAugmentedAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/nonAugmentedAssign.kt");
             doTest(fileName);
         }
 
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOrdinaryAssignment/simple.kt");
             doTest(fileName);
         }
     }