diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
index 41515ee39de..1641d59bda9 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
@@ -116,7 +116,7 @@ public class AddFunctionParametersFix extends ChangeFunctionSignatureFix {
             public void configure(@NotNull JetChangeSignatureData changeSignatureData, @NotNull BindingContext bindingContext) {
                 List<ValueParameterDescriptor> parameters = functionDescriptor.getValueParameters();
                 List<? extends ValueArgument> arguments = callElement.getValueArguments();
-                JetNameValidator validator = JetNameValidator.getCollectingValidator(callElement.getProject());
+                JetNameValidator validator = JetNameValidator.createCollectingValidator(callElement.getProject());
 
                 for (int i = 0; i < arguments.size(); i ++) {
                     ValueArgument argument = arguments.get(i);
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
index 1e833485e32..bc213ef90c1 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
@@ -61,7 +61,7 @@ public class ChangeFunctionLiteralSignatureFix extends ChangeFunctionSignatureFi
         runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() {
             @Override
             public void configure(@NotNull JetChangeSignatureData changeSignatureData, @NotNull BindingContext bindingContext) {
-                JetNameValidator validator = JetNameValidator.getCollectingValidator(project);
+                JetNameValidator validator = JetNameValidator.createCollectingValidator(project);
                 changeSignatureData.clearParameters();
                 for (JetType type : parameterTypes) {
                     String name = JetNameSuggester.suggestNames(type, validator, "param")[0];
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
index ee2dbabe95c..da0d7f12910 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
@@ -39,8 +39,8 @@ public abstract class JetNameValidator {
         };
     }
 
-    @NotNull //TODO: shouldn't it be "createCollectingValidator"?
-    public static JetNameValidator getCollectingValidator(final Project project) {
+    @NotNull
+    public static JetNameValidator createCollectingValidator(final Project project) {
         return new JetNameValidator(project) {
             private final Set<String> suggestedSet = new HashSet<String>();