diff --git a/src/Umbraco.Core/Services/ServerRegistrationService.cs b/src/Umbraco.Core/Services/ServerRegistrationService.cs
index 6f311019af..cdd06d6c3e 100644
--- a/src/Umbraco.Core/Services/ServerRegistrationService.cs
+++ b/src/Umbraco.Core/Services/ServerRegistrationService.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Core.Services
                 regs = xr.Repository.GetAll().ToArray();
 
                 // default role is single server, but if registrations contain more
-                // than one active server, then role is master or slave
+                // than one active server, then role is master or replica
                 _currentServerRole = regs.Count(x => x.IsActive) > 1
                     ? (server.IsMaster ? ServerRole.Master : ServerRole.Slave)
                     : ServerRole.Single;
@@ -175,4 +175,4 @@ namespace Umbraco.Core.Services
             return _currentServerRole;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Core/Sync/ServerRole.cs b/src/Umbraco.Core/Sync/ServerRole.cs
index cbc121c4bc..11f8811771 100644
--- a/src/Umbraco.Core/Sync/ServerRole.cs
+++ b/src/Umbraco.Core/Sync/ServerRole.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Sync
         Single = 1,
 
         /// <summary>
-        /// In a multi-servers environment, the server is a slave server.
+        /// In a multi-servers environment, the server is a replica server.
         /// </summary>
         Slave = 2,
 
@@ -25,4 +25,4 @@ namespace Umbraco.Core.Sync
         /// </summary>
         Master = 3
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Tests/ApplicationUrlHelperTests.cs b/src/Umbraco.Tests/ApplicationUrlHelperTests.cs
index 578a569104..0eb4f53ac2 100644
--- a/src/Umbraco.Tests/ApplicationUrlHelperTests.cs
+++ b/src/Umbraco.Tests/ApplicationUrlHelperTests.cs
@@ -129,7 +129,7 @@ namespace Umbraco.Tests
         public void SetApplicationUrlFromDcSettingsSsl2()
         {
             // set from distributed call settings
-            // other servers are slave servers
+            // other servers are replica servers
 
             var settings = Mock.Of<IUmbracoSettingsSection>(section =>
                 section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Enabled == true && callSection.Servers == new IServer[]
@@ -224,7 +224,7 @@ namespace Umbraco.Tests
         [Test]
         public void ServerRoleUnknown2()
         {
-            // distributed call enabled, cannot find server, assume it's an undeclared slave
+            // distributed call enabled, cannot find server, assume it's an undeclared replica
 
             var settings = Mock.Of<IUmbracoSettingsSection>(section =>
                 section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Enabled == true && callSection.Servers == new IServer[]
@@ -301,4 +301,4 @@ namespace Umbraco.Tests
             Assert.AreEqual("httpx://whatever.com/umbraco", appCtx._umbracoApplicationUrl);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
index c60e9d883e..1bfadbee4b 100644
--- a/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
+++ b/src/Umbraco.Web/Mvc/MasterControllerFactory.cs
@@ -17,11 +17,11 @@ namespace Umbraco.Web.Mvc
 	/// <remarks></remarks>
 	internal class MasterControllerFactory : DefaultControllerFactory
 	{
-		private readonly FilteredControllerFactoriesResolver _slaveFactories;
+		private readonly FilteredControllerFactoriesResolver _replicaFactories;
 
 		public MasterControllerFactory(FilteredControllerFactoriesResolver factoryResolver)
 		{
-			_slaveFactories = factoryResolver;
+			_replicaFactories = factoryResolver;
 		}
 
 		/// <summary>
@@ -36,7 +36,7 @@ namespace Umbraco.Web.Mvc
 		/// <remarks></remarks>
 		public override IController CreateController(RequestContext requestContext, string controllerName)
 		{
-			var factory = _slaveFactories.Factories.FirstOrDefault(x => x.CanHandle(requestContext));
+			var factory = _replicaFactories.Factories.FirstOrDefault(x => x.CanHandle(requestContext));
 			return factory != null
 			       	? factory.CreateController(requestContext, controllerName)
 			       	: base.CreateController(requestContext, controllerName);
@@ -53,7 +53,7 @@ namespace Umbraco.Web.Mvc
         /// <param name="controllerName">The name of the controller.</param>
         internal Type GetControllerTypeInternal(RequestContext requestContext, string controllerName)
         {
-            var factory = _slaveFactories.Factories.FirstOrDefault(x => x.CanHandle(requestContext));
+            var factory = _replicaFactories.Factories.FirstOrDefault(x => x.CanHandle(requestContext));
             if (factory != null)
             {
                 //check to see if the factory is of type UmbracoControllerFactory which exposes the GetControllerType method so we don't have to create
@@ -88,7 +88,7 @@ namespace Umbraco.Web.Mvc
 				if (controller is Controller)
 				{
 					var requestContext = ((Controller)controller).ControllerContext.RequestContext;
-					var factory = _slaveFactories.Factories.FirstOrDefault(x => x.CanHandle(requestContext));
+					var factory = _replicaFactories.Factories.FirstOrDefault(x => x.CanHandle(requestContext));
 					if (factory != null)
 					{
 						factory.ReleaseController(controller);
@@ -98,4 +98,4 @@ namespace Umbraco.Web.Mvc
 				if (!released) base.ReleaseController(controller);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs b/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
index 77577e26e2..75cce71f73 100644
--- a/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
+++ b/src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
@@ -241,8 +241,8 @@ namespace Umbraco.Web.Routing
         /// <param name="cacheRefresherEventArgs"></param>
         private void PageCacheRefresher_CacheUpdated(PageCacheRefresher sender, CacheRefresherEventArgs cacheRefresherEventArgs)
         {
-            // only on master / single, not on slaves!
-            if (IsSlaveServer) return;
+            // only on master / single, not on replicas!
+            if (IsReplicaServer) return;
 
             // simply getting OldRoutes will register it in the request cache,
             // so whatever we do with it, try/finally it to ensure it's cleared
@@ -299,8 +299,8 @@ namespace Umbraco.Web.Routing
             return route == null;
         }
 
-        // gets a value indicating whether server is 'slave'
-        private static bool IsSlaveServer
+        // gets a value indicating whether server is 'replica'
+        private static bool IsReplicaServer
         {
             get
             {
diff --git a/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs b/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
index c10c1c5315..d6e72f936b 100644
--- a/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
+++ b/src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Web.Scheduling
             switch (_appContext.GetCurrentServerRole())
             {
                 case ServerRole.Slave:
-                    LogHelper.Debug<HealthCheckNotifier>("Does not run on slave servers.");
+                    LogHelper.Debug<HealthCheckNotifier>("Does not run on replica servers.");
                     return true; // DO repeat, server role can change
                 case ServerRole.Unknown:
                     LogHelper.Debug<HealthCheckNotifier>("Does not run on servers with unknown role.");
@@ -80,4 +80,4 @@ namespace Umbraco.Web.Scheduling
             get { return true; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Scheduling/KeepAlive.cs b/src/Umbraco.Web/Scheduling/KeepAlive.cs
index 0e6c2c7fb4..eb41fa4c82 100644
--- a/src/Umbraco.Web/Scheduling/KeepAlive.cs
+++ b/src/Umbraco.Web/Scheduling/KeepAlive.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Scheduling
             switch (_appContext.GetCurrentServerRole())
             {
                 case ServerRole.Slave:
-                    Logger.Debug<ScheduledPublishing>("Does not run on slave servers.");
+                    Logger.Debug<ScheduledPublishing>("Does not run on replica servers.");
                     return true; // DO repeat, server role can change
                 case ServerRole.Unknown:
                     Logger.Debug<ScheduledPublishing>("Does not run on servers with unknown role.");
diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs
index 9000fc72cf..c525f537d0 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs
@@ -63,7 +63,7 @@ namespace Umbraco.Web.Scheduling
             switch (_appContext.GetCurrentServerRole())
             {
                 case ServerRole.Slave:
-                    LogHelper.Debug<LogScrubber>("Does not run on slave servers.");
+                    LogHelper.Debug<LogScrubber>("Does not run on replica servers.");
                     return true; // DO repeat, server role can change
                 case ServerRole.Unknown:
                     LogHelper.Debug<LogScrubber>("Does not run on servers with unknown role.");
@@ -94,4 +94,4 @@ namespace Umbraco.Web.Scheduling
             get { return false; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index 52cca003b7..bf82f6cb67 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Scheduling
             switch (_appContext.GetCurrentServerRole())
             {
                 case ServerRole.Slave:
-                    Logger.Debug<ScheduledPublishing>("Does not run on slave servers.");
+                    Logger.Debug<ScheduledPublishing>("Does not run on replica servers.");
                     return true; // DO repeat, server role can change
                 case ServerRole.Unknown:
                     Logger.Debug<ScheduledPublishing>("Does not run on servers with unknown role.");
@@ -106,4 +106,4 @@ namespace Umbraco.Web.Scheduling
             get { return false; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
index ad7fef5fd9..41daf796d6 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledTasks.cs
@@ -92,7 +92,7 @@ namespace Umbraco.Web.Scheduling
             switch (_appContext.GetCurrentServerRole())
             {
                 case ServerRole.Slave:
-                    LogHelper.Debug<ScheduledTasks>("Does not run on slave servers.");
+                    LogHelper.Debug<ScheduledTasks>("Does not run on replica servers.");
                     return true; // DO repeat, server role can change
                 case ServerRole.Unknown:
                     LogHelper.Debug<ScheduledTasks>("Does not run on servers with unknown role.");
diff --git a/src/Umbraco.Web/Scheduling/Scheduler.cs b/src/Umbraco.Web/Scheduling/Scheduler.cs
index 5a8d409a8c..4a74aaa55c 100644
--- a/src/Umbraco.Web/Scheduling/Scheduler.cs
+++ b/src/Umbraco.Web/Scheduling/Scheduler.cs
@@ -104,13 +104,13 @@ namespace Umbraco.Web.Scheduling
                 _keepAliveRunner.TryAdd(tasks[0]);
 
                 // scheduled publishing/unpublishing
-                // install on all, will only run on non-slaves servers
+                // install on all, will only run on non-replica servers
                 _publishingRunner.TryAdd(tasks[1]);
 
                 _tasksRunner.TryAdd(tasks[2]);
 
                 // log scrubbing
-                // install on all, will only run on non-slaves servers
+                // install on all, will only run on non-replica servers
                 _scrubberRunner.TryAdd(tasks[3]);
 
                 if (healthCheckConfig.NotificationSettings.Enabled)