diff --git a/Behavioral.Automation.DemoBindings/Bootstrapper.cs b/Behavioral.Automation.DemoBindings/Bootstrapper.cs
index 6a560fc5..42991498 100644
--- a/Behavioral.Automation.DemoBindings/Bootstrapper.cs
+++ b/Behavioral.Automation.DemoBindings/Bootstrapper.cs
@@ -11,20 +11,20 @@ public class Bootstrapper
         private readonly IObjectContainer _objectContainer;
         private readonly ITestRunner _runner;
         private readonly DemoTestServicesBuilder _servicesBuilder;
-        private readonly BrowserContext _browserContext;
+        private readonly BrowserRunner _browserRunner;
 
-        public Bootstrapper(IObjectContainer objectContainer, ITestRunner runner, BrowserContext browserContext)
+        public Bootstrapper(IObjectContainer objectContainer, ITestRunner runner, BrowserRunner browserRunner)
         {
             _objectContainer = objectContainer;
             _runner = runner;
-            _browserContext = browserContext;
+            _browserRunner = browserRunner;
             _servicesBuilder = new DemoTestServicesBuilder(objectContainer, new TestServicesBuilder(_objectContainer));
         }
 
         [AfterScenario]
         public void CloseBrowser()
         {
-            _browserContext.CloseBrowser();
+            _browserRunner.CloseBrowser();
         }
 
         [BeforeScenario(Order = 0)]
@@ -34,7 +34,7 @@ public void Bootstrap()
             _objectContainer.RegisterTypeAs<UserInterfaceBuilder, IUserInterfaceBuilder>();
             _servicesBuilder.Build();
             Assert.SetConsumer(_objectContainer.Resolve<IScenarioExecutionConsumer>());
-            _browserContext.OpenChrome();
+            _browserRunner.OpenChrome();
         }
     }
 }
diff --git a/src/Behavioral.Automation/Services/BrowserContext.cs b/src/Behavioral.Automation/Services/BrowserRunner.cs
similarity index 98%
rename from src/Behavioral.Automation/Services/BrowserContext.cs
rename to src/Behavioral.Automation/Services/BrowserRunner.cs
index 144ad10a..3106b512 100644
--- a/src/Behavioral.Automation/Services/BrowserContext.cs
+++ b/src/Behavioral.Automation/Services/BrowserRunner.cs
@@ -6,7 +6,7 @@
 
 namespace Behavioral.Automation.Services
 {
-    public class BrowserContext
+    public class BrowserRunner
     {
         public RemoteWebDriver Driver;
         
diff --git a/src/Behavioral.Automation/Services/DriverService.cs b/src/Behavioral.Automation/Services/DriverService.cs
index e11a62bc..4eb27d94 100644
--- a/src/Behavioral.Automation/Services/DriverService.cs
+++ b/src/Behavioral.Automation/Services/DriverService.cs
@@ -18,15 +18,15 @@ public sealed class DriverService : IDriverService
     {
         [NotNull]
         private readonly IScopeContextManager _scopeContextManager;
-        private readonly BrowserContext _browserContext;
+        private readonly BrowserRunner _browserRunner;
 
-        public DriverService([NotNull] IScopeContextManager scopeContextManager, BrowserContext browserContext)
+        public DriverService([NotNull] IScopeContextManager scopeContextManager, BrowserRunner browserRunner)
         {
             _scopeContextManager = scopeContextManager;
-            _browserContext = browserContext;
+            _browserRunner = browserRunner;
         }
 
-        public RemoteWebDriver Driver => _browserContext.Driver;
+        public RemoteWebDriver Driver => _browserRunner.Driver;
 
         private readonly string SearchAttribute = ConfigServiceBase.SearchAttribute;