diff --git a/src/Umbraco.Core/MainDom.cs b/src/Umbraco.Core/MainDom.cs
index d1012fb669..613abd6946 100644
--- a/src/Umbraco.Core/MainDom.cs
+++ b/src/Umbraco.Core/MainDom.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core
         private readonly object _locko = new object();
 
         // async lock representing the main domain lock
-        private readonly AsyncLock _asyncLock;
+        private readonly SystemLock _asyncLock;
         private IDisposable _asyncLocker;
 
         // event wait handle used to notify current main domain that it should
@@ -68,7 +68,7 @@ namespace Umbraco.Core
             var hash = (appId + ":::" + appPath).ToSHA1();
 
             var lockName = "UMBRACO-" + hash + "-MAINDOM-LCK";
-            _asyncLock = new AsyncLock(lockName);
+            _asyncLock = new SystemLock(lockName);
 
             var eventName = "UMBRACO-" + hash + "-MAINDOM-EVT";
             _signal = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
diff --git a/src/Umbraco.Core/AsyncLock.cs b/src/Umbraco.Core/SystemLock.cs
similarity index 80%
rename from src/Umbraco.Core/AsyncLock.cs
rename to src/Umbraco.Core/SystemLock.cs
index 6dd866705e..e637c7b08f 100644
--- a/src/Umbraco.Core/AsyncLock.cs
+++ b/src/Umbraco.Core/SystemLock.cs
@@ -21,18 +21,18 @@ namespace Umbraco.Core
     // been closed, the Semaphore system object is destroyed - so in any case
     // an iisreset should clean up everything
     //
-    internal class AsyncLock
+    internal class SystemLock
     {
         private readonly SemaphoreSlim _semaphore;
         private readonly Semaphore _semaphore2;
         private readonly IDisposable _releaser;
         private readonly Task<IDisposable> _releaserTask;
 
-        public AsyncLock()
+        public SystemLock()
             : this (null)
         { }
 
-        public AsyncLock(string name)
+        public SystemLock(string name)
         {
             // WaitOne() waits until count > 0 then decrements count
             // Release() increments count
@@ -67,35 +67,6 @@ namespace Umbraco.Core
                 : new NamedSemaphoreReleaser(_semaphore2);
         }
 
-        //NOTE: We don't use the "Async" part of this lock at all
-        //TODO: Remove this and rename this class something like SystemWideLock, then we can re-instate this logic if we ever need an Async lock again
-
-        //public Task<IDisposable> LockAsync()
-        //{
-        //    var wait = _semaphore != null
-        //        ? _semaphore.WaitAsync()
-        //        : _semaphore2.WaitOneAsync();
-
-        //    return wait.IsCompleted
-        //        ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-        //        : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
-        //            this, CancellationToken.None,
-        //            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        //}
-
-        //public Task<IDisposable> LockAsync(int millisecondsTimeout)
-        //{
-        //    var wait = _semaphore != null
-        //        ? _semaphore.WaitAsync(millisecondsTimeout)
-        //        : _semaphore2.WaitOneAsync(millisecondsTimeout);
-
-        //    return wait.IsCompleted
-        //        ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-        //        : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
-        //            this, CancellationToken.None,
-        //            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        //}
-
         public IDisposable Lock()
         {
             if (_semaphore != null)
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs
index c0b9383b57..aa88f28dc0 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/SafeXmlReaderWriter.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
             return scopeProvider?.Context?.GetEnlisted<SafeXmlReaderWriter>(EnlistKey);
         }
 
-        public static SafeXmlReaderWriter Get(IScopeProvider scopeProvider, AsyncLock xmlLock, XmlDocument xml, Action<XmlDocument> refresh, Action<XmlDocument, bool> apply, bool writer)
+        public static SafeXmlReaderWriter Get(IScopeProvider scopeProvider, SystemLock xmlLock, XmlDocument xml, Action<XmlDocument> refresh, Action<XmlDocument, bool> apply, bool writer)
         {
             var scopeContext = scopeProvider.Context;
 
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
index 3b675c2f07..01f1ce264c 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStore.cs
@@ -305,7 +305,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
 
         private XmlDocument _xmlDocument; // supplied xml document (for tests)
         private volatile XmlDocument _xml; // master xml document
-        private readonly AsyncLock _xmlLock = new AsyncLock(); // protects _xml
+        private readonly SystemLock _xmlLock = new SystemLock(); // protects _xml
 
         // to be used by PublishedContentCache only
         // for non-preview content only
diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
index 145a19872a..56c09b18ac 100644
--- a/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
+++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/XmlStoreFilePersister.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache
         private bool _released;
         private Timer _timer;
         private DateTime _initialTouch;
-        private readonly AsyncLock _runLock = new AsyncLock(); // ensure we run once at a time
+        private readonly SystemLock _runLock = new SystemLock(); // ensure we run once at a time
 
         // note:
         // as long as the runner controls the runs, we know that we run once at a time, but