diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt
index 4166799ea33..90dd5199d5b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt
@@ -228,6 +228,12 @@ public open class JetChangeInfo(
     }
 
     public fun getNewParametersSignature(inheritedCallable: JetCallableDefinitionUsage<PsiElement>): String {
+        return "(" + getNewParametersSignatureWithoutParentheses(inheritedCallable) + ")"
+    }
+
+    public fun getNewParametersSignatureWithoutParentheses(
+            inheritedCallable: JetCallableDefinitionUsage<PsiElement>
+    ): String {
         val signatureParameters = getNonReceiverParameters()
 
         val isLambda = inheritedCallable.getDeclaration() is JetFunctionLiteral
@@ -237,7 +243,7 @@ public open class JetChangeInfo(
 
         return signatureParameters.indices
                 .map { i -> signatureParameters[i].getDeclarationSignature(i, inheritedCallable) }
-                .joinToString(prefix = "(", separator = ", ", postfix = ")")
+                .joinToString(separator = ", ")
     }
 
     public fun renderReceiverType(inheritedCallable: JetCallableDefinitionUsage<PsiElement>): String? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java
index a1a7274745d..aac8745be41 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java
@@ -227,9 +227,8 @@ public class JetCallableDefinitionUsage<T extends PsiElement> extends JetUsageIn
 
         boolean returnTypeIsNeeded;
         if (element instanceof JetFunction) {
-            returnTypeIsNeeded = (changeInfo.isRefactoringTarget(originalCallableDescriptor) ||
-                                  !(callable instanceof JetFunctionLiteral) ||
-                                  callable.getTypeReference() != null);
+            returnTypeIsNeeded = !(callable instanceof JetFunctionLiteral)
+                                 && (changeInfo.isRefactoringTarget(originalCallableDescriptor) || callable.getTypeReference() != null);
         }
         else {
             returnTypeIsNeeded = element instanceof JetProperty || element instanceof JetParameter;
@@ -261,7 +260,7 @@ public class JetCallableDefinitionUsage<T extends PsiElement> extends JetUsageIn
 
         JetParameterList newParameterList = null;
         if (isLambda) {
-            if (parametersCount == 0 && ((JetFunctionLiteral) element).getTypeReference() == null) {
+            if (parametersCount == 0) {
                 if (parameterList != null) {
                     parameterList.delete();
                     PsiElement arrow = ((JetFunctionLiteral)element).getArrow();
@@ -272,7 +271,7 @@ public class JetCallableDefinitionUsage<T extends PsiElement> extends JetUsageIn
                 }
             }
             else {
-                newParameterList = psiFactory.createFunctionLiteralParameterList(changeInfo.getNewParametersSignature(
+                newParameterList = psiFactory.createFunctionLiteralParameterList(changeInfo.getNewParametersSignatureWithoutParentheses(
                         (JetCallableDefinitionUsage<PsiElement>) this)
                 );
                 canReplaceEntireList = true;
diff --git a/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt
index c21d427282d..ca3712073d9 100644
--- a/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt
+++ b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters1.kt
@@ -2,5 +2,5 @@
 // DISABLE-ERRORS
 
 fun f(x: Int, y: Int, z : () -> Int) {
-    f(1, 2, {(x: Int, y: Int<caret>) -> x});
+    f(1, 2, {x: Int, y: Int<caret> -> x});
 }
diff --git a/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt
index 38b814edd96..2a49b3dbefc 100644
--- a/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt
+++ b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt
@@ -2,5 +2,5 @@
 // DISABLE-ERRORS
 
 fun f(x: Int, y: Int, z : (Int, Int?, Any) -> Int) {
-    f(1, 2, {(<caret>x: Int) -> x});
+    f(1, 2, {<caret>x: Int -> x});
 }
diff --git a/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt.after b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt.after
index cf06b743b43..8c0569b0552 100644
--- a/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt.after
+++ b/idea/testData/quickfix/changeSignature/changeFunctionLiteralParameters2.kt.after
@@ -2,5 +2,5 @@
 // DISABLE-ERRORS
 
 fun f(x: Int, y: Int, z : (Int, Int?, Any) -> Int) {
-    f(1, 2, {(i: Int, i1: Int?, any: Any) -> x});
+    f(1, 2, { i: Int, i1: Int?, any: Any -> x});
 }
diff --git a/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt b/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt
index 320ac11b555..6914871dee3 100644
--- a/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt
+++ b/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt
@@ -5,5 +5,5 @@ fun foo(f: Int.(Int, Int) -> Int) {
 }
 
 fun test() {
-    foo { <caret>(a: Int) -> 0 }
+    foo { <caret>a: Int -> 0 }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt.after b/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt.after
index 9ac2b9ba304..a3a82db4be1 100644
--- a/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt.after
+++ b/idea/testData/quickfix/changeSignature/fixExtensionLambdaSignature.kt.after
@@ -5,5 +5,5 @@ fun foo(f: Int.(Int, Int) -> Int) {
 }
 
 fun test() {
-    foo {(i: Int, i1: Int) -> 0 }
+    foo { i: Int, i1: Int -> 0 }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.after.kt b/idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.after.kt
index c896bcf8570..4b6fb3e6378 100644
--- a/idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.after.kt
+++ b/idea/testData/quickfix/changeSignature/matchFunctionLiteralWithSAMType.after.kt
@@ -2,5 +2,5 @@
 // DISABLE-ERRORS
 
 fun main(args: Array<String>) {
-    Test<String>().perform("") {(s: String?, s1: String?) -> }
+    Test<String>().perform("") { s: String?, s1: String? -> }
 }
diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt
index c8897d3a65e..a0a8ef68039 100644
--- a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt
+++ b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt
@@ -1,6 +1,6 @@
 // "Change type from 'String' to '(Int) -> String'" "true"
 fun foo(f: ((Int) -> String) -> String) {
     foo {
-        (f: String<caret>) -> f(42)
+        f: String<caret> -> f(42)
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt.after b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt.after
index 89a07f91281..753225d3c44 100644
--- a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt.after
+++ b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionType.kt.after
@@ -1,6 +1,6 @@
 // "Change type from 'String' to '(Int) -> String'" "true"
 fun foo(f: ((Int) -> String) -> String) {
     foo {
-        (f: (Int) -> String<caret>) -> f(42)
+        f: (Int) -> String<caret> -> f(42)
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt
index 7e9e824e73a..3c51ba31255 100644
--- a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt
+++ b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt
@@ -2,6 +2,6 @@
 
 fun foo(f: ((java.util.LinkedHashSet<Int>) -> java.util.HashSet<Int>) -> String) {
     foo {
-        (f: String<caret>) -> "42"
+        f: String<caret> -> "42"
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after
index 9c54b5f1bda..89ac14af566 100644
--- a/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeMismatch/changeFunctionLiteralParameterTypeToFunctionTypeLongNameRuntime.kt.after
@@ -5,6 +5,6 @@ import java.util.LinkedHashSet
 
 fun foo(f: ((java.util.LinkedHashSet<Int>) -> java.util.HashSet<Int>) -> String) {
     foo {
-        (f: (LinkedHashSet<Int>) -> HashSet<Int>) -> "42"
+        f: (LinkedHashSet<Int>) -> HashSet<Int> -> "42"
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt
index df3397685ce..e3089b5b26e 100644
--- a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt
+++ b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt
@@ -1,6 +1,6 @@
 // "Change type from 'String' to 'Int'" "true"
 fun foo(f: (Int) -> String) {
     foo {
-        (x: String<caret>) -> ""
+        x: String<caret> -> ""
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt.after b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt.after
index 339488f1d53..31e6d905c15 100644
--- a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt.after
+++ b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatch.kt.after
@@ -1,6 +1,6 @@
 // "Change type from 'String' to 'Int'" "true"
 fun foo(f: (Int) -> String) {
     foo {
-        (x: Int) -> ""
+        x: Int -> ""
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt
index b362d569f6a..c1bfcec90a2 100644
--- a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt
+++ b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt
@@ -2,6 +2,6 @@
 
 fun foo(f: (java.util.HashSet<Int>) -> String) {
     foo {
-        (x: String<caret>) -> ""
+        x: String<caret> -> ""
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after
index 9d101bd8c0f..85917b2ba68 100644
--- a/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeMismatch/expectedParameterTypeMismatchLongNameRuntime.kt.after
@@ -4,6 +4,6 @@ import java.util.HashSet
 
 fun foo(f: (java.util.HashSet<Int>) -> String) {
     foo {
-        (x: HashSet<Int>) -> ""
+        x: HashSet<Int> -> ""
     }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt
index a1ffc07759c..57484fa75c1 100644
--- a/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt
+++ b/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt
@@ -1,4 +1,4 @@
 // "Change 'f' type to '(Long) -> Unit'" "true"
 fun foo() {
-    var f: Int = if (true) { (x: Long) ->  }<caret> else { (x: Long) ->  }
+    var f: Int = if (true) { x: Long ->  }<caret> else { x: Long ->  }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt.after b/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt.after
index 4302b75770c..032a1cceff1 100644
--- a/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt.after
+++ b/idea/testData/quickfix/typeMismatch/propertyTypeMismatch.kt.after
@@ -1,4 +1,4 @@
 // "Change 'f' type to '(Long) -> Unit'" "true"
 fun foo() {
-    var f: (Long) -> Unit = if (true) { (x: Long) ->  }<caret> else { (x: Long) ->  }
+    var f: (Long) -> Unit = if (true) { x: Long ->  }<caret> else { x: Long ->  }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt b/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt
index cc3c789f2fb..b6ccd0b3bfc 100644
--- a/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt
+++ b/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt
@@ -1,5 +1,5 @@
 // "Change 'f' type to '(Delegates) -> Unit'" "true"
 
 fun foo() {
-    var f: Int = { (x: kotlin.properties.Delegates) ->  }<caret>
+    var f: Int = { x: kotlin.properties.Delegates ->  }<caret>
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after b/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after
index f2f5d044e8b..c1ef6ac5481 100644
--- a/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after
+++ b/idea/testData/quickfix/typeMismatch/propertyTypeMismatchLongNameRuntime.kt.after
@@ -3,5 +3,5 @@ import kotlin.properties.Delegates
 // "Change 'f' type to '(Delegates) -> Unit'" "true"
 
 fun foo() {
-    var f: (Delegates) -> Unit = { (x: kotlin.properties.Delegates) ->  }
+    var f: (Delegates) -> Unit = { x: kotlin.properties.Delegates ->  }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt
index 2f90f8ee5e5..3e830bc517a 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt
@@ -1,4 +1,4 @@
 // "Change 'foo' function return type to '(Long) -> Int'" "true"
 fun foo(x: Any): Int {
-    return {(x: Long) -> 42}<caret>
+    return {x: Long -> 42}<caret>
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after
index 4d6e718b946..16b3d57bdc7 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/changeFunctionReturnTypeToFunctionType.kt.after
@@ -1,4 +1,4 @@
 // "Change 'foo' function return type to '(Long) -> Int'" "true"
 fun foo(x: Any): (Long) -> Int {
-    return {(x: Long) -> 42}<caret>
+    return {x: Long -> 42}<caret>
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
index 2bdfc0c4b41..f2876c47d15 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
@@ -8,5 +8,5 @@
 // ERROR: Unresolved reference: NoSuchType
 
 fun foo(): Int {
-    return { (x: NoSuchType<caret>) -> 42 }
+    return { x: NoSuchType<caret> -> 42 }
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt
index ae1c5c6a142..86fcfee1ac3 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt
@@ -1,8 +1,8 @@
 // "Change 'f' type to '(Int, Int) -> (String) -> Int'" "true"
 fun foo() {
     val f: () -> Long = {
-        (a: Int, b: Int): Long ->
-        val x = {(s: String) -> 42}
+        a: Int, b: Int ->
+        val x = {s: String -> 42}
         if (true) x
         else if (true) x else {
             var y = 42
diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after
index 19f21d70c71..26285651757 100644
--- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after
+++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/typeMismatchInIfStatementReturnedByLiteral.kt.after
@@ -1,8 +1,8 @@
 // "Change 'f' type to '(Int, Int) -> (String) -> Int'" "true"
 fun foo() {
     val f: (Int, Int) -> (String) -> Int = {
-        (a: Int, b: Int): (String) -> Int ->
-        val x = {(s: String) -> 42}
+        a: Int, b: Int ->
+        val x = {s: String -> 42}
         if (true) x
         else if (true) x else {
             var y = 42
diff --git a/idea/testData/refactoring/changeSignature/FunctionLiteralAfter.kt b/idea/testData/refactoring/changeSignature/FunctionLiteralAfter.kt
index c8fac6d9292..db354080816 100644
--- a/idea/testData/refactoring/changeSignature/FunctionLiteralAfter.kt
+++ b/idea/testData/refactoring/changeSignature/FunctionLiteralAfter.kt
@@ -1,3 +1,3 @@
 fun foo() {
-    val v1 = {(z: Int, y1: String, x: Any): Int -> println(z); println(y1) }
+    val v1 = { z: Int, y1: String, x: Any -> println(z); println(y1) }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/FunctionLiteralBefore.kt b/idea/testData/refactoring/changeSignature/FunctionLiteralBefore.kt
index f027cbe8f3c..5fa5962b78e 100644
--- a/idea/testData/refactoring/changeSignature/FunctionLiteralBefore.kt
+++ b/idea/testData/refactoring/changeSignature/FunctionLiteralBefore.kt
@@ -1,3 +1,3 @@
 fun foo() {
-    val v1 = {(<caret>z: Int, y: String) -> println(z); println(y) }
+    val v1 = {<caret>z: Int, y: String -> println(z); println(y) }
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/GenericsWithSAMConstructorsAfter.1.kt b/idea/testData/refactoring/changeSignature/GenericsWithSAMConstructorsAfter.1.kt
index 55af593fa40..1d5bfe2abda 100644
--- a/idea/testData/refactoring/changeSignature/GenericsWithSAMConstructorsAfter.1.kt
+++ b/idea/testData/refactoring/changeSignature/GenericsWithSAMConstructorsAfter.1.kt
@@ -1,5 +1,5 @@
 fun test() {
-    SamTest.test(Foo<String, Int> { (s, n) -> "" })
-    SamTest.test(Foo { (s: MutableList<X<Int>>, n: X<MutableSet<String>>) -> "" })
-    SamTest.test(Foo { (s: MutableList<X<Int>>, n: X<MutableSet<String>>): X<MutableList<String>>? -> "" })
+    SamTest.test(Foo<String, Int> { s, n -> "" })
+    SamTest.test(Foo { s: MutableList<X<Int>>, n: X<MutableSet<String>> -> "" })
+    SamTest.test(Foo { s: MutableList<X<Int>>, n: X<MutableSet<String>> -> "" })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/GenericsWithSAMConstructorsBefore.1.kt b/idea/testData/refactoring/changeSignature/GenericsWithSAMConstructorsBefore.1.kt
index 49329c7ae6c..b0ccee6a643 100644
--- a/idea/testData/refactoring/changeSignature/GenericsWithSAMConstructorsBefore.1.kt
+++ b/idea/testData/refactoring/changeSignature/GenericsWithSAMConstructorsBefore.1.kt
@@ -1,5 +1,5 @@
 fun test() {
-    SamTest.test(Foo<String, Int> { (s, n) -> "" })
-    SamTest.test(Foo { (s: String, n: Int) -> "" })
-    SamTest.test(Foo { (s: String, n: Int): String -> "" })
+    SamTest.test(Foo<String, Int> { s, n -> "" })
+    SamTest.test(Foo { s: String, n: Int -> "" })
+    SamTest.test(Foo { s: String, n: Int -> "" })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMAddToEmptyParamListBefore.1.kt b/idea/testData/refactoring/changeSignature/SAMAddToEmptyParamListBefore.1.kt
index a2b3563f7f3..0e10cdc69f0 100644
--- a/idea/testData/refactoring/changeSignature/SAMAddToEmptyParamListBefore.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMAddToEmptyParamListBefore.1.kt
@@ -1,5 +1,5 @@
 fun test() {
     JTest.samTest(SAM { " " })
-    JTest.samTest(SAM { () -> " " })
+    JTest.samTest(SAM { -> " " })
     JTest.samTest(SAM { -> " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMAddToNonEmptyParamListAfter.1.kt b/idea/testData/refactoring/changeSignature/SAMAddToNonEmptyParamListAfter.1.kt
index aa4ca782cc2..b1f02320d21 100644
--- a/idea/testData/refactoring/changeSignature/SAMAddToNonEmptyParamListAfter.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMAddToNonEmptyParamListAfter.1.kt
@@ -1,3 +1,3 @@
 fun test() {
-    JTest.samTest(SAM {(s, n, o) -> s + " " + n })
+    JTest.samTest(SAM { s, n, o -> s + " " + n })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMAddToNonEmptyParamListBefore.1.kt b/idea/testData/refactoring/changeSignature/SAMAddToNonEmptyParamListBefore.1.kt
index 95a93c212dc..7906af65a08 100644
--- a/idea/testData/refactoring/changeSignature/SAMAddToNonEmptyParamListBefore.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMAddToNonEmptyParamListBefore.1.kt
@@ -1,3 +1,3 @@
 fun test() {
-    JTest.samTest(SAM { (s, n) -> s + " " + n })
+    JTest.samTest(SAM { s, n -> s + " " + n })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMAddToSingletonParamListAfter.1.kt b/idea/testData/refactoring/changeSignature/SAMAddToSingletonParamListAfter.1.kt
index b369af61c4f..a434049bda7 100644
--- a/idea/testData/refactoring/changeSignature/SAMAddToSingletonParamListAfter.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMAddToSingletonParamListAfter.1.kt
@@ -1,5 +1,5 @@
 fun test() {
-    JTest.samTest(SAM {(n, s) -> s + " " })
-    JTest.samTest(SAM {(n, s) -> s + " " })
-    JTest.samTest(SAM {(n, it) -> it + " " })
+    JTest.samTest(SAM { n, s -> s + " " })
+    JTest.samTest(SAM { n, s -> s + " " })
+    JTest.samTest(SAM { n, it -> it + " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMAddToSingletonParamListBefore.1.kt b/idea/testData/refactoring/changeSignature/SAMAddToSingletonParamListBefore.1.kt
index 6f7a69ac4f6..42110a56c4b 100644
--- a/idea/testData/refactoring/changeSignature/SAMAddToSingletonParamListBefore.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMAddToSingletonParamListBefore.1.kt
@@ -1,5 +1,5 @@
 fun test() {
     JTest.samTest(SAM { s -> s + " " })
-    JTest.samTest(SAM { (s) -> s + " " })
+    JTest.samTest(SAM { s -> s + " " })
     JTest.samTest(SAM { it + " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMChangeMethodReturnTypeAfter.1.kt b/idea/testData/refactoring/changeSignature/SAMChangeMethodReturnTypeAfter.1.kt
index 8d622ae21b4..2aac73f88b0 100644
--- a/idea/testData/refactoring/changeSignature/SAMChangeMethodReturnTypeAfter.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMChangeMethodReturnTypeAfter.1.kt
@@ -1,4 +1,4 @@
 fun test() {
-    JTest.samTest(SAM { (s, n) -> s + " " })
-    JTest.samTest(SAM { (s, n): Any? -> s + " " })
+    JTest.samTest(SAM { s, n -> s + " " })
+    JTest.samTest(SAM { s, n -> s + " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMChangeMethodReturnTypeBefore.1.kt b/idea/testData/refactoring/changeSignature/SAMChangeMethodReturnTypeBefore.1.kt
index 09de97025b5..2aac73f88b0 100644
--- a/idea/testData/refactoring/changeSignature/SAMChangeMethodReturnTypeBefore.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMChangeMethodReturnTypeBefore.1.kt
@@ -1,4 +1,4 @@
 fun test() {
-    JTest.samTest(SAM { (s, n) -> s + " " })
-    JTest.samTest(SAM { (s, n): String -> s + " " })
+    JTest.samTest(SAM { s, n -> s + " " })
+    JTest.samTest(SAM { s, n -> s + " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMChangeParamTypeAfter.1.kt b/idea/testData/refactoring/changeSignature/SAMChangeParamTypeAfter.1.kt
index d3c2641ff15..2a08ca341d9 100644
--- a/idea/testData/refactoring/changeSignature/SAMChangeParamTypeAfter.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMChangeParamTypeAfter.1.kt
@@ -1,4 +1,4 @@
 fun test() {
-    JTest.samTest(SAM { (s, n) -> s + " " })
-    JTest.samTest(SAM { (s: Any, n: Int) -> x + " " })
+    JTest.samTest(SAM { s, n -> s + " " })
+    JTest.samTest(SAM { s: Any, n: Int -> x + " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMChangeParamTypeBefore.1.kt b/idea/testData/refactoring/changeSignature/SAMChangeParamTypeBefore.1.kt
index ed09e73f976..fe646a80b6d 100644
--- a/idea/testData/refactoring/changeSignature/SAMChangeParamTypeBefore.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMChangeParamTypeBefore.1.kt
@@ -1,4 +1,4 @@
 fun test() {
-    JTest.samTest(SAM { (s, n) -> s + " " })
-    JTest.samTest(SAM { (s: String, n: Int) -> x + " " })
+    JTest.samTest(SAM { s, n -> s + " " })
+    JTest.samTest(SAM { s: String, n: Int -> x + " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMRemoveParamBefore.1.kt b/idea/testData/refactoring/changeSignature/SAMRemoveParamBefore.1.kt
index 7b9695cb6f5..f0f5574b299 100644
--- a/idea/testData/refactoring/changeSignature/SAMRemoveParamBefore.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMRemoveParamBefore.1.kt
@@ -1,4 +1,4 @@
 fun test() {
-    JTest.samTest(SAM { (s, n) -> s + " " })
-    JTest.samTest(SAM { (x, y) -> x + " " })
+    JTest.samTest(SAM { s, n -> s + " " })
+    JTest.samTest(SAM { x, y -> x + " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMRemoveSingletonParamListAfter.1.kt b/idea/testData/refactoring/changeSignature/SAMRemoveSingletonParamListAfter.1.kt
index d108ed3fd81..7e36ba365e3 100644
--- a/idea/testData/refactoring/changeSignature/SAMRemoveSingletonParamListAfter.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMRemoveSingletonParamListAfter.1.kt
@@ -1,5 +1,4 @@
 fun test() {
-    JTest.samTest(SAM { s + " " })
     JTest.samTest(SAM { s + " " })
     JTest.samTest(SAM { it + " " })
 }
\ No newline at end of file
diff --git a/idea/testData/refactoring/changeSignature/SAMRemoveSingletonParamListBefore.1.kt b/idea/testData/refactoring/changeSignature/SAMRemoveSingletonParamListBefore.1.kt
index 6f7a69ac4f6..4b79a82b719 100644
--- a/idea/testData/refactoring/changeSignature/SAMRemoveSingletonParamListBefore.1.kt
+++ b/idea/testData/refactoring/changeSignature/SAMRemoveSingletonParamListBefore.1.kt
@@ -1,5 +1,4 @@
 fun test() {
     JTest.samTest(SAM { s -> s + " " })
-    JTest.samTest(SAM { (s) -> s + " " })
     JTest.samTest(SAM { it + " " })
 }
\ No newline at end of file