diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
index 46221b4831b..24e080775a3 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
@@ -191,9 +191,9 @@ public class JetNameSuggester {
     }
 
     private static void addForClassType(ArrayList<String> result, JetType jetType, JetNameValidator validator) {
-        ClassDescriptor classDescriptor = TypeUtils.getClassDescriptor(jetType);
-        if (classDescriptor != null) {
-            Name className = classDescriptor.getName();
+        ClassifierDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor();
+        if (descriptor != null) {
+            Name className = descriptor.getName();
             if (!className.isSpecial()) {
                 addCamelNames(result, className.asString(), validator);
             }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterCustomOperationOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterCustomOperationOnUserType.kt
index 7833cc9d30d..b3d688163c5 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterCustomOperationOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterCustomOperationOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class A<T>(val n: T) {
-    fun foo(arg: T): A<T> {
+    fun foo(t: T): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterGreaterOrEqualOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterGreaterOrEqualOnUserType.kt
index aeacd4a83c4..9ff5fc90cf4 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterGreaterOrEqualOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterGreaterOrEqualOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'compareTo'" "true"
 
 class A<T>(val n: T) {
-    fun compareTo(arg: T): Int {
+    fun compareTo(t: T): Int {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterInOnUserType.kt
index 80f98ec72c4..cafc1f2e377 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterInOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterInOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'contains'" "true"
 
 class A<T>(val n: T) {
-    fun contains(arg: T): Boolean {
+    fun contains(t: T): Boolean {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterLessOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterLessOnUserType.kt
index fca6dd7ec60..dbbd65624a9 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterLessOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterLessOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'compareTo'" "true"
 
 class A<T>(val n: T) {
-    fun compareTo(arg: T): Int {
+    fun compareTo(t: T): Int {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterNotInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterNotInOnUserType.kt
index fc0982a6059..daaab72118d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterNotInOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterNotInOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'contains'" "true"
 
 class A<T>(val n: T) {
-    fun contains(arg: T): Boolean {
+    fun contains(t: T): Boolean {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusAssignOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusAssignOnUserType.kt
index f588c9e1b62..78b69161b0e 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusAssignOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusAssignOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'plusAssign'" "true"
 
 class A<T>(val n: T) {
-    fun plusAssign(arg: T) {
+    fun plusAssign(t: T) {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusExtraArgs.kt
index 83fce91c2a2..6132970fd5d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusExtraArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusExtraArgs.kt
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     fun plus(): A<T> = throw Exception()
 
-    fun plus(arg: T): A<T> {
+    fun plus(t: T): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusForAssignmentOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusForAssignmentOnUserType.kt
index d1548d29469..3eed6904f0a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusForAssignmentOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusForAssignmentOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'plus'" "true"
 
 class A<T>(val n: T) {
-    fun plus(arg: T): A<T> {
+    fun plus(t: T): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusMissingArgs.kt
index cb6d583c3e6..cd047289d4a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusMissingArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusMissingArgs.kt
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     fun plus(i: Int, s: String): A<T> = throw Exception()
 
-    fun plus(arg: T): A<T> {
+    fun plus(t: T): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnUserType.kt
index d53c231d996..c0752039f2a 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterPlusOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'plus'" "true"
 
 class A<T>(val n: T) {
-    fun plus(arg: T): A<T> {
+    fun plus(t: T): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenInOnUserType.kt
index 7dd7b4b8283..a66efadc170 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenInOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenInOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'contains'" "true"
 
 class A<T>(val n: T) {
-    fun contains(arg: T): Boolean {
+    fun contains(t: T): Boolean {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenNotInOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenNotInOnUserType.kt
index 4e3f3d2d3b3..5a29aecbfb3 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenNotInOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/binaryOperations/afterWhenNotInOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'contains'" "true"
 
 class A<T>(val n: T) {
-    fun contains(arg: T): Boolean {
+    fun contains(t: T): Boolean {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterCallWithLambdaArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterCallWithLambdaArg.kt
index 6b90519a6aa..f90c488b910 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterCallWithLambdaArg.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterCallWithLambdaArg.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class A<T>(val n: T) {
-    fun foo(arg: T, s: String, function: Function1<T, T>): A<T> {
+    fun foo(t: T, s: String, function: Function1<T, T>): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunExtraArgs.kt
index aed30d16328..e718cbecd9d 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunExtraArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunExtraArgs.kt
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     fun foo(a: Int): A<T> = throw Exception()
 
-    fun foo(arg: T, s: String): A<T> {
+    fun foo(t: T, s: String): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunMissingArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunMissingArgs.kt
index c29cceb7892..e72d59a6181 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunMissingArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunMissingArgs.kt
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<T> = throw Exception()
 
-    fun foo(arg: T): A<T> {
+    fun foo(t: T): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserType.kt
index a5efa8edcdf..2e562c62ef8 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class A<T>(val n: T) {
-    fun foo(arg: T): A<T> {
+    fun foo(t: T): A<T> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableParamType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableParamType.kt
index b1af2d0fcfb..549a539a80f 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableParamType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableParamType.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class A<T>(val n: T) {
-    fun foo(arg: T?): A<Int> {
+    fun foo(t: T?): A<Int> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableType.kt
index 05c7178b784..52148b9c139 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableType.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class A<T>(val n: T) {
-    fun foo(arg: T): A<T>? {
+    fun foo(t: T): A<T>? {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableTypeParameter.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableTypeParameter.kt
index 6d315c0f874..46ed5326f43 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableTypeParameter.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterFunWithNullableTypeParameter.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class A<T>(val n: T) {
-    fun foo(arg: T): A<String> {
+    fun foo(t: T): A<String> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterInconsistentTypes.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterInconsistentTypes.kt
index 6a0df9250e1..91e4fefa695 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterInconsistentTypes.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterInconsistentTypes.kt
@@ -2,7 +2,7 @@
 // ERROR: <html>Type mismatch.<table><tr><td>Required:</td><td>kotlin.Int</td></tr><tr><td>Found:</td><td>A&lt;kotlin.Int&gt;</td></tr></table></html>
 
 class A<T>(val n: T) {
-    fun foo(s: String, arg: T): Any {
+    fun foo(s: String, t: T): Any {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnknownType.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnknownType.kt
index bb18515f533..1eb75045d81 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnknownType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/afterUnknownType.kt
@@ -2,7 +2,7 @@
 // ERROR: Unresolved reference: s
 
 class A<T>(val n: T) {
-    fun foo(s: Any, arg: T): T {
+    fun foo(s: Any, t: T): T {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMember.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMember.kt
index 3cbcf13e7cd..ea2fc4f1673 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMember.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMember.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class B<T>(val t: T) {
-    fun <U, V> foo(arg: U, arg1: V): U {
+    fun <U, V> foo(u: U, v: V): U {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberPartialSubstitution.kt
index bb4e54faa1c..1165f37ad58 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberPartialSubstitution.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class B<T>(val t: T) {
-    fun <U> foo(i: Int, arg: U): Int {
+    fun <U> foo(i: Int, u: U): Int {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberWithReceiverArg.kt
index 3cbcf13e7cd..ea2fc4f1673 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberWithReceiverArg.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterClassMemberWithReceiverArg.kt
@@ -1,7 +1,7 @@
 // "Create function 'foo'" "true"
 
 class B<T>(val t: T) {
-    fun <U, V> foo(arg: U, arg1: V): U {
+    fun <U, V> foo(u: U, v: V): U {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt
index 4604c35b4cd..91357baaa4b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtension.kt
@@ -6,6 +6,6 @@ class A<T>(val items: List<T>) {
     }
 }
 
-fun <E, T, U> List<E>.foo(arg: T, arg1: U): T {
+fun <E, T, U> List<E>.foo(t: T, u: U): T {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt
index 3824cfad919..24f7b76a18f 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionPartialSubstitution.kt
@@ -6,6 +6,6 @@ class A<T>(val items: List<T>) {
     }
 }
 
-fun <E, T> List<E>.foo(arg: T, s: String): T {
+fun <E, T> List<E>.foo(t: T, s: String): T {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt
index 4604c35b4cd..91357baaa4b 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterExtensionWithReceiverArg.kt
@@ -6,6 +6,6 @@ class A<T>(val items: List<T>) {
     }
 }
 
-fun <E, T, U> List<E>.foo(arg: T, arg1: U): T {
+fun <E, T, U> List<E>.foo(t: T, u: U): T {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt
index 04deac22c69..90110eabec0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiver.kt
@@ -4,6 +4,6 @@ fun test(): Int {
     return foo<String, Int>(2, "2")
 }
 
-fun <T, U> foo(arg: U, arg1: T): U {
+fun <T, U> foo(u: U, t: T): U {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt
index 1415f4e5562..6ff281f9da1 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverExtraArgs.kt
@@ -4,6 +4,6 @@ fun test(): Int {
     return foo<String, Int, Boolean>(2, "2")
 }
 
-fun <T, U, V> foo(arg: U, arg1: T): U {
+fun <T, U, V> foo(u: U, t: T): U {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt
index 04deac22c69..90110eabec0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverLongName.kt
@@ -4,6 +4,6 @@ fun test(): Int {
     return foo<String, Int>(2, "2")
 }
 
-fun <T, U> foo(arg: U, arg1: T): U {
+fun <T, U> foo(u: U, t: T): U {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt
index 16c17d6f944..f144cc865d0 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/call/typeArguments/afterNoReceiverPartialSubstitution.kt
@@ -4,6 +4,6 @@ fun test(): Int {
     return foo<Int>(2, "2")
 }
 
-fun <T> foo(arg: T, s: String): T {
+fun <T> foo(t: T, s: String): T {
     throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
 }
\ No newline at end of file
diff --git a/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnUserType.kt b/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnUserType.kt
index a6fa3257a73..1327773af15 100644
--- a/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnUserType.kt
+++ b/idea/testData/quickfix/createFromUsage/createFunction/invoke/afterInvokeOnUserType.kt
@@ -1,7 +1,7 @@
 // "Create function 'invoke'" "true"
 
 class A<T>(val n: T) {
-    fun invoke(arg: T, s: String): B<String> {
+    fun invoke(t: T, s: String): B<String> {
         throw UnsupportedOperationException("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
 }