diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt
index a62d1d8fa57..6b5d1ec0bb2 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt
@@ -98,7 +98,7 @@ private fun needExplicitParameterTypes(context: InsertionContext, placeholderRan
 private fun buildTemplate(lambdaType: JetType, explicitParameterTypes: Boolean, project: Project): Template {
     val parameterTypes = functionParameterTypes(lambdaType)
 
-    val nameValidator = JetNameValidator.getEmptyValidator(project) //TODO: check for names in scope
+    val nameValidator = JetNameValidator.getEmptyValidator() //TODO: check for names in scope
 
     val useParenthesis = explicitParameterTypes || parameterTypes.size != 1
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java
index 6a57910e7ed..8ae32277d02 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.createCollectingValidator(callElement.getProject());
+                JetNameValidator validator = JetNameValidator.createCollectingValidator();
 
                 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 a89f7534c7c..12a2f0350fd 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java
@@ -56,12 +56,12 @@ public class ChangeFunctionLiteralSignatureFix extends ChangeFunctionSignatureFi
     }
 
     @Override
-    protected void invoke(@NotNull final Project project, Editor editor, JetFile file) {
+    protected void invoke(@NotNull Project project, Editor editor, JetFile file) {
         BindingContext bindingContext = ResolvePackage.getBindingContext(file);
         runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() {
             @Override
             public void configure(@NotNull JetChangeSignatureData changeSignatureData, @NotNull BindingContext bindingContext) {
-                JetNameValidator validator = JetNameValidator.createCollectingValidator(project);
+                JetNameValidator validator = JetNameValidator.createCollectingValidator();
                 changeSignatureData.clearParameters();
                 for (JetType type : parameterTypes) {
                     String name = JetNameSuggester.suggestNames(type, validator, "param")[0];
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt
index 8af44a3ea18..e9b4599d89f 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionFromUsageFix.kt
@@ -128,7 +128,7 @@ private class TypeOrExpressionThereof(private val variance: Variance,
         else {
             JetNameSuggester.suggestNamesForExpression(
                     expressionOfType!!,
-                    JetNameValidator.getEmptyValidator(expressionOfType.getProject())
+                    JetNameValidator.getEmptyValidator()
             )
         }
     }
@@ -665,7 +665,7 @@ public class CreateFunctionFromUsageFix internal (
     private fun setupParameterTypeTemplates(builder: TemplateBuilder, parameterList: JetParameterList): List<TypeExpression> {
         val jetParameters = parameterList.getParameters()
         assert(jetParameters.size == parameters.size)
-        val dummyValidator = JetNameValidator.getEmptyValidator(parameterList.getProject())
+        val dummyValidator = JetNameValidator.getEmptyValidator()
 
         val typeParameters = ArrayList<TypeExpression>()
         for ((parameter, jetParameter) in parameters.zip(jetParameters)) {
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
index da0d7f12910..f64c3c7c6c9 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidator.java
@@ -16,32 +16,27 @@
 
 package org.jetbrains.jet.plugin.refactoring;
 
-import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
 import java.util.Set;
 
 public abstract class JetNameValidator {
-    private final Project project;
+    private static final JetNameValidator EMPTY_VALIDATOR = new JetNameValidator() {
+        @Override
+        protected boolean validateInner(String name) {
+            return true;
+        }
+    };
 
-    protected JetNameValidator(Project project) {
-        this.project = project;
+    @NotNull
+    public static JetNameValidator getEmptyValidator() {
+        return EMPTY_VALIDATOR;
     }
 
     @NotNull
-    public static JetNameValidator getEmptyValidator(final Project project) {
-        return new JetNameValidator(project) {
-            @Override
-            protected boolean validateInner(String name) {
-                return true;
-            }
-        };
-    }
-
-    @NotNull
-    public static JetNameValidator createCollectingValidator(final Project project) {
-        return new JetNameValidator(project) {
+    public static JetNameValidator createCollectingValidator() {
+        return new JetNameValidator() {
             private final Set<String> suggestedSet = new HashSet<String>();
 
             @Override
@@ -74,8 +69,4 @@ public abstract class JetNameValidator {
     }
 
     protected abstract boolean validateInner(String name);
-
-    public Project getProject() {
-        return project;
-    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java
index 626d4dece4d..4cd38e75ede 100644
--- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java
+++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java
@@ -41,7 +41,6 @@ public class JetNameValidatorImpl extends JetNameValidator {
     private final Target myTarget;
 
     public JetNameValidatorImpl(PsiElement container, PsiElement anchor, Target target) {
-        super(container.getProject());
         myContainer = container;
         myAnchor = anchor;
         myTarget = target;
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java
index 2c5c5af4ea5..d63fc7dfc89 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java
@@ -92,7 +92,7 @@ public class JetNameSuggesterTest extends LightCodeInsightFixtureTestCase {
             JetRefactoringUtil.selectExpression(myFixture.getEditor(), file, new JetRefactoringUtil.SelectExpressionCallback() {
                 @Override
                 public void run(@Nullable JetExpression expression) {
-                    String[] names = JetNameSuggester.suggestNames(expression, JetNameValidator.getEmptyValidator(getProject()), "value");
+                    String[] names = JetNameSuggester.suggestNames(expression, JetNameValidator.getEmptyValidator(), "value");
                     Arrays.sort(names);
                     String result = StringUtil.join(names, "\n").trim();
                     assertEquals(expectedResultText, result);