diff --git a/dotnet/test/common/CustomDriverConfigs/ChromiumEdgeDriver.cs b/dotnet/test/common/CustomDriverConfigs/DevChannelEdgeDriver.cs
similarity index 84%
rename from dotnet/test/common/CustomDriverConfigs/ChromiumEdgeDriver.cs
rename to dotnet/test/common/CustomDriverConfigs/DevChannelEdgeDriver.cs
index 39978bbb8dbcb..c724b3597add1 100644
--- a/dotnet/test/common/CustomDriverConfigs/ChromiumEdgeDriver.cs
+++ b/dotnet/test/common/CustomDriverConfigs/DevChannelEdgeDriver.cs
@@ -6,16 +6,16 @@
 
 namespace OpenQA.Selenium.Edge
 {
-    public class ChromiumEdgeDriver : EdgeDriver
+    public class DevChannelEdgeDriver : EdgeDriver
     {
         private static string servicePath = string.Empty;
 
-        public ChromiumEdgeDriver()
+        public DevChannelEdgeDriver()
             : this(DefaultService, DefaultOptions)
         {
         }
 
-        public ChromiumEdgeDriver(EdgeDriverService service, EdgeOptions options)
+        public DevChannelEdgeDriver(EdgeDriverService service, EdgeOptions options)
             : base(service, options)
         {
         }
diff --git a/dotnet/test/common/CustomDriverConfigs/DefaultEdgeDriver.cs b/dotnet/test/common/CustomDriverConfigs/LegacyEdgeDriver.cs
similarity index 78%
rename from dotnet/test/common/CustomDriverConfigs/DefaultEdgeDriver.cs
rename to dotnet/test/common/CustomDriverConfigs/LegacyEdgeDriver.cs
index f31b813d954a1..c5951eada0ca9 100644
--- a/dotnet/test/common/CustomDriverConfigs/DefaultEdgeDriver.cs
+++ b/dotnet/test/common/CustomDriverConfigs/LegacyEdgeDriver.cs
@@ -6,14 +6,14 @@
 
 namespace OpenQA.Selenium.Edge
 {
-    public class DefaultEdgeDriver : EdgeDriver
+    public class LegacyEdgeDriver : EdgeDriver
     {
-        public DefaultEdgeDriver()
+        public LegacyEdgeDriver()
             : this(DefaultService, new EdgeOptions())
         {
         }
 
-        public DefaultEdgeDriver(EdgeDriverService service, EdgeOptions options)
+        public LegacyEdgeDriver(EdgeDriverService service, EdgeOptions options)
             : base(service, options)
         {
         }
diff --git a/dotnet/test/common/CustomDriverConfigs/NightlyFirefoxWebDriver.cs b/dotnet/test/common/CustomDriverConfigs/NightlyChannelFirefoxDriver.cs
similarity index 72%
rename from dotnet/test/common/CustomDriverConfigs/NightlyFirefoxWebDriver.cs
rename to dotnet/test/common/CustomDriverConfigs/NightlyChannelFirefoxDriver.cs
index d4da5efc259bf..e079deb823e4a 100644
--- a/dotnet/test/common/CustomDriverConfigs/NightlyFirefoxWebDriver.cs
+++ b/dotnet/test/common/CustomDriverConfigs/NightlyChannelFirefoxDriver.cs
@@ -5,14 +5,14 @@ namespace OpenQA.Selenium.Firefox
     // This is a simple wrapper class to create a FirefoxDriver that
     // uses the Marionette implementation and has no parameters in the
     // constructor.
-    public class NightlyFirefoxWebDriver : FirefoxDriver
+    public class NightlyChannelFirefoxDriver : FirefoxDriver
     {
-        public NightlyFirefoxWebDriver(FirefoxDriverService service)
+        public NightlyChannelFirefoxDriver(FirefoxDriverService service)
             : this(service, DefaultOptions)
         {
         }
 
-        public NightlyFirefoxWebDriver(FirefoxDriverService service, FirefoxOptions options)
+        public NightlyChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)
             : base(service, options)
         {
         }
diff --git a/dotnet/test/common/CustomDriverConfigs/SpecCompliantChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/SpecCompliantChromeDriver.cs
deleted file mode 100644
index 0c2bdf4ea2df5..0000000000000
--- a/dotnet/test/common/CustomDriverConfigs/SpecCompliantChromeDriver.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OpenQA.Selenium.Chrome
-{
-    public class SpecCompliantChromeDriver : ChromeDriver
-    {
-        public SpecCompliantChromeDriver(ChromeDriverService service)
-            : this(service, DefaultOptions)
-        {
-        }
-
-        public SpecCompliantChromeDriver(ChromeDriverService service, ChromeOptions options)
-            : base(service, options)
-        {
-        }
-
-        public static ChromeOptions DefaultOptions
-        {
-            get { return new ChromeOptions() { UseSpecCompliantProtocol = true }; }
-        }
-    }
-}
diff --git a/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs
new file mode 100644
index 0000000000000..acba9c9fc59ee
--- /dev/null
+++ b/dotnet/test/common/CustomDriverConfigs/StableChannelChromeDriver.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenQA.Selenium.Chrome
+{
+    public class StableChannelChromeDriver : ChromeDriver
+    {
+        public StableChannelChromeDriver(ChromeDriverService service, ChromeOptions options)
+            : base(service, options)
+        {
+        }
+    }
+}
diff --git a/dotnet/test/common/CustomDriverConfigs/ReleaseFirefoxWebDriver.cs b/dotnet/test/common/CustomDriverConfigs/StableChannelFirefoxDriver.cs
similarity index 73%
rename from dotnet/test/common/CustomDriverConfigs/ReleaseFirefoxWebDriver.cs
rename to dotnet/test/common/CustomDriverConfigs/StableChannelFirefoxDriver.cs
index 72e958ca96e14..b97882376cf2f 100644
--- a/dotnet/test/common/CustomDriverConfigs/ReleaseFirefoxWebDriver.cs
+++ b/dotnet/test/common/CustomDriverConfigs/StableChannelFirefoxDriver.cs
@@ -5,14 +5,14 @@ namespace OpenQA.Selenium.Firefox
     // This is a simple wrapper class to create a FirefoxDriver that
     // uses the Marionette implementation and has no parameters in the
     // constructor.
-    public class ReleaseFirefoxWebDriver : FirefoxDriver
+    public class StableChannelFirefoxDriver : FirefoxDriver
     {
-        public ReleaseFirefoxWebDriver(FirefoxDriverService service)
+        public StableChannelFirefoxDriver(FirefoxDriverService service)
             : this(service, DefaultOptions)
         {
         }
 
-        public ReleaseFirefoxWebDriver(FirefoxDriverService service, FirefoxOptions options)
+        public StableChannelFirefoxDriver(FirefoxDriverService service, FirefoxOptions options)
             : base(service, options, RemoteWebDriver.DefaultCommandTimeout)
         {
         }
diff --git a/dotnet/test/common/appconfig.json b/dotnet/test/common/appconfig.json
index 78c8344b2a418..d6c96f07b314b 100644
--- a/dotnet/test/common/appconfig.json
+++ b/dotnet/test/common/appconfig.json
@@ -20,7 +20,7 @@
   },
   "DriverConfigs": {
     "Chrome": {
-      "DriverTypeName": "OpenQA.Selenium.Chrome.SpecCompliantChromeDriver",
+      "DriverTypeName": "OpenQA.Selenium.Chrome.StableChannelChromeDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Chrome",
       "RemoteCapabilities": "chrome"
@@ -41,28 +41,28 @@
     },
 
     "Edge": {
-      "DriverTypeName": "OpenQA.Selenium.Edge.ChromiumEdgeDriver",
+      "DriverTypeName": "OpenQA.Selenium.Edge.DevChannelEdgeDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Edge",
       "RemoteCapabilities": "MicrosoftEdge"
     },
 
     "EdgeLegacy": {
-      "DriverTypeName": "OpenQA.Selenium.Edge.DefaultEdgeDriver",
+      "DriverTypeName": "OpenQA.Selenium.Edge.LegacyEdgeDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "EdgeLegacy",
       "RemoteCapabilities": "MicrosoftEdge"
     },
 
     "Firefox": {
-      "DriverTypeName": "OpenQA.Selenium.Firefox.ReleaseFirefoxWebDriver",
+      "DriverTypeName": "OpenQA.Selenium.Firefox.StableChannelFirefoxDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Firefox",
       "RemoteCapabilities": "firefox"
     },
 
     "FirefoxNightly": {
-      "DriverTypeName": "OpenQA.Selenium.Firefox.NightlyFirefoxWebDriver",
+      "DriverTypeName": "OpenQA.Selenium.Firefox.NightlyChannelFirefoxDriver",
       "AssemblyName": "WebDriver.Common.Tests",
       "BrowserValue": "Firefox",
       "RemoteCapabilities": "firefox"