diff --git a/platform/core-api/src/com/intellij/openapi/vfs/encoding/FileEncodingProvider.java b/platform/core-api/src/com/intellij/openapi/vfs/encoding/Utf8BomOptionProvider.java
similarity index 70%
rename from platform/core-api/src/com/intellij/openapi/vfs/encoding/FileEncodingProvider.java
rename to platform/core-api/src/com/intellij/openapi/vfs/encoding/Utf8BomOptionProvider.java
index 70a87b4184dd..57fe40efbf5b 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/encoding/FileEncodingProvider.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/encoding/Utf8BomOptionProvider.java
@@ -6,10 +6,10 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Allows to overwrite project level encoding settings for a specific virtual file.
+ * Allows to overwrite project level UTF-8 BOM option for a specific virtual file.
  */
-public interface FileEncodingProvider {
-  ExtensionPointName<FileEncodingProvider> EP_NAME = ExtensionPointName.create("com.intellij.fileEncodingProvider");
+public interface Utf8BomOptionProvider {
+  ExtensionPointName<Utf8BomOptionProvider> EP_NAME = ExtensionPointName.create("com.intellij.utf8BomOptionProvider");
 
   /**
    * @param file The file to check.
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
index d63d35832006..a79042ae20f5 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
 import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
-import com.intellij.openapi.vfs.encoding.FileEncodingProvider;
+import com.intellij.openapi.vfs.encoding.Utf8BomOptionProvider;
 import com.intellij.openapi.vfs.ex.temp.TempFileSystem;
 import com.intellij.openapi.vfs.impl.local.LocalFileSystemImpl;
 import com.intellij.openapi.vfs.impl.win32.Win32LocalFileSystem;
@@ -487,7 +487,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
   }
 
   private static boolean isUtf8BomRequired(@NotNull VirtualFile file) {
-    for (FileEncodingProvider encodingProvider : FileEncodingProvider.EP_NAME.getExtensionList()) {
+    for (Utf8BomOptionProvider encodingProvider : Utf8BomOptionProvider.EP_NAME.getExtensionList()) {
       if (encodingProvider.shouldAddBOMForNewUtf8File(file)) {
         return true;
       }
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
index 992a7bb1781e..d16194fbc19f 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
@@ -381,6 +381,6 @@
 
     <extensionPoint name="iconDescriptionBundle" beanClass="com.intellij.ui.IconDescriptionBundleEP" dynamic="true"/>
 
-    <extensionPoint name="fileEncodingProvider" interface="com.intellij.openapi.vfs.encoding.FileEncodingProvider" dynamic="true"/>
+    <extensionPoint name="utf8BomOptionProvider" interface="com.intellij.openapi.vfs.encoding.Utf8BomOptionProvider" dynamic="true"/>
   </extensionPoints>
 </idea-plugin>
diff --git a/plugins/editorconfig/resources/META-INF/plugin.xml b/plugins/editorconfig/resources/META-INF/plugin.xml
index 22de145ce16b..27503ec3031b 100644
--- a/plugins/editorconfig/resources/META-INF/plugin.xml
+++ b/plugins/editorconfig/resources/META-INF/plugin.xml
@@ -90,7 +90,7 @@ To create an EditorConfig file in a directory, right-click this directory and se
     <fileDocumentManagerListener implementation="org.editorconfig.configmanagement.ConfigEncodingManager"/>
     <fileDocumentManagerListener implementation="org.editorconfig.configmanagement.LineEndingsManager"/>
 
-    <fileEncodingProvider implementation="org.editorconfig.configmanagement.EditorConfigFileEncodingProvider"/>
+    <utf8BomOptionProvider implementation="org.editorconfig.configmanagement.EditorConfigUtf8BomOptionProvider"/>
 
     <!-- Inspections -->
     <lang.inspectionSuppressor
diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigFileEncodingProvider.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigUtf8BomOptionProvider.java
similarity index 87%
rename from plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigFileEncodingProvider.java
rename to plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigUtf8BomOptionProvider.java
index 6a9a19fa2d67..a69ee8a0abfe 100644
--- a/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigFileEncodingProvider.java
+++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/EditorConfigUtf8BomOptionProvider.java
@@ -4,7 +4,7 @@ package org.editorconfig.configmanagement;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectLocator;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.encoding.FileEncodingProvider;
+import com.intellij.openapi.vfs.encoding.Utf8BomOptionProvider;
 import org.editorconfig.Utils;
 import org.editorconfig.core.EditorConfig;
 import org.editorconfig.plugincomponents.SettingsProviderComponent;
@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-public class EditorConfigFileEncodingProvider implements FileEncodingProvider {
+public class EditorConfigUtf8BomOptionProvider implements Utf8BomOptionProvider {
   @Override
   public boolean shouldAddBOMForNewUtf8File(@NotNull VirtualFile file) {
     Project project = ProjectLocator.getInstance().guessProjectForFile(file);