diff --git a/java/server/src/org/openqa/selenium/grid/server/CommonConfig.java b/java/server/src/org/openqa/selenium/grid/server/BaseServerConfig.java
similarity index 96%
rename from java/server/src/org/openqa/selenium/grid/server/CommonConfig.java
rename to java/server/src/org/openqa/selenium/grid/server/BaseServerConfig.java
index 1679b512a557b..fab0666feae39 100644
--- a/java/server/src/org/openqa/selenium/grid/server/CommonConfig.java
+++ b/java/server/src/org/openqa/selenium/grid/server/BaseServerConfig.java
@@ -23,7 +23,7 @@
 
 import java.util.Optional;
 
-public class CommonConfig implements Config {
+public class BaseServerConfig implements Config {
 
   @Parameter(description = "Port to listen on", names = {"-p", "--port"})
   private int port = 0;