diff --git a/BitFaster.Caching.UnitTests/Synchronized/AsyncAtomicFactoryTests.cs b/BitFaster.Caching.UnitTests/Atomic/AsyncAtomicFactoryTests.cs
similarity index 97%
rename from BitFaster.Caching.UnitTests/Synchronized/AsyncAtomicFactoryTests.cs
rename to BitFaster.Caching.UnitTests/Atomic/AsyncAtomicFactoryTests.cs
index e2885f34..321104b2 100644
--- a/BitFaster.Caching.UnitTests/Synchronized/AsyncAtomicFactoryTests.cs
+++ b/BitFaster.Caching.UnitTests/Atomic/AsyncAtomicFactoryTests.cs
@@ -4,11 +4,11 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
-namespace BitFaster.Caching.UnitTests.Synchronized
+namespace BitFaster.Caching.UnitTests.Atomic
 {
     public class AsyncAtomicFactoryTests
     {
diff --git a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryAsyncCacheTests.cs b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryAsyncCacheTests.cs
similarity index 98%
rename from BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryAsyncCacheTests.cs
rename to BitFaster.Caching.UnitTests/Atomic/AtomicFactoryAsyncCacheTests.cs
index 152b19d4..bd55a1e6 100644
--- a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryAsyncCacheTests.cs
+++ b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryAsyncCacheTests.cs
@@ -5,11 +5,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using BitFaster.Caching.Lru;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
-namespace BitFaster.Caching.UnitTests.Synchronized
+namespace BitFaster.Caching.UnitTests.Atomic
 {
     public class AtomicFactoryAsyncCacheTests
     {
diff --git a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryCacheTests.cs b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryCacheTests.cs
similarity index 98%
rename from BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryCacheTests.cs
rename to BitFaster.Caching.UnitTests/Atomic/AtomicFactoryCacheTests.cs
index 10dc7611..18605a76 100644
--- a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryCacheTests.cs
+++ b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryCacheTests.cs
@@ -5,11 +5,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using BitFaster.Caching.Lru;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
-namespace BitFaster.Caching.UnitTests.Synchronized
+namespace BitFaster.Caching.UnitTests.Atomic
 {
     public class AtomicFactoryCacheTests
     {
diff --git a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryScopedAsyncCacheTests.cs b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryScopedAsyncCacheTests.cs
similarity index 95%
rename from BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryScopedAsyncCacheTests.cs
rename to BitFaster.Caching.UnitTests/Atomic/AtomicFactoryScopedAsyncCacheTests.cs
index 0f28af16..d616cb78 100644
--- a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryScopedAsyncCacheTests.cs
+++ b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryScopedAsyncCacheTests.cs
@@ -4,11 +4,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using BitFaster.Caching.Lru;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
-namespace BitFaster.Caching.UnitTests.Synchronized
+namespace BitFaster.Caching.UnitTests.Atomic
 {
     public class AtomicFactoryScopedAsyncCacheTests : ScopedAsyncCacheTestBase
     {
diff --git a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryScopedCacheTests.cs b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryScopedCacheTests.cs
similarity index 94%
rename from BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryScopedCacheTests.cs
rename to BitFaster.Caching.UnitTests/Atomic/AtomicFactoryScopedCacheTests.cs
index f56d5896..eb14cf2f 100644
--- a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryScopedCacheTests.cs
+++ b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryScopedCacheTests.cs
@@ -4,11 +4,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using BitFaster.Caching.Lru;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
-namespace BitFaster.Caching.UnitTests.Synchronized
+namespace BitFaster.Caching.UnitTests.Atomic
 {
     public class AtomicFactoryScopedCacheTests : ScopedCacheTestBase
     {
diff --git a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryTests.cs b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryTests.cs
similarity index 96%
rename from BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryTests.cs
rename to BitFaster.Caching.UnitTests/Atomic/AtomicFactoryTests.cs
index 01a536f5..e2fab5af 100644
--- a/BitFaster.Caching.UnitTests/Synchronized/AtomicFactoryTests.cs
+++ b/BitFaster.Caching.UnitTests/Atomic/AtomicFactoryTests.cs
@@ -4,11 +4,11 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
-namespace BitFaster.Caching.UnitTests.Synchronized
+namespace BitFaster.Caching.UnitTests.Atomic
 {
     public class AtomicFactoryTests
     {
diff --git a/BitFaster.Caching.UnitTests/Synchronized/ScopedAsyncAtomicFactoryTests.cs b/BitFaster.Caching.UnitTests/Atomic/ScopedAsyncAtomicFactoryTests.cs
similarity index 98%
rename from BitFaster.Caching.UnitTests/Synchronized/ScopedAsyncAtomicFactoryTests.cs
rename to BitFaster.Caching.UnitTests/Atomic/ScopedAsyncAtomicFactoryTests.cs
index f7b3833d..20cc83da 100644
--- a/BitFaster.Caching.UnitTests/Synchronized/ScopedAsyncAtomicFactoryTests.cs
+++ b/BitFaster.Caching.UnitTests/Atomic/ScopedAsyncAtomicFactoryTests.cs
@@ -4,11 +4,11 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
-namespace BitFaster.Caching.UnitTests.Synchronized
+namespace BitFaster.Caching.UnitTests.Atomic
 {
     public class ScopedAsyncAtomicFactoryTests
     {
diff --git a/BitFaster.Caching.UnitTests/Synchronized/ScopedAtomicFactoryTests.cs b/BitFaster.Caching.UnitTests/Atomic/ScopedAtomicFactoryTests.cs
similarity index 98%
rename from BitFaster.Caching.UnitTests/Synchronized/ScopedAtomicFactoryTests.cs
rename to BitFaster.Caching.UnitTests/Atomic/ScopedAtomicFactoryTests.cs
index 89f9a323..e52dcc79 100644
--- a/BitFaster.Caching.UnitTests/Synchronized/ScopedAtomicFactoryTests.cs
+++ b/BitFaster.Caching.UnitTests/Atomic/ScopedAtomicFactoryTests.cs
@@ -3,11 +3,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
-namespace BitFaster.Caching.UnitTests.Synchronized
+namespace BitFaster.Caching.UnitTests.Atomic
 {
     public class ScopedAtomicFactoryTests
     {
diff --git a/BitFaster.Caching.UnitTests/CacheEventProxyBaseTests.cs b/BitFaster.Caching.UnitTests/CacheEventProxyBaseTests.cs
index 1c80c2aa..f9c1470e 100644
--- a/BitFaster.Caching.UnitTests/CacheEventProxyBaseTests.cs
+++ b/BitFaster.Caching.UnitTests/CacheEventProxyBaseTests.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
diff --git a/BitFaster.Caching.UnitTests/Lru/ConcurrentLruBuilderTests.cs b/BitFaster.Caching.UnitTests/Lru/ConcurrentLruBuilderTests.cs
index c8920345..08da6616 100644
--- a/BitFaster.Caching.UnitTests/Lru/ConcurrentLruBuilderTests.cs
+++ b/BitFaster.Caching.UnitTests/Lru/ConcurrentLruBuilderTests.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using BitFaster.Caching.Lru;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 using FluentAssertions;
 using Xunit;
 
diff --git a/BitFaster.Caching/Synchronized/AsyncAtomicFactory.cs b/BitFaster.Caching/Atomic/AsyncAtomicFactory.cs
similarity index 98%
rename from BitFaster.Caching/Synchronized/AsyncAtomicFactory.cs
rename to BitFaster.Caching/Atomic/AsyncAtomicFactory.cs
index 0c33122f..9e12800c 100644
--- a/BitFaster.Caching/Synchronized/AsyncAtomicFactory.cs
+++ b/BitFaster.Caching/Atomic/AsyncAtomicFactory.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Synchronized
+namespace BitFaster.Caching.Atomic
 {
     [DebuggerDisplay("IsValueCreated={IsValueCreated}, Value={ValueIfCreated}")]
     public sealed class AsyncAtomicFactory<K, V>
diff --git a/BitFaster.Caching/Synchronized/AtomicFactory.cs b/BitFaster.Caching/Atomic/AtomicFactory.cs
similarity index 98%
rename from BitFaster.Caching/Synchronized/AtomicFactory.cs
rename to BitFaster.Caching/Atomic/AtomicFactory.cs
index 4cb22d6c..e153cd00 100644
--- a/BitFaster.Caching/Synchronized/AtomicFactory.cs
+++ b/BitFaster.Caching/Atomic/AtomicFactory.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Synchronized
+namespace BitFaster.Caching.Atomic
 {
     [DebuggerDisplay("IsValueCreated={IsValueCreated}, Value={ValueIfCreated}")]
     public sealed class AtomicFactory<K, V>
diff --git a/BitFaster.Caching/Synchronized/AtomicFactoryAsyncCache.cs b/BitFaster.Caching/Atomic/AtomicFactoryAsyncCache.cs
similarity index 98%
rename from BitFaster.Caching/Synchronized/AtomicFactoryAsyncCache.cs
rename to BitFaster.Caching/Atomic/AtomicFactoryAsyncCache.cs
index 1c8d0cd3..f93bbfbb 100644
--- a/BitFaster.Caching/Synchronized/AtomicFactoryAsyncCache.cs
+++ b/BitFaster.Caching/Atomic/AtomicFactoryAsyncCache.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Synchronized
+namespace BitFaster.Caching.Atomic
 {
     public sealed class AtomicFactoryAsyncCache<K, V> : IAsyncCache<K, V>
     {
diff --git a/BitFaster.Caching/Synchronized/AtomicFactoryCache.cs b/BitFaster.Caching/Atomic/AtomicFactoryCache.cs
similarity index 98%
rename from BitFaster.Caching/Synchronized/AtomicFactoryCache.cs
rename to BitFaster.Caching/Atomic/AtomicFactoryCache.cs
index 1883dd6b..54c1639d 100644
--- a/BitFaster.Caching/Synchronized/AtomicFactoryCache.cs
+++ b/BitFaster.Caching/Atomic/AtomicFactoryCache.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Synchronized
+namespace BitFaster.Caching.Atomic
 {
     public sealed class AtomicFactoryCache<K, V> : ICache<K, V>
     {
diff --git a/BitFaster.Caching/Synchronized/AtomicFactoryScopedAsyncCache.cs b/BitFaster.Caching/Atomic/AtomicFactoryScopedAsyncCache.cs
similarity index 98%
rename from BitFaster.Caching/Synchronized/AtomicFactoryScopedAsyncCache.cs
rename to BitFaster.Caching/Atomic/AtomicFactoryScopedAsyncCache.cs
index ffc802ce..605bdc72 100644
--- a/BitFaster.Caching/Synchronized/AtomicFactoryScopedAsyncCache.cs
+++ b/BitFaster.Caching/Atomic/AtomicFactoryScopedAsyncCache.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Synchronized
+namespace BitFaster.Caching.Atomic
 {
     public sealed class AtomicFactoryScopedAsyncCache<K, V> : IScopedAsyncCache<K, V> where V : IDisposable
     {
diff --git a/BitFaster.Caching/Synchronized/AtomicFactoryScopedCache.cs b/BitFaster.Caching/Atomic/AtomicFactoryScopedCache.cs
similarity index 98%
rename from BitFaster.Caching/Synchronized/AtomicFactoryScopedCache.cs
rename to BitFaster.Caching/Atomic/AtomicFactoryScopedCache.cs
index 309cf56f..ad5c87c8 100644
--- a/BitFaster.Caching/Synchronized/AtomicFactoryScopedCache.cs
+++ b/BitFaster.Caching/Atomic/AtomicFactoryScopedCache.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Synchronized
+namespace BitFaster.Caching.Atomic
 {
     public sealed class AtomicFactoryScopedCache<K, V> : IScopedCache<K, V> where V : IDisposable
     {
diff --git a/BitFaster.Caching/Synchronized/ScopedAsyncAtomicFactory.cs b/BitFaster.Caching/Atomic/ScopedAsyncAtomicFactory.cs
similarity index 99%
rename from BitFaster.Caching/Synchronized/ScopedAsyncAtomicFactory.cs
rename to BitFaster.Caching/Atomic/ScopedAsyncAtomicFactory.cs
index 2355b30f..41a7647a 100644
--- a/BitFaster.Caching/Synchronized/ScopedAsyncAtomicFactory.cs
+++ b/BitFaster.Caching/Atomic/ScopedAsyncAtomicFactory.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Synchronized
+namespace BitFaster.Caching.Atomic
 {
     public sealed class ScopedAsyncAtomicFactory<K, V> : IScoped<V>, IDisposable where V : IDisposable
     {
diff --git a/BitFaster.Caching/Synchronized/ScopedAtomicFactory.cs b/BitFaster.Caching/Atomic/ScopedAtomicFactory.cs
similarity index 98%
rename from BitFaster.Caching/Synchronized/ScopedAtomicFactory.cs
rename to BitFaster.Caching/Atomic/ScopedAtomicFactory.cs
index 81cf8f91..916ad92f 100644
--- a/BitFaster.Caching/Synchronized/ScopedAtomicFactory.cs
+++ b/BitFaster.Caching/Atomic/ScopedAtomicFactory.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BitFaster.Caching.Synchronized
+namespace BitFaster.Caching.Atomic
 {
     // Requirements:
     // 1. Exactly once disposal.
diff --git a/BitFaster.Caching/Lru/Builder/AtomicAsyncConcurrentLruBuilder.cs b/BitFaster.Caching/Lru/Builder/AtomicAsyncConcurrentLruBuilder.cs
index 601400e3..9a97e3e7 100644
--- a/BitFaster.Caching/Lru/Builder/AtomicAsyncConcurrentLruBuilder.cs
+++ b/BitFaster.Caching/Lru/Builder/AtomicAsyncConcurrentLruBuilder.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 
 namespace BitFaster.Caching.Lru.Builder
 {
diff --git a/BitFaster.Caching/Lru/Builder/AtomicConcurrentLruBuilder.cs b/BitFaster.Caching/Lru/Builder/AtomicConcurrentLruBuilder.cs
index e1b1050e..703e0899 100644
--- a/BitFaster.Caching/Lru/Builder/AtomicConcurrentLruBuilder.cs
+++ b/BitFaster.Caching/Lru/Builder/AtomicConcurrentLruBuilder.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 
 namespace BitFaster.Caching.Lru.Builder
 {
diff --git a/BitFaster.Caching/Lru/Builder/AtomicScopedAsyncConcurrentLruBuilder.cs b/BitFaster.Caching/Lru/Builder/AtomicScopedAsyncConcurrentLruBuilder.cs
index 316792df..f545ce54 100644
--- a/BitFaster.Caching/Lru/Builder/AtomicScopedAsyncConcurrentLruBuilder.cs
+++ b/BitFaster.Caching/Lru/Builder/AtomicScopedAsyncConcurrentLruBuilder.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 
 namespace BitFaster.Caching.Lru.Builder
 {
diff --git a/BitFaster.Caching/Lru/Builder/AtomicScopedConcurrentLruBuilder.cs b/BitFaster.Caching/Lru/Builder/AtomicScopedConcurrentLruBuilder.cs
index dd89bbc4..6a33b094 100644
--- a/BitFaster.Caching/Lru/Builder/AtomicScopedConcurrentLruBuilder.cs
+++ b/BitFaster.Caching/Lru/Builder/AtomicScopedConcurrentLruBuilder.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 
 namespace BitFaster.Caching.Lru.Builder
 {
diff --git a/BitFaster.Caching/Lru/Builder/ScopedConcurrentLruBuilder.cs b/BitFaster.Caching/Lru/Builder/ScopedConcurrentLruBuilder.cs
index c0fe8167..ddd0e4cb 100644
--- a/BitFaster.Caching/Lru/Builder/ScopedConcurrentLruBuilder.cs
+++ b/BitFaster.Caching/Lru/Builder/ScopedConcurrentLruBuilder.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 
 namespace BitFaster.Caching.Lru.Builder
 {
diff --git a/BitFaster.Caching/Lru/ConcurrentLruBuilderExtensions.cs b/BitFaster.Caching/Lru/ConcurrentLruBuilderExtensions.cs
index a123050c..fb6b4e70 100644
--- a/BitFaster.Caching/Lru/ConcurrentLruBuilderExtensions.cs
+++ b/BitFaster.Caching/Lru/ConcurrentLruBuilderExtensions.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using BitFaster.Caching.Lru.Builder;
-using BitFaster.Caching.Synchronized;
+using BitFaster.Caching.Atomic;
 
 namespace BitFaster.Caching.Lru
 {