diff --git a/java/client/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/client/src/org/openqa/selenium/edge/EdgeDriverService.java
index 6915422a0dab5..a7a98117a9444 100644
--- a/java/client/src/org/openqa/selenium/edge/EdgeDriverService.java
+++ b/java/client/src/org/openqa/selenium/edge/EdgeDriverService.java
@@ -18,7 +18,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.File;
diff --git a/java/server/src/org/openqa/selenium/grid/session/remote/ServicedSession.java b/java/server/src/org/openqa/selenium/grid/session/remote/ServicedSession.java
index ec07f931a29a6..5e591b740044c 100644
--- a/java/server/src/org/openqa/selenium/grid/session/remote/ServicedSession.java
+++ b/java/server/src/org/openqa/selenium/grid/session/remote/ServicedSession.java
@@ -109,7 +109,7 @@ public Factory(Predicate<Capabilities> key, String serviceClassName) {
 
         if (factory == null) {
           throw new IllegalArgumentException(
-              "DriverService has no mechanism to create a default instance");
+              "DriverService has no mechanism to create a default instance: " + serviceClassName);
         }
 
         this.createService = factory;
diff --git a/java/server/src/org/openqa/selenium/remote/server/ActiveSessionFactory.java b/java/server/src/org/openqa/selenium/remote/server/ActiveSessionFactory.java
index e4ee42bd23cf5..2dfdcf7769388 100644
--- a/java/server/src/org/openqa/selenium/remote/server/ActiveSessionFactory.java
+++ b/java/server/src/org/openqa/selenium/remote/server/ActiveSessionFactory.java
@@ -85,8 +85,8 @@ public ActiveSessionFactory() {
              "org.openqa.selenium.firefox.xpi.XpiDriverService")
         .put(browserName(CHROME), "org.openqa.selenium.chrome.ChromeDriverService")
         .put(containsKey("chromeOptions"), "org.openqa.selenium.chrome.ChromeDriverService")
-        .put(browserName(EDGE), "org.openqa.selenium.edge.EdgeDriverService")
-        .put(containsKey("edgeOptions"), "org.openqa.selenium.edge.EdgeDriverService")
+        .put(browserName(EDGE), "org.openqa.selenium.edge.ChromiumEdgeDriverService")
+        .put(containsKey("edgeOptions"), "org.openqa.selenium.edge.ChromiumEdgeDriverService")
         .put(browserName(FIREFOX), "org.openqa.selenium.firefox.GeckoDriverService")
         .put(containsKey(Pattern.compile("^moz:.*")), "org.openqa.selenium.firefox.GeckoDriverService")
         .put(browserName(IE), "org.openqa.selenium.ie.InternetExplorerDriverService")
diff --git a/java/server/src/org/openqa/selenium/remote/server/DefaultDriverFactory.java b/java/server/src/org/openqa/selenium/remote/server/DefaultDriverFactory.java
index a247349247a4a..b3ae1f0425728 100644
--- a/java/server/src/org/openqa/selenium/remote/server/DefaultDriverFactory.java
+++ b/java/server/src/org/openqa/selenium/remote/server/DefaultDriverFactory.java
@@ -71,7 +71,7 @@ public class DefaultDriverFactory implements DriverFactory {
         Stream.of(
             createProvider(new ImmutableCapabilities(BROWSER_NAME, IE, PLATFORM_NAME, WINDOWS),
                            "org.openqa.selenium.ie.InternetExplorerDriver"),
-            createProvider(new ImmutableCapabilities(BROWSER_NAME, EDGE, PLATFORM_NAME, WINDOWS),
+            createProvider(new ImmutableCapabilities(BROWSER_NAME, EDGE),
                            "org.openqa.selenium.edge.EdgeDriver"),
             createProvider(new ImmutableCapabilities(BROWSER_NAME, SAFARI, PLATFORM_NAME, MAC),
                            "org.openqa.selenium.safari.SafariDriver"))