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 76d8752c603..6b293c23929 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
@@ -90,8 +90,8 @@ public class OperatorToFunctionIntention : JetSelfTargetingIntention<KtExpressio
         private fun convertPrefix(element: KtPrefixExpression): KtExpression {
             val op = element.operationReference.getReferencedNameElementType()
             val operatorName = when (op) {
-                KtTokens.PLUS -> OperatorNameConventions.PLUS
-                KtTokens.MINUS -> OperatorNameConventions.MINUS
+                KtTokens.PLUS -> OperatorNameConventions.UNARY_PLUS
+                KtTokens.MINUS -> OperatorNameConventions.UNARY_MINUS
                 KtTokens.PLUSPLUS -> OperatorNameConventions.INC
                 KtTokens.MINUSMINUS -> OperatorNameConventions.DEC
                 KtTokens.EXCL -> OperatorNameConventions.NOT
@@ -146,8 +146,8 @@ public class OperatorToFunctionIntention : JetSelfTargetingIntention<KtExpressio
                 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.EQEQ -> if (elemType?.isMarkedNullable() ?: true) "$0?.equals($1) ?: $1.identityEquals(null)" else "$0.equals($1)"
-                KtTokens.EXCLEQ -> if (elemType?.isMarkedNullable() ?: true) "!($0?.equals($1) ?: $1.identityEquals(null))" else "!$0.equals($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"
                 KtTokens.LT -> "$0.compareTo($1) < 0"
                 KtTokens.GTEQ -> "$0.compareTo($1) >= 0"
diff --git a/idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt.after b/idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt.after
index a53857d785c..9c324271e37 100644
--- a/idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt.after
+++ b/idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt.after
@@ -1,3 +1,3 @@
 fun foo(a: String?, b: String?) {
-    a?.equals(b) ?: b.identityEquals(null)
+    a?.equals(b) ?: b == null
 }
diff --git a/idea/testData/intentions/operatorToFunction/prefixPlus.kt.after b/idea/testData/intentions/operatorToFunction/prefixPlus.kt.after
index 01f36b6001c..4270322aa08 100644
--- a/idea/testData/intentions/operatorToFunction/prefixPlus.kt.after
+++ b/idea/testData/intentions/operatorToFunction/prefixPlus.kt.after
@@ -1,3 +1,3 @@
 fun foo(a: Int) {
-    a.plus()
+    a.unaryPlus()
 }