diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java
index e7c46ad39346..2e4c3a3c0f1e 100644
--- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java
+++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceBase.java
@@ -114,7 +114,7 @@ public abstract class CompilerReferenceServiceBase<Reader extends CompilerRefere
           }
           executeOnBuildThread(() -> {
             if (isUpToDate) {
-              openReaderIfNeed(IndexOpenReason.UP_TO_DATE_CACHE);
+              openReaderIfNeeded(IndexOpenReason.UP_TO_DATE_CACHE);
             } else {
               markAsOutdated(validIndexExists);
             }
@@ -122,7 +122,7 @@ public abstract class CompilerReferenceServiceBase<Reader extends CompilerRefere
         });
       }
 
-      Disposer.register(myProject, () -> closeReaderIfNeed(IndexCloseReason.PROJECT_CLOSED));
+      Disposer.register(myProject, () -> closeReaderIfNeeded(IndexCloseReason.PROJECT_CLOSED));
     }
   }
 
@@ -386,7 +386,7 @@ public abstract class CompilerReferenceServiceBase<Reader extends CompilerRefere
     }
   }
 
-  protected void closeReaderIfNeed(IndexCloseReason reason) {
+  protected void closeReaderIfNeeded(IndexCloseReason reason) {
     myOpenCloseLock.lock();
     try {
       if (reason == IndexCloseReason.COMPILATION_STARTED) {
@@ -402,7 +402,7 @@ public abstract class CompilerReferenceServiceBase<Reader extends CompilerRefere
     }
   }
 
-  protected void openReaderIfNeed(IndexOpenReason reason) {
+  protected void openReaderIfNeeded(IndexOpenReason reason) {
     myCompilationCount.increment();
     myOpenCloseLock.lock();
     try {
@@ -606,7 +606,7 @@ public abstract class CompilerReferenceServiceBase<Reader extends CompilerRefere
     LOG.error("an exception during " + actionName + " calculation", e);
     Throwable unwrapped = e instanceof RuntimeException ? e.getCause() : e;
     if (requireIndexRebuild(unwrapped)) {
-      closeReaderIfNeed(IndexCloseReason.AN_EXCEPTION);
+      closeReaderIfNeeded(IndexCloseReason.AN_EXCEPTION);
     }
     return null;
   }
diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java
index 07bd1a3b8421..c09174874d05 100644
--- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java
+++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java
@@ -55,7 +55,7 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceServiceBase<B
         @Override
         public void buildStarted(@NotNull Project project, @NotNull UUID sessionId, boolean isAutomake) {
           if (project == myProject) {
-            closeReaderIfNeed(IndexCloseReason.COMPILATION_STARTED);
+            closeReaderIfNeeded(IndexCloseReason.COMPILATION_STARTED);
           }
         }
       });
@@ -79,7 +79,7 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceServiceBase<B
                 return context.getCompileScope().getAffectedModules();
               });
               if (compilationModules == null) return;
-              openReaderIfNeed(IndexOpenReason.COMPILATION_FINISHED);
+              openReaderIfNeeded(IndexOpenReason.COMPILATION_FINISHED);
             };
             executeOnBuildThread(compilationFinished);
           }
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/MigrateGetterNameSetting.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/MigrateGetterNameSetting.java
index 36dd706410cc..09e6a4ff46cf 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/MigrateGetterNameSetting.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/MigrateGetterNameSetting.java
@@ -34,7 +34,7 @@ class MigrateGetterNameSetting {
 
   private final AtomicReference<Boolean> myGlobalValue = new AtomicReference<>();
 
-  void askUserIfNeed(final OverriddenUsageInfo info, final String newMethodName, final PsiType migrationReturnType) {
+  void askUserIfNeeded(final OverriddenUsageInfo info, final String newMethodName, final PsiType migrationReturnType) {
     final Boolean globalValue = myGlobalValue.get();
     if (globalValue == null) {
       final String currentName = ((PsiMethod)info.getElement()).getName();
diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
index c44b7fccd315..31d3b01b039d 100644
--- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
+++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
@@ -658,7 +658,7 @@ public class TypeMigrationLabeler {
           final String newMethodName = isMethodNameCanBeChanged(method);
           if (newMethodName != null) {
             final MigrateGetterNameSetting migrateGetterNameSetting = myRules.getConversionSettings(MigrateGetterNameSetting.class);
-            migrateGetterNameSetting.askUserIfNeed(overriddenUsageInfo, newMethodName, myTypeEvaluator.getType(myCurrentRoot));
+            migrateGetterNameSetting.askUserIfNeeded(overriddenUsageInfo, newMethodName, myTypeEvaluator.getType(myCurrentRoot));
           }
         }
         else {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/JavaBackwardReferenceIndexBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/JavaBackwardReferenceIndexBuilder.java
index 94c9de5c1d4c..a486f6f4eeb2 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/JavaBackwardReferenceIndexBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/JavaBackwardReferenceIndexBuilder.java
@@ -59,7 +59,7 @@ public class JavaBackwardReferenceIndexBuilder extends ModuleLevelBuilder {
       myCompiledTargets.clear();
     }
 
-    JavaBackwardReferenceIndexWriter.closeIfNeed(false);
+    JavaBackwardReferenceIndexWriter.closeIfNeeded(false);
   }
 
   @Override
@@ -77,7 +77,7 @@ public class JavaBackwardReferenceIndexBuilder extends ModuleLevelBuilder {
       final Throwable cause = writer.getRebuildRequestCause();
       if (cause != null) {
         LOG.error("compiler reference index will be deleted", cause);
-        JavaBackwardReferenceIndexWriter.closeIfNeed(true);
+        JavaBackwardReferenceIndexWriter.closeIfNeeded(true);
       }
 
       if (dirtyFilesHolder.hasRemovedFiles()) {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/JavaBackwardReferenceIndexWriter.java b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/JavaBackwardReferenceIndexWriter.java
index a61bba4abd87..6b4f6895c416 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/JavaBackwardReferenceIndexWriter.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/JavaBackwardReferenceIndexWriter.java
@@ -34,7 +34,7 @@ public class JavaBackwardReferenceIndexWriter extends CompilerReferenceWriter<Co
     super(index);
   }
 
-  public synchronized static void closeIfNeed(boolean clearIndex) {
+  public synchronized static void closeIfNeeded(boolean clearIndex) {
     if (ourInstance != null) {
       File dir = clearIndex ? ourInstance.myIndex.getIndicesDir() : null;
       try {
@@ -79,7 +79,7 @@ public class JavaBackwardReferenceIndexWriter extends CompilerReferenceWriter<Co
       if (CompilerReferenceIndex.exists(buildDir) || isRebuild) {
         ourInstance = new JavaBackwardReferenceIndexWriter(new JavaCompilerBackwardReferenceIndex(buildDir, false));
         ShutDownTracker.getInstance().registerShutdownTask(() -> {
-          closeIfNeed(false);
+          closeIfNeeded(false);
         });
       }
     } else {