diff --git a/java/java-tests/testSrc/com/intellij/util/indexing/IndexTest.groovy b/java/java-tests/testSrc/com/intellij/util/indexing/IndexTest.groovy
index c7077b8f7769..68a70975a413 100644
--- a/java/java-tests/testSrc/com/intellij/util/indexing/IndexTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/util/indexing/IndexTest.groovy
@@ -1144,7 +1144,7 @@ class IndexTest extends JavaCodeInsightFixtureTestCase {
 
   void "test indexed state for file without content requiring indices"() {
     def scope = GlobalSearchScope.allScope(getProject())
-    FileBasedIndex.instance.ensureUpToDate(FilenameIndex.NAME, project, scope)
+    FileBasedIndex.instance.ensureUpToDate(FileTypeIndex.NAME, project, scope)
 
     def files = FilenameIndex.getFilesByName(getProject(), "intellij.exe", scope)
     def file = assertOneElement(files).virtualFile
@@ -1152,7 +1152,7 @@ class IndexTest extends JavaCodeInsightFixtureTestCase {
     assertTrue(((VirtualFileSystemEntry)file).isFileIndexed())
 
     WriteCommandAction.runWriteCommandAction(getProject(), { file.rename(this, 'intellij2.exe') })
-    FileBasedIndex.instance.ensureUpToDate(FilenameIndex.NAME, project, scope)
+    FileBasedIndex.instance.ensureUpToDate(FileTypeIndex.NAME, project, scope)
     assertTrue(((VirtualFileSystemEntry)file).isFileIndexed())
   }
 
diff --git a/platform/indexing-api/src/com/intellij/psi/search/FilenameIndex.java b/platform/indexing-api/src/com/intellij/psi/search/FilenameIndex.java
index c5c43ac5d4f9..80baa2c0a05d 100644
--- a/platform/indexing-api/src/com/intellij/psi/search/FilenameIndex.java
+++ b/platform/indexing-api/src/com/intellij/psi/search/FilenameIndex.java
@@ -27,6 +27,8 @@ import java.util.Set;
 
 
 public final class FilenameIndex {
+  /** @deprecated Use {@link FilenameIndex} methods instead **/
+  @Deprecated
   @ApiStatus.Internal
   public static final ID<String, Void> NAME = ID.create("FilenameIndex");
 
diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java
index 208ae1665327..5e02e5309398 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/UniqueVFilePathBuilderImpl.java
@@ -12,8 +12,10 @@ import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.openapi.util.ThrowableComputable;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.UniqueNameBuilder;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFilePathWrapper;
+import com.intellij.openapi.vfs.newvfs.ManagingFS;
 import com.intellij.psi.search.FilenameIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.CachedValue;
@@ -123,7 +125,10 @@ final class UniqueVFilePathBuilderImpl extends UniqueVFilePathBuilder {
 
   @NotNull
   private static ModificationTracker getFilenameIndexModificationTracker(@NotNull Project project) {
-    return () -> disableIndexUpToDateCheckInEdt(() -> FileBasedIndex.getInstance().getIndexModificationStamp(FilenameIndex.NAME, project));
+    if (Registry.is("indexing.filename.over.vfs")) {
+      return () -> ManagingFS.getInstance().getModificationCount();
+    }
+    return () -> disableIndexUpToDateCheckInEdt(() -> FileBasedIndex.getInstance().getIndexModificationStamp(FilenameIndex.NAME, project)); //
   }
 
   @Nullable