diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
index d1dfc8b60b7..8d4cb2f1fa7 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
@@ -138,7 +138,7 @@ class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(KtExpre
                 KtTokens.MINUS -> "$0.minus($1)"
                 KtTokens.MUL -> "$0.times($1)"
                 KtTokens.DIV -> "$0.div($1)"
-                KtTokens.PERC -> "$0.mod($1)"
+                KtTokens.PERC -> "$0.rem($1)"
                 KtTokens.RANGE -> "$0.rangeTo($1)"
                 KtTokens.IN_KEYWORD -> "$1.contains($0)"
                 KtTokens.NOT_IN -> "!$1.contains($0)"
@@ -146,7 +146,10 @@ class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(KtExpre
                 KtTokens.MINUSEQ -> if (functionName == "minusAssign") "$0.minusAssign($1)" else "$0 = $0.minus($1)"
                 KtTokens.MULTEQ -> if (functionName == "multAssign") "$0.multAssign($1)" else "$0 = $0.mult($1)"
                 KtTokens.DIVEQ -> if (functionName == "divAssign") "$0.divAssign($1)" else "$0 = $0.div($1)"
-                KtTokens.PERCEQ -> if (functionName == "modAssign") "$0.modAssign($1)" else "$0 = $0.mod($1)"
+                KtTokens.PERCEQ ->
+                    if (functionName == "remAssign") "$0.remAssign($1)"
+                    else if (functionName == "modAssign") "$0.modAssign($1)" // TODO: delete me (deprecated modAssign)
+                    else "$0 = $0.rem($1)"
                 KtTokens.EQEQ -> if (elemType?.isMarkedNullable ?: true) "$0?.equals($1) ?: ($1 == null)" else "$0.equals($1)"
                 KtTokens.EXCLEQ -> if (elemType?.isMarkedNullable ?: true) "!($0?.equals($1) ?: ($1 == null))" else "!$0.equals($1)"
                 KtTokens.GT -> "$0.compareTo($1) > 0"