diff --git a/java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java b/java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java
index e7339f255686..24350c196642 100644
--- a/java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java
+++ b/java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java
@@ -27,7 +27,6 @@ import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.util.SystemProperties;
@@ -179,17 +178,14 @@ public class FrequentlyUsedInheritorInspection extends BaseJavaLocalInspectionTo
       .filter(Objects::nonNull)
       .map(defAndCount -> {
         String name = compilerRefService.getName(defAndCount.myDef.getName());
-        PsiClass inheritor =
-          JavaFullClassNameIndex.getInstance().get(name.hashCode(), project, searchScope).stream()
-            .filter(cls -> name.equals(cls.getQualifiedName()))
-            .collect(MoreCollectors.onlyOne())
-            .orElse(null);
-
-        if (inheritor == null || !inheritor.isInheritor(aClass, false)) {
-          return null;
+        PsiClass[] inheritors = JavaPsiFacade.getInstance(project).findClasses(name, searchScope);
+        if (inheritors.length == 1) {
+          PsiClass inheritor = inheritors[0];
+          if (inheritor.isInheritor(aClass, false)) {
+            return new ClassAndInheritorCount(inheritor, defAndCount.myDef, defAndCount.inheritorCount);
+          }
         }
-
-        return new ClassAndInheritorCount(inheritor, defAndCount.myDef, defAndCount.inheritorCount);
+        return null;
       })
       .filter(Objects::nonNull)
       .collect(Collectors.toList());
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
index 370819daa7d1..b2c0ed053d75 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
@@ -42,7 +42,6 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.java.stubs.index.JavaFullClassNameIndex;
 import com.intellij.psi.jsp.JspFile;
 import com.intellij.psi.search.EverythingGlobalScope;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -247,10 +246,10 @@ public class LineBreakpoint<P extends JavaBreakpointProperties> extends Breakpoi
           final GlobalSearchScope scope = debugProcess.getSearchScope();
           final boolean contains = scope.contains(breakpointFile);
           List<VirtualFile> files = ContainerUtil.map(
-            JavaFullClassNameIndex.getInstance().get(className.hashCode(), myProject, scope),
+            JavaPsiFacade.getInstance(myProject).findClasses(className, scope),
             aClass -> aClass.getContainingFile().getVirtualFile());
           List<VirtualFile> allFiles = ContainerUtil.map(
-            JavaFullClassNameIndex.getInstance().get(className.hashCode(), myProject, new EverythingGlobalScope(myProject)),
+            JavaPsiFacade.getInstance(myProject).findClasses(className, new EverythingGlobalScope(myProject)),
             aClass -> aClass.getContainingFile().getVirtualFile());
           final VirtualFile contentRoot = fileIndex.getContentRootForFile(breakpointFile);
           final Module module = fileIndex.getModuleForFile(breakpointFile);
@@ -264,7 +263,7 @@ public class LineBreakpoint<P extends JavaBreakpointProperties> extends Breakpoi
                     "; all possible files are: " + allFiles
           );
         }
-        
+
         return false;
       }
     }
@@ -357,7 +356,7 @@ public class LineBreakpoint<P extends JavaBreakpointProperties> extends Breakpoi
             final int dotIndex = className.lastIndexOf(".");
             if (dotIndex >= 0 && !isFile) {
               packageName = className.substring(0, dotIndex);
-              className = className.substring(dotIndex + 1); 
+              className = className.substring(dotIndex + 1);
             }
 
             if (totalTextLength != -1) {
@@ -369,7 +368,7 @@ public class LineBreakpoint<P extends JavaBreakpointProperties> extends Breakpoi
                 }
               }
             }
-            
+
             info.append(className);
           }
           if(hasMethodInfo) {