diff --git a/xml/impl/src/org/jetbrains/builtInWebServer/BuiltInWebServer.java b/xml/impl/src/org/jetbrains/builtInWebServer/BuiltInWebServer.java
index 89122745562d..79e6b568fbba 100644
--- a/xml/impl/src/org/jetbrains/builtInWebServer/BuiltInWebServer.java
+++ b/xml/impl/src/org/jetbrains/builtInWebServer/BuiltInWebServer.java
@@ -183,7 +183,7 @@ public final class BuiltInWebServer extends HttpRequestHandler {
     return false;
   }
 
-  static final class StaticFileHandler extends FileHandler {
+  static final class StaticFileHandler extends WebServerFileHandler {
     @Override
     public boolean process(@NotNull VirtualFile file,
                            @NotNull CharSequence canonicalRequestPath,
diff --git a/xml/impl/src/org/jetbrains/builtInWebServer/DefaultPathHandler.java b/xml/impl/src/org/jetbrains/builtInWebServer/DefaultPathHandler.java
index 9f683923de95..f52530c9aa14 100644
--- a/xml/impl/src/org/jetbrains/builtInWebServer/DefaultPathHandler.java
+++ b/xml/impl/src/org/jetbrains/builtInWebServer/DefaultPathHandler.java
@@ -86,7 +86,7 @@ final class DefaultPathHandler extends PathHandler {
       canonicalRequestPath.append('/').append(result.getName());
     }
 
-    for (FileHandler fileHandler : FileHandler.EP_NAME.getExtensions()) {
+    for (WebServerFileHandler fileHandler : WebServerFileHandler.EP_NAME.getExtensions()) {
       try {
         if (fileHandler.process(result, canonicalRequestPath, project, request, channel)) {
           return true;
diff --git a/xml/impl/src/org/jetbrains/builtInWebServer/FileHandler.java b/xml/impl/src/org/jetbrains/builtInWebServer/WebServerFileHandler.java
similarity index 88%
rename from xml/impl/src/org/jetbrains/builtInWebServer/FileHandler.java
rename to xml/impl/src/org/jetbrains/builtInWebServer/WebServerFileHandler.java
index 37f1d27a4f67..9035af6c52cc 100644
--- a/xml/impl/src/org/jetbrains/builtInWebServer/FileHandler.java
+++ b/xml/impl/src/org/jetbrains/builtInWebServer/WebServerFileHandler.java
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
-public abstract class FileHandler {
-  static final ExtensionPointName<FileHandler> EP_NAME = ExtensionPointName.create("org.jetbrains.webServerFileHandler");
+public abstract class WebServerFileHandler {
+  static final ExtensionPointName<WebServerFileHandler> EP_NAME = ExtensionPointName.create("org.jetbrains.webServerFileHandler");
 
   public abstract boolean process(@NotNull VirtualFile file,
                                   @NotNull CharSequence canonicalRequestPath,