diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt
index 240968f753e..d466382424d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetParameterInfo.kt
@@ -73,7 +73,7 @@ public class JetParameterInfo(
         return parameterType.renderTypeWithSubstitution(typeSubstitutor, currentTypeText, true)
     }
 
-    public fun getInheritedName(inheritedFunction: JetFunctionDefinitionUsage<PsiElement>): String {
+    public fun getInheritedName(inheritedFunction: JetFunctionDefinitionUsage<*>): String {
         if (!inheritedFunction.isInherited()) return name
 
         val baseFunction = inheritedFunction.getBaseFunction()
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetParameterUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetParameterUsage.kt
index 8a91ab16513..770fa7eed9f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetParameterUsage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetParameterUsage.kt
@@ -14,33 +14,21 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages;
+package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo;
-import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo;
-import org.jetbrains.kotlin.psi.JetSimpleNameExpression;
+import org.jetbrains.kotlin.psi.JetSimpleNameExpression
+import org.jetbrains.kotlin.psi.JetPsiFactory
+import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo
+import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo
 
-import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
-
-public class JetParameterUsage extends JetUsageInfo<JetSimpleNameExpression> {
-    private final JetParameterInfo parameterInfo;
-    private final JetFunctionDefinitionUsage containingFunction;
-
-    public JetParameterUsage(
-            @NotNull JetSimpleNameExpression element,
-            @NotNull JetParameterInfo parameterInfo,
-            @NotNull JetFunctionDefinitionUsage containingFunction
-    ) {
-        super(element);
-        this.parameterInfo = parameterInfo;
-        this.containingFunction = containingFunction;
-    }
-
-    @Override
-    public boolean processUsage(JetChangeInfo changeInfo, JetSimpleNameExpression element) {
-        String newName = parameterInfo.getInheritedName(containingFunction);
-        element.replace(JetPsiFactory(element.getProject()).createSimpleName(newName));
-        return false;
+public class JetParameterUsage(
+        element: JetSimpleNameExpression,
+        private val parameterInfo: JetParameterInfo,
+        private val containingFunction: JetFunctionDefinitionUsage<*>
+) : JetUsageInfo<JetSimpleNameExpression>(element) {
+    override fun processUsage(changeInfo: JetChangeInfo, element: JetSimpleNameExpression): Boolean {
+        val newName = parameterInfo.getInheritedName(containingFunction)
+        element.replace(JetPsiFactory(element.getProject()).createSimpleName(newName))
+        return false
     }
 }