diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt
index f4f6e14fa6f..c087d7b8826 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignature.kt
@@ -78,12 +78,11 @@ public class JetChangeSignature(project: Project,
 
         if (configuration.performSilently(affectedFunctions)
             || ApplicationManager.getApplication()!!.isUnitTestMode()) {
-            JetChangeSignatureDialog.createRefactoringProcessor(
+            JetChangeSignatureDialog.createRefactoringProcessorForSilentChangeSignature(
                     project,
                     commandName ?: ChangeSignatureHandler.REFACTORING_NAME,
                     adjustedDescriptor,
                     defaultValueContext
-
             ).run()
         }
         else {
@@ -131,6 +130,6 @@ TestOnly public fun createChangeInfo(project: Project,
 
     val adjustedDescriptor = jetChangeSignature.adjustDescriptor(declarations) ?: return null
 
-    val processor = JetChangeSignatureDialog.createRefactoringProcessor(project, "", adjustedDescriptor, defaultValueContext) as JetChangeSignatureProcessor
+    val processor = JetChangeSignatureDialog.createRefactoringProcessorForSilentChangeSignature(project,  ChangeSignatureHandler.REFACTORING_NAME, adjustedDescriptor, defaultValueContext) as JetChangeSignatureProcessor
     return processor.getChangeInfo()
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java
index f0c8b05a628..b07e7ae0a73 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureDialog.java
@@ -50,7 +50,6 @@ import com.intellij.util.ui.table.JBTableRow;
 import com.intellij.util.ui.table.JBTableRowEditor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.kotlin.descriptors.Visibilities;
 import org.jetbrains.kotlin.descriptors.Visibility;
 import org.jetbrains.kotlin.idea.JetFileType;
@@ -462,7 +461,6 @@ public class JetChangeSignatureDialog extends ChangeSignatureDialogBase<
     @Override
     @NotNull
     protected BaseRefactoringProcessor createRefactoringProcessor() {
-        String commandName1 = commandName != null ? commandName : getTitle();
         JetChangeInfo changeInfo = evaluateChangeInfo(
                 myParametersTableModel,
                 myReturnTypeCodeFragment,
@@ -471,11 +469,11 @@ public class JetChangeSignatureDialog extends ChangeSignatureDialogBase<
                 getMethodName(),
                 myDefaultValueContext
         );
-        return new JetChangeSignatureProcessor(myProject, changeInfo, commandName1);
+        return new JetChangeSignatureProcessor(myProject, changeInfo, commandName != null ? commandName : getTitle());
     }
 
-    @TestOnly
-    public static BaseRefactoringProcessor createRefactoringProcessor(
+    @NotNull
+    public static BaseRefactoringProcessor createRefactoringProcessorForSilentChangeSignature(
             @NotNull Project project,
             @NotNull String commandName,
             @NotNull JetMethodDescriptor method,
@@ -500,36 +498,34 @@ public class JetChangeSignatureDialog extends ChangeSignatureDialogBase<
     }
 
     private static JetChangeInfo evaluateChangeInfo(
-            @NotNull JetCallableParameterTableModel myParametersTableModel,
-            @Nullable PsiCodeFragment myReturnTypeCodeFragment,
-            @NotNull JetMethodDescriptor myMethod,
+            @NotNull JetCallableParameterTableModel parametersModel,
+            @Nullable PsiCodeFragment returnTypeCodeFragment,
+            @NotNull JetMethodDescriptor methodDescriptor,
             @Nullable Visibility visibility,
             @NotNull String methodName,
-            @NotNull PsiElement myDefaultValueContext
+            @NotNull PsiElement defaultValueContext
     ) {
-        List<JetParameterInfo> parameters = new ArrayList<JetParameterInfo>(myParametersTableModel.getRowCount());
+        List<JetParameterInfo> parameters = new ArrayList<JetParameterInfo>(parametersModel.getRowCount());
 
-        for (int i = 0; i < myParametersTableModel.getItems().size(); i++) {
-            JetParameterInfo parameter = myParametersTableModel.getItems().get(i).parameter;
-            parameter.setCurrentTypeText(myParametersTableModel.getItems().get(i).typeCodeFragment.getText().trim());
+        for (ParameterTableModelItemBase<JetParameterInfo> parameter : parametersModel.getItems()) {
+            parameter.parameter.setCurrentTypeText(parameter.typeCodeFragment.getText().trim());
 
-            parameters.add(parameter);
+            parameters.add(parameter.parameter);
 
-            JetExpressionCodeFragment codeFragment =
-                    (JetExpressionCodeFragment) myParametersTableModel.getItems().get(i).defaultValueCodeFragment;
-            JetExpression oldDefaultValue = parameter.getDefaultValueForCall();
+            JetExpressionCodeFragment codeFragment = (JetExpressionCodeFragment) parameter.defaultValueCodeFragment;
+            JetExpression oldDefaultValue = parameter.parameter.getDefaultValueForCall();
             if (!codeFragment.getText().equals(oldDefaultValue != null ? oldDefaultValue.getText() : "")) {
-                parameter.setDefaultValueForCall(codeFragment.getContentElement());
+                parameter.parameter.setDefaultValueForCall(codeFragment.getContentElement());
             }
         }
 
-        String returnTypeText = myReturnTypeCodeFragment != null ? myReturnTypeCodeFragment.getText().trim() : "";
-        JetMethodDescriptor descriptor = myMethod instanceof JetMutableMethodDescriptor
-                                         ? ((JetMutableMethodDescriptor) myMethod).getOriginal()
-                                         : myMethod;
-        JetType returnType = getType((JetTypeCodeFragment) myReturnTypeCodeFragment);
+        String returnTypeText = returnTypeCodeFragment != null ? returnTypeCodeFragment.getText().trim() : "";
+        JetMethodDescriptor descriptor = methodDescriptor instanceof JetMutableMethodDescriptor
+                                         ? ((JetMutableMethodDescriptor) methodDescriptor).getOriginal()
+                                         : methodDescriptor;
+        JetType returnType = getType((JetTypeCodeFragment) returnTypeCodeFragment);
         return new JetChangeInfo(descriptor, methodName, returnType, returnTypeText,
-                                 visibility, parameters, myParametersTableModel.getReceiver(), myDefaultValueContext);
+                                 visibility, parameters, parametersModel.getReceiver(), defaultValueContext);
     }
 
     @Override