diff --git a/platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java b/platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java
index 525f0dc7b61d..6bf9a0961422 100644
--- a/platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java
+++ b/platform/indexing-impl/src/com/intellij/psi/search/FileTypeIndex.java
@@ -23,6 +23,7 @@ import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.indexing.ID;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -34,11 +35,11 @@ import java.util.Map;
  */
 public class FileTypeIndex {
   /**
-   * @deprecated Use {@link #getFiles(FileType, GlobalSearchScope)},
+   * Use {@link #getFiles(FileType, GlobalSearchScope)},
    * {@link #containsFileOfType(FileType, GlobalSearchScope)} or
    * {@link #processFiles(FileType, Processor, GlobalSearchScope)} instead
    */
-  @Deprecated
+  @ApiStatus.Internal
   public static final ID<FileType, Void> NAME = ID.create("filetypes");
 
   @Nullable
diff --git a/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java b/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java
index f3d4f4770184..ccee9e2a2c9d 100644
--- a/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java
+++ b/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java
@@ -16,6 +16,7 @@ import com.intellij.util.SmartList;
 import com.intellij.util.indexing.ID;
 import com.intellij.util.indexing.IdFilter;
 import gnu.trove.THashSet;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -27,10 +28,9 @@ import java.util.*;
  */
 public class FilenameIndex {
 
-  /**
-   * @deprecated Not to be used.
-   */
-  @NonNls @Deprecated public static final ID<String, Void> NAME = ID.create("FilenameIndex");
+  @ApiStatus.Internal
+  @NonNls
+  public static final ID<String, Void> NAME = ID.create("FilenameIndex");
 
   public static String @NotNull [] getAllFilenames(@Nullable Project project) {
     Set<String> names = new THashSet<>();
diff --git a/platform/lang-impl/src/com/intellij/psi/search/FileNameIndexServiceImpl.java b/platform/lang-impl/src/com/intellij/psi/search/FileNameIndexServiceImpl.java
index 714e9eb611f0..090ceef65cf5 100644
--- a/platform/lang-impl/src/com/intellij/psi/search/FileNameIndexServiceImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/search/FileNameIndexServiceImpl.java
@@ -24,7 +24,7 @@ public final class FileNameIndexServiceImpl implements FileNameIndexService {
   @Override
   public Collection<VirtualFile> getVirtualFilesByName(Project project, @NotNull String name, @NotNull GlobalSearchScope scope, IdFilter filter) {
     Set<VirtualFile> files = new THashSet<>();
-    myIndex.processValues(FilenameIndexImpl.NAME, name, null, (file, value) -> {
+    myIndex.processValues(FilenameIndex.NAME, name, null, (file, value) -> {
       files.add(file);
       return true;
     }, scope, filter);
@@ -33,17 +33,17 @@ public final class FileNameIndexServiceImpl implements FileNameIndexService {
 
   @Override
   public void processAllFileNames(@NotNull Processor<? super String> processor, @NotNull GlobalSearchScope scope, IdFilter filter) {
-    myIndex.processAllKeys(FilenameIndexImpl.NAME, processor, scope, filter);
+    myIndex.processAllKeys(FilenameIndex.NAME, processor, scope, filter);
   }
 
   @NotNull
   @Override
   public Collection<VirtualFile> getFilesWithFileType(@NotNull FileType fileType, @NotNull GlobalSearchScope scope) {
-    return myIndex.getContainingFiles(FileTypeIndexImpl.NAME, fileType, scope);
+    return myIndex.getContainingFiles(FileTypeIndex.NAME, fileType, scope);
   }
 
   @Override
   public boolean processFilesWithFileType(@NotNull FileType fileType, @NotNull Processor<? super VirtualFile> processor, @NotNull GlobalSearchScope scope) {
-    return myIndex.processValues(FileTypeIndexImpl.NAME, fileType, null, (file, value) -> processor.process(file), scope);
+    return myIndex.processValues(FileTypeIndex.NAME, fileType, null, (file, value) -> processor.process(file), scope);
   }
 }
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/psi/search/FileTypeIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/search/FileTypeIndexImpl.java
index 699d18aac9c3..5bb0c9edc884 100644
--- a/platform/lang-impl/src/com/intellij/psi/search/FileTypeIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/search/FileTypeIndexImpl.java
@@ -2,7 +2,6 @@
 package com.intellij.psi.search;
 
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.util.indexing.*;
 import com.intellij.util.indexing.impl.IndexStorage;
 import com.intellij.util.io.KeyDescriptor;
@@ -14,12 +13,10 @@ import java.util.Collections;
 public final class FileTypeIndexImpl
         extends ScalarIndexExtension<FileType>
         implements CustomImplementationFileBasedIndexExtension<FileType, Void> {
-  static final ID<FileType, Void> NAME = FileTypeIndex.NAME;
-
   @NotNull
   @Override
   public ID<FileType, Void> getName() {
-    return NAME;
+    return FileTypeIndex.NAME;
   }
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/psi/search/FilenameIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/search/FilenameIndexImpl.java
index 046b3c9e2adb..c240f6597f85 100644
--- a/platform/lang-impl/src/com/intellij/psi/search/FilenameIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/search/FilenameIndexImpl.java
@@ -20,18 +20,15 @@ import com.intellij.openapi.vfs.newvfs.impl.VirtualFileSystemEntry;
 import com.intellij.util.indexing.*;
 import com.intellij.util.io.EnumeratorStringDescriptor;
 import com.intellij.util.io.KeyDescriptor;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 
 public class FilenameIndexImpl extends ScalarIndexExtension<String> {
-  @NonNls static final ID<String, Void> NAME = FilenameIndex.NAME;
-
   @NotNull
   @Override
   public ID<String,Void> getName() {
-    return NAME;
+    return FilenameIndex.NAME;
   }
 
   @NotNull