diff --git a/CodeCargo.NatsDistributedCache.sln b/NatsDistributedCache.sln
similarity index 97%
rename from CodeCargo.NatsDistributedCache.sln
rename to NatsDistributedCache.sln
index 2414c31..c362a22 100644
--- a/CodeCargo.NatsDistributedCache.sln
+++ b/NatsDistributedCache.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCargo.NatsDistributedCache", "src\CodeCargo.NatsDistributedCache\CodeCargo.NatsDistributedCache.csproj", "{6DA43760-9D03-493E-BA97-AB6AF4C6F8BA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NatsDistributedCache", "src\NatsDistributedCache\NatsDistributedCache.csproj", "{6DA43760-9D03-493E-BA97-AB6AF4C6F8BA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0C88DD14-F956-CE84-757C-A364CCF449FC}"
 EndProject
diff --git a/README.md b/README.md
index 4ee6137..b148015 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# CodeCargo.NatsDistributedCache
+# CodeCargo.Nats.DistributedCache
 
 ## Updating Packages
 
@@ -44,4 +44,4 @@ This will generate lock files for:
 These lock files are used automatically based on the runtime identifier specified during build/restore.
 
 **Important**: Always run this script after updating package dependencies to ensure all platform-specific lock files are
-properly regenerated.
\ No newline at end of file
+properly regenerated.
diff --git a/src/CodeCargo.NatsDistributedCache/NatsCache.Log.cs b/src/NatsDistributedCache/NatsCache.Log.cs
similarity index 95%
rename from src/CodeCargo.NatsDistributedCache/NatsCache.Log.cs
rename to src/NatsDistributedCache/NatsCache.Log.cs
index 928964d..e874e32 100644
--- a/src/CodeCargo.NatsDistributedCache/NatsCache.Log.cs
+++ b/src/NatsDistributedCache/NatsCache.Log.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
 
-namespace CodeCargo.NatsDistributedCache;
+namespace CodeCargo.Nats.DistributedCache;
 
 public partial class NatsCache
 {
diff --git a/src/CodeCargo.NatsDistributedCache/NatsCache.cs b/src/NatsDistributedCache/NatsCache.cs
similarity index 99%
rename from src/CodeCargo.NatsDistributedCache/NatsCache.cs
rename to src/NatsDistributedCache/NatsCache.cs
index 8c0f264..dc84cdf 100644
--- a/src/CodeCargo.NatsDistributedCache/NatsCache.cs
+++ b/src/NatsDistributedCache/NatsCache.cs
@@ -8,7 +8,7 @@
 using NATS.Client.KeyValueStore;
 using NATS.Net;
 
-namespace CodeCargo.NatsDistributedCache;
+namespace CodeCargo.Nats.DistributedCache;
 
 /// <summary>
 /// Cache entry for storing in NATS Key-Value Store
diff --git a/src/CodeCargo.NatsDistributedCache/NatsCacheImpl.cs b/src/NatsDistributedCache/NatsCacheImpl.cs
similarity index 96%
rename from src/CodeCargo.NatsDistributedCache/NatsCacheImpl.cs
rename to src/NatsDistributedCache/NatsCacheImpl.cs
index 6c8233a..dfa9371 100644
--- a/src/CodeCargo.NatsDistributedCache/NatsCacheImpl.cs
+++ b/src/NatsDistributedCache/NatsCacheImpl.cs
@@ -4,7 +4,7 @@
 using Microsoft.Extensions.Options;
 using NATS.Client.Core;
 
-namespace CodeCargo.NatsDistributedCache
+namespace CodeCargo.Nats.DistributedCache
 {
     internal sealed class NatsCacheImpl : NatsCache
     {
diff --git a/src/CodeCargo.NatsDistributedCache/NatsCacheOptions.cs b/src/NatsDistributedCache/NatsCacheOptions.cs
similarity index 94%
rename from src/CodeCargo.NatsDistributedCache/NatsCacheOptions.cs
rename to src/NatsDistributedCache/NatsCacheOptions.cs
index a5ed557..0f608ad 100644
--- a/src/CodeCargo.NatsDistributedCache/NatsCacheOptions.cs
+++ b/src/NatsDistributedCache/NatsCacheOptions.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Options;
 
-namespace CodeCargo.NatsDistributedCache
+namespace CodeCargo.Nats.DistributedCache
 {
     /// <summary>
     /// Configuration options for <see cref="NatsCache"/>.
diff --git a/src/CodeCargo.NatsDistributedCache/NatsCacheServiceCollectionExtensions.cs b/src/NatsDistributedCache/NatsCacheServiceCollectionExtensions.cs
similarity index 98%
rename from src/CodeCargo.NatsDistributedCache/NatsCacheServiceCollectionExtensions.cs
rename to src/NatsDistributedCache/NatsCacheServiceCollectionExtensions.cs
index 0b6e299..bb81332 100644
--- a/src/CodeCargo.NatsDistributedCache/NatsCacheServiceCollectionExtensions.cs
+++ b/src/NatsDistributedCache/NatsCacheServiceCollectionExtensions.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Options;
 using NATS.Client.Core;
 
-namespace CodeCargo.NatsDistributedCache
+namespace CodeCargo.Nats.DistributedCache
 {
     /// <summary>
     /// Extension methods for setting up NATS distributed cache related services in an <see cref="IServiceCollection" />.
diff --git a/src/CodeCargo.NatsDistributedCache/CodeCargo.NatsDistributedCache.csproj b/src/NatsDistributedCache/NatsDistributedCache.csproj
similarity index 91%
rename from src/CodeCargo.NatsDistributedCache/CodeCargo.NatsDistributedCache.csproj
rename to src/NatsDistributedCache/NatsDistributedCache.csproj
index 788be57..7f4bd49 100644
--- a/src/CodeCargo.NatsDistributedCache/CodeCargo.NatsDistributedCache.csproj
+++ b/src/NatsDistributedCache/NatsDistributedCache.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <Nullable>enable</Nullable>
-    <RootNamespace>CodeCargo.NatsDistributedCache</RootNamespace>
+    <RootNamespace>CodeCargo.Nats.DistributedCache</RootNamespace>
     <Description>NATS implementation of Microsoft.Extensions.Caching.Distributed.IDistributedCache.</Description>
     <PackageTags>cache;caching;distributed;nats</PackageTags>
   </PropertyGroup>
diff --git a/src/CodeCargo.NatsDistributedCache/NatsHybridCacheSerializer.cs b/src/NatsDistributedCache/NatsHybridCacheSerializer.cs
similarity index 96%
rename from src/CodeCargo.NatsDistributedCache/NatsHybridCacheSerializer.cs
rename to src/NatsDistributedCache/NatsHybridCacheSerializer.cs
index 0bc9010..40fee09 100644
--- a/src/CodeCargo.NatsDistributedCache/NatsHybridCacheSerializer.cs
+++ b/src/NatsDistributedCache/NatsHybridCacheSerializer.cs
@@ -3,7 +3,7 @@
 using Microsoft.Extensions.Caching.Hybrid;
 using NATS.Client.Core;
 
-namespace CodeCargo.NatsDistributedCache;
+namespace CodeCargo.Nats.DistributedCache;
 
 public readonly struct NatsHybridCacheSerializer<T>(INatsSerialize<T> serializer, INatsDeserialize<T> deserializer)
     : IHybridCacheSerializer<T>
diff --git a/src/CodeCargo.NatsDistributedCache/packages.linux-x64.lock.json b/src/NatsDistributedCache/packages.linux-x64.lock.json
similarity index 100%
rename from src/CodeCargo.NatsDistributedCache/packages.linux-x64.lock.json
rename to src/NatsDistributedCache/packages.linux-x64.lock.json
diff --git a/src/CodeCargo.NatsDistributedCache/packages.osx-arm64.lock.json b/src/NatsDistributedCache/packages.osx-arm64.lock.json
similarity index 100%
rename from src/CodeCargo.NatsDistributedCache/packages.osx-arm64.lock.json
rename to src/NatsDistributedCache/packages.osx-arm64.lock.json
diff --git a/src/CodeCargo.NatsDistributedCache/packages.win-x64.lock.json b/src/NatsDistributedCache/packages.win-x64.lock.json
similarity index 100%
rename from src/CodeCargo.NatsDistributedCache/packages.win-x64.lock.json
rename to src/NatsDistributedCache/packages.win-x64.lock.json
diff --git a/test/IntegrationTests/Cache/NatsCacheSetAndRemoveTests.cs b/test/IntegrationTests/Cache/NatsCacheSetAndRemoveTests.cs
index 1b282e0..2bc7afd 100644
--- a/test/IntegrationTests/Cache/NatsCacheSetAndRemoveTests.cs
+++ b/test/IntegrationTests/Cache/NatsCacheSetAndRemoveTests.cs
@@ -1,7 +1,7 @@
 using System.Text;
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace CodeCargo.NatsDistributedCache.IntegrationTests.Cache;
+namespace CodeCargo.Nats.DistributedCache.IntegrationTests.Cache;
 
 public class NatsCacheSetAndRemoveTests(NatsIntegrationFixture fixture) : TestBase(fixture)
 {
diff --git a/test/IntegrationTests/Cache/TimeExpirationAsyncTests.cs b/test/IntegrationTests/Cache/TimeExpirationAsyncTests.cs
index 153d3c2..1453a0c 100644
--- a/test/IntegrationTests/Cache/TimeExpirationAsyncTests.cs
+++ b/test/IntegrationTests/Cache/TimeExpirationAsyncTests.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace CodeCargo.NatsDistributedCache.IntegrationTests.Cache;
+namespace CodeCargo.Nats.DistributedCache.IntegrationTests.Cache;
 
 public class TimeExpirationAsyncTests(NatsIntegrationFixture fixture) : TestBase(fixture)
 {
diff --git a/test/IntegrationTests/Cache/TimeExpirationTests.cs b/test/IntegrationTests/Cache/TimeExpirationTests.cs
index 1765045..faf7154 100644
--- a/test/IntegrationTests/Cache/TimeExpirationTests.cs
+++ b/test/IntegrationTests/Cache/TimeExpirationTests.cs
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace CodeCargo.NatsDistributedCache.IntegrationTests.Cache;
+namespace CodeCargo.Nats.DistributedCache.IntegrationTests.Cache;
 
 public class TimeExpirationTests(NatsIntegrationFixture fixture) : TestBase(fixture)
 {
diff --git a/test/IntegrationTests/IntegrationTests.csproj b/test/IntegrationTests/IntegrationTests.csproj
index d5de05a..0003c5e 100644
--- a/test/IntegrationTests/IntegrationTests.csproj
+++ b/test/IntegrationTests/IntegrationTests.csproj
@@ -5,7 +5,7 @@
     <IsTestProject>true</IsTestProject>
     <RunSettingsFilePath>$(MSBuildProjectDirectory)\..\xunit.runsettings</RunSettingsFilePath>
     <OutputType>Exe</OutputType>
-    <RootNamespace>CodeCargo.NatsDistributedCache.IntegrationTests</RootNamespace>
+    <RootNamespace>CodeCargo.Nats.DistributedCache.IntegrationTests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\TestUtils\TestUtils.csproj" />
-    <ProjectReference Include="..\..\src\CodeCargo.NatsDistributedCache\CodeCargo.NatsDistributedCache.csproj" />
+    <ProjectReference Include="..\..\src\NatsDistributedCache\NatsDistributedCache.csproj" />
     <ProjectReference Include="..\..\util\NatsAppHost\NatsAppHost.csproj" />
   </ItemGroup>
 
diff --git a/test/IntegrationTests/NatsCollection.cs b/test/IntegrationTests/NatsCollection.cs
index 2ff557c..2cd4dc8 100644
--- a/test/IntegrationTests/NatsCollection.cs
+++ b/test/IntegrationTests/NatsCollection.cs
@@ -1,4 +1,4 @@
-namespace CodeCargo.NatsDistributedCache.IntegrationTests;
+namespace CodeCargo.Nats.DistributedCache.IntegrationTests;
 
 [CollectionDefinition(Name)]
 public class NatsCollection : ICollectionFixture<NatsIntegrationFixture>
diff --git a/test/IntegrationTests/NatsIntegrationFixture.cs b/test/IntegrationTests/NatsIntegrationFixture.cs
index b4aaaea..3ac3f33 100644
--- a/test/IntegrationTests/NatsIntegrationFixture.cs
+++ b/test/IntegrationTests/NatsIntegrationFixture.cs
@@ -1,11 +1,11 @@
 using Aspire.Hosting;
-using CodeCargo.NatsDistributedCache.TestUtils;
+using CodeCargo.Nats.DistributedCache.TestUtils;
 using Microsoft.Extensions.Logging;
 using NATS.Client.Core;
 using NATS.Client.KeyValueStore;
 using NATS.Net;
 
-namespace CodeCargo.NatsDistributedCache.IntegrationTests;
+namespace CodeCargo.Nats.DistributedCache.IntegrationTests;
 
 /// <summary>
 /// Test fixture that starts an Aspire-hosted NATS server for integration tests
diff --git a/test/IntegrationTests/TestBase.cs b/test/IntegrationTests/TestBase.cs
index 9d524af..e57d265 100644
--- a/test/IntegrationTests/TestBase.cs
+++ b/test/IntegrationTests/TestBase.cs
@@ -1,12 +1,12 @@
 using System.Runtime.CompilerServices;
-using CodeCargo.NatsDistributedCache.TestUtils.Services.Logging;
+using CodeCargo.Nats.DistributedCache.TestUtils.Services.Logging;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
 using NATS.Client.Core;
 using NATS.Client.JetStream.Models;
 using NATS.Net;
 
-namespace CodeCargo.NatsDistributedCache.IntegrationTests;
+namespace CodeCargo.Nats.DistributedCache.IntegrationTests;
 
 /// <summary>
 /// Base class for NATS integration tests that provides test output logging and fixture access
diff --git a/test/IntegrationTests/packages.linux-x64.lock.json b/test/IntegrationTests/packages.linux-x64.lock.json
index ac4796a..a65d86c 100644
--- a/test/IntegrationTests/packages.linux-x64.lock.json
+++ b/test/IntegrationTests/packages.linux-x64.lock.json
@@ -1052,30 +1052,30 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Options": "[9.0.4, )",
-          "NATS.Client.KeyValueStore": "[2.6.0, )"
-        }
-      },
       "natsapphost": {
         "type": "Project",
         "dependencies": {
           "Aspire.Dashboard.Sdk.linux-x64": "[9.2.1, )",
           "Aspire.Hosting.AppHost": "[9.2.1, )",
           "Aspire.Hosting.Orchestration.linux-x64": "[9.2.1, )",
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )"
+          "NatsDistributedCache": "[1.0.0, )"
+        }
+      },
+      "natsdistributedcache": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Options": "[9.0.4, )",
+          "NATS.Client.KeyValueStore": "[2.6.0, )"
         }
       },
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }
diff --git a/test/IntegrationTests/packages.osx-arm64.lock.json b/test/IntegrationTests/packages.osx-arm64.lock.json
index e536f38..cd80cc3 100644
--- a/test/IntegrationTests/packages.osx-arm64.lock.json
+++ b/test/IntegrationTests/packages.osx-arm64.lock.json
@@ -1052,30 +1052,30 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Options": "[9.0.4, )",
-          "NATS.Client.KeyValueStore": "[2.6.0, )"
-        }
-      },
       "natsapphost": {
         "type": "Project",
         "dependencies": {
           "Aspire.Dashboard.Sdk.osx-arm64": "[9.2.1, )",
           "Aspire.Hosting.AppHost": "[9.2.1, )",
           "Aspire.Hosting.Orchestration.osx-arm64": "[9.2.1, )",
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )"
+          "NatsDistributedCache": "[1.0.0, )"
+        }
+      },
+      "natsdistributedcache": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Options": "[9.0.4, )",
+          "NATS.Client.KeyValueStore": "[2.6.0, )"
         }
       },
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }
diff --git a/test/IntegrationTests/packages.win-x64.lock.json b/test/IntegrationTests/packages.win-x64.lock.json
index b33a4d2..220f5a7 100644
--- a/test/IntegrationTests/packages.win-x64.lock.json
+++ b/test/IntegrationTests/packages.win-x64.lock.json
@@ -1052,30 +1052,30 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Options": "[9.0.4, )",
-          "NATS.Client.KeyValueStore": "[2.6.0, )"
-        }
-      },
       "natsapphost": {
         "type": "Project",
         "dependencies": {
           "Aspire.Dashboard.Sdk.win-x64": "[9.2.1, )",
           "Aspire.Hosting.AppHost": "[9.2.1, )",
           "Aspire.Hosting.Orchestration.win-x64": "[9.2.1, )",
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )"
+          "NatsDistributedCache": "[1.0.0, )"
+        }
+      },
+      "natsdistributedcache": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Options": "[9.0.4, )",
+          "NATS.Client.KeyValueStore": "[2.6.0, )"
         }
       },
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }
diff --git a/test/TestUtils/Assertions/ExceptionAssert.cs b/test/TestUtils/Assertions/ExceptionAssert.cs
index 9910482..56a5123 100644
--- a/test/TestUtils/Assertions/ExceptionAssert.cs
+++ b/test/TestUtils/Assertions/ExceptionAssert.cs
@@ -1,6 +1,6 @@
 using Xunit;
 
-namespace CodeCargo.NatsDistributedCache.TestUtils.Assertions;
+namespace CodeCargo.Nats.DistributedCache.TestUtils.Assertions;
 
 public static class ExceptionAssert
 {
diff --git a/test/TestUtils/NatsTestExtensions.cs b/test/TestUtils/NatsTestExtensions.cs
index 4d3ca3e..46fea13 100644
--- a/test/TestUtils/NatsTestExtensions.cs
+++ b/test/TestUtils/NatsTestExtensions.cs
@@ -2,7 +2,7 @@
 using NATS.Client.Core;
 using NATS.Client.Hosting;
 
-namespace CodeCargo.NatsDistributedCache.TestUtils;
+namespace CodeCargo.Nats.DistributedCache.TestUtils;
 
 public static class NatsTestExtensions
 {
diff --git a/test/TestUtils/Services/Logging/TestOutputLogger.cs b/test/TestUtils/Services/Logging/TestOutputLogger.cs
index de246db..2ffe069 100644
--- a/test/TestUtils/Services/Logging/TestOutputLogger.cs
+++ b/test/TestUtils/Services/Logging/TestOutputLogger.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
 using Xunit;
 
-namespace CodeCargo.NatsDistributedCache.TestUtils.Services.Logging;
+namespace CodeCargo.Nats.DistributedCache.TestUtils.Services.Logging;
 
 /// <summary>
 /// Extension methods for configuring logging in test context
diff --git a/test/TestUtils/TestUtils.csproj b/test/TestUtils/TestUtils.csproj
index e8d24a0..4af9535 100644
--- a/test/TestUtils/TestUtils.csproj
+++ b/test/TestUtils/TestUtils.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <RootNamespace>CodeCargo.NatsDistributedCache.TestUtils</RootNamespace>
+    <RootNamespace>CodeCargo.Nats.DistributedCache.TestUtils</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\CodeCargo.NatsDistributedCache\CodeCargo.NatsDistributedCache.csproj" />
+    <ProjectReference Include="..\..\src\NatsDistributedCache\NatsDistributedCache.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/TestUtils/packages.linux-x64.lock.json b/test/TestUtils/packages.linux-x64.lock.json
index 7a26040..52157d7 100644
--- a/test/TestUtils/packages.linux-x64.lock.json
+++ b/test/TestUtils/packages.linux-x64.lock.json
@@ -237,7 +237,7 @@
           "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
         }
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
diff --git a/test/TestUtils/packages.osx-arm64.lock.json b/test/TestUtils/packages.osx-arm64.lock.json
index 7a26040..52157d7 100644
--- a/test/TestUtils/packages.osx-arm64.lock.json
+++ b/test/TestUtils/packages.osx-arm64.lock.json
@@ -237,7 +237,7 @@
           "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
         }
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
diff --git a/test/TestUtils/packages.win-x64.lock.json b/test/TestUtils/packages.win-x64.lock.json
index 7a26040..52157d7 100644
--- a/test/TestUtils/packages.win-x64.lock.json
+++ b/test/TestUtils/packages.win-x64.lock.json
@@ -237,7 +237,7 @@
           "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
         }
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
diff --git a/test/UnitTests/Cache/TimeExpirationAsyncUnitTests.cs b/test/UnitTests/Cache/TimeExpirationAsyncUnitTests.cs
index 1875731..2285175 100644
--- a/test/UnitTests/Cache/TimeExpirationAsyncUnitTests.cs
+++ b/test/UnitTests/Cache/TimeExpirationAsyncUnitTests.cs
@@ -1,7 +1,7 @@
-using CodeCargo.NatsDistributedCache.TestUtils.Assertions;
+using CodeCargo.Nats.DistributedCache.TestUtils.Assertions;
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace CodeCargo.NatsDistributedCache.UnitTests.Cache;
+namespace CodeCargo.Nats.DistributedCache.UnitTests.Cache;
 
 public class TimeExpirationAsyncUnitTests : TestBase
 {
diff --git a/test/UnitTests/Cache/TimeExpirationUnitTests.cs b/test/UnitTests/Cache/TimeExpirationUnitTests.cs
index d2a5f64..689be07 100644
--- a/test/UnitTests/Cache/TimeExpirationUnitTests.cs
+++ b/test/UnitTests/Cache/TimeExpirationUnitTests.cs
@@ -1,7 +1,7 @@
-using CodeCargo.NatsDistributedCache.TestUtils.Assertions;
+using CodeCargo.Nats.DistributedCache.TestUtils.Assertions;
 using Microsoft.Extensions.Caching.Distributed;
 
-namespace CodeCargo.NatsDistributedCache.UnitTests.Cache;
+namespace CodeCargo.Nats.DistributedCache.UnitTests.Cache;
 
 public class TimeExpirationUnitTests : TestBase
 {
diff --git a/test/UnitTests/Extensions/CacheServiceExtensionsTests.cs b/test/UnitTests/Extensions/CacheServiceExtensionsTests.cs
index ea86376..c0a0f6e 100644
--- a/test/UnitTests/Extensions/CacheServiceExtensionsTests.cs
+++ b/test/UnitTests/Extensions/CacheServiceExtensionsTests.cs
@@ -4,7 +4,7 @@
 using Moq;
 using NATS.Client.Core;
 
-namespace CodeCargo.NatsDistributedCache.UnitTests.Extensions;
+namespace CodeCargo.Nats.DistributedCache.UnitTests.Extensions;
 
 public class CacheServiceExtensionsUnitTests
 {
diff --git a/test/UnitTests/Serialization/NatsHybridCacheSerializerFactoryTests.cs b/test/UnitTests/Serialization/NatsHybridCacheSerializerFactoryTests.cs
index b63b3b1..c0fb89a 100644
--- a/test/UnitTests/Serialization/NatsHybridCacheSerializerFactoryTests.cs
+++ b/test/UnitTests/Serialization/NatsHybridCacheSerializerFactoryTests.cs
@@ -4,7 +4,7 @@
 using NATS.Client.Core;
 using NATS.Net;
 
-namespace CodeCargo.NatsDistributedCache.UnitTests.Serialization;
+namespace CodeCargo.Nats.DistributedCache.UnitTests.Serialization;
 
 /// <summary>
 /// Tests for the NatsHybridCacheSerializerFactory
diff --git a/test/UnitTests/TestBase.cs b/test/UnitTests/TestBase.cs
index 764fd3b..99dc103 100644
--- a/test/UnitTests/TestBase.cs
+++ b/test/UnitTests/TestBase.cs
@@ -5,7 +5,7 @@
 using Moq;
 using NATS.Client.Core;
 
-namespace CodeCargo.NatsDistributedCache.UnitTests;
+namespace CodeCargo.Nats.DistributedCache.UnitTests;
 
 public abstract class TestBase
 {
diff --git a/test/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj
index 266025e..9fe12ec 100644
--- a/test/UnitTests/UnitTests.csproj
+++ b/test/UnitTests/UnitTests.csproj
@@ -5,7 +5,7 @@
     <IsTestProject>true</IsTestProject>
     <RunSettingsFilePath>$(MSBuildProjectDirectory)\..\xunit.runsettings</RunSettingsFilePath>
     <OutputType>Exe</OutputType>
-    <RootNamespace>CodeCargo.NatsDistributedCache.UnitTests</RootNamespace>
+    <RootNamespace>CodeCargo.Nats.DistributedCache.UnitTests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\CodeCargo.NatsDistributedCache\CodeCargo.NatsDistributedCache.csproj" />
+    <ProjectReference Include="..\..\src\NatsDistributedCache\NatsDistributedCache.csproj" />
     <ProjectReference Include="..\TestUtils\TestUtils.csproj" />
   </ItemGroup>
 
diff --git a/test/UnitTests/packages.linux-x64.lock.json b/test/UnitTests/packages.linux-x64.lock.json
index c5e6908..ca0522a 100644
--- a/test/UnitTests/packages.linux-x64.lock.json
+++ b/test/UnitTests/packages.linux-x64.lock.json
@@ -369,7 +369,7 @@
           "xunit.v3.runner.common": "[2.0.2]"
         }
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
@@ -381,9 +381,9 @@
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }
diff --git a/test/UnitTests/packages.osx-arm64.lock.json b/test/UnitTests/packages.osx-arm64.lock.json
index c5e6908..ca0522a 100644
--- a/test/UnitTests/packages.osx-arm64.lock.json
+++ b/test/UnitTests/packages.osx-arm64.lock.json
@@ -369,7 +369,7 @@
           "xunit.v3.runner.common": "[2.0.2]"
         }
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
@@ -381,9 +381,9 @@
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }
diff --git a/test/UnitTests/packages.win-x64.lock.json b/test/UnitTests/packages.win-x64.lock.json
index c5e6908..ca0522a 100644
--- a/test/UnitTests/packages.win-x64.lock.json
+++ b/test/UnitTests/packages.win-x64.lock.json
@@ -369,7 +369,7 @@
           "xunit.v3.runner.common": "[2.0.2]"
         }
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
@@ -381,9 +381,9 @@
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }
diff --git a/util/NatsAppHost/NatsAppHost.csproj b/util/NatsAppHost/NatsAppHost.csproj
index 0ae9fc0..c22a63e 100644
--- a/util/NatsAppHost/NatsAppHost.csproj
+++ b/util/NatsAppHost/NatsAppHost.csproj
@@ -5,11 +5,11 @@
   <PropertyGroup>
     <IsAspireHost>true</IsAspireHost>
     <OutputType>Exe</OutputType>
-    <RootNamespace>CodeCargo.NatsDistributedCache.NatsAppHost</RootNamespace>
+    <RootNamespace>CodeCargo.Nats.DistributedCache.NatsAppHost</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\CodeCargo.NatsDistributedCache\CodeCargo.NatsDistributedCache.csproj" IsAspireProjectResource="false" />
+    <ProjectReference Include="..\..\src\NatsDistributedCache\NatsDistributedCache.csproj" IsAspireProjectResource="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/util/NatsAppHost/Program.cs b/util/NatsAppHost/Program.cs
index 17cf269..30ed1d7 100644
--- a/util/NatsAppHost/Program.cs
+++ b/util/NatsAppHost/Program.cs
@@ -5,10 +5,10 @@
 
 // Find the solution directory
 var slnDir = Assembly.GetExecutingAssembly().Location;
-while (!File.Exists(Path.Combine(slnDir, "CodeCargo.NatsDistributedCache.sln")))
+while (!File.Exists(Path.Combine(slnDir, "NatsDistributedCache.sln")))
 {
     slnDir = Path.GetDirectoryName(slnDir) ??
-             throw new ArgumentException("Could not find CodeCargo.NatsDistributedCache.sln in any parent directory");
+             throw new ArgumentException("Could not find NatsDistributedCache.sln in any parent directory");
 }
 
 // Get path to NATS config directory
diff --git a/util/NatsAppHost/packages.linux-x64.lock.json b/util/NatsAppHost/packages.linux-x64.lock.json
index 2d38308..d6599d0 100644
--- a/util/NatsAppHost/packages.linux-x64.lock.json
+++ b/util/NatsAppHost/packages.linux-x64.lock.json
@@ -711,7 +711,7 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
diff --git a/util/NatsAppHost/packages.osx-arm64.lock.json b/util/NatsAppHost/packages.osx-arm64.lock.json
index 3d56d8f..13463fe 100644
--- a/util/NatsAppHost/packages.osx-arm64.lock.json
+++ b/util/NatsAppHost/packages.osx-arm64.lock.json
@@ -711,7 +711,7 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
diff --git a/util/NatsAppHost/packages.win-x64.lock.json b/util/NatsAppHost/packages.win-x64.lock.json
index b6bd3e7..5730200 100644
--- a/util/NatsAppHost/packages.win-x64.lock.json
+++ b/util/NatsAppHost/packages.win-x64.lock.json
@@ -711,7 +711,7 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
+      "natsdistributedcache": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
diff --git a/util/PerfTest/PerfTest.cs b/util/PerfTest/PerfTest.cs
index 4439973..478c8db 100644
--- a/util/PerfTest/PerfTest.cs
+++ b/util/PerfTest/PerfTest.cs
@@ -1,7 +1,7 @@
 using System.Collections.Concurrent;
 using NATS.Client.Core;
 
-namespace CodeCargo.NatsDistributedCache.PerfTest;
+namespace CodeCargo.Nats.DistributedCache.PerfTest;
 
 public class PerfTest
 {
diff --git a/util/PerfTest/PerfTest.csproj b/util/PerfTest/PerfTest.csproj
index e3d6ad7..2a2e423 100644
--- a/util/PerfTest/PerfTest.csproj
+++ b/util/PerfTest/PerfTest.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
-    <RootNamespace>CodeCargo.NatsDistributedCache.PerfTest</RootNamespace>
+    <RootNamespace>CodeCargo.Nats.DistributedCache.PerfTest</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/util/PerfTest/Program.cs b/util/PerfTest/Program.cs
index 28b5643..4e54053 100644
--- a/util/PerfTest/Program.cs
+++ b/util/PerfTest/Program.cs
@@ -1,7 +1,7 @@
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Testing;
-using CodeCargo.NatsDistributedCache.PerfTest;
-using CodeCargo.NatsDistributedCache.TestUtils;
+using CodeCargo.Nats.DistributedCache.PerfTest;
+using CodeCargo.Nats.DistributedCache.TestUtils;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using NATS.Client.Core;
diff --git a/util/PerfTest/packages.linux-x64.lock.json b/util/PerfTest/packages.linux-x64.lock.json
index 92eb4d9..9315996 100644
--- a/util/PerfTest/packages.linux-x64.lock.json
+++ b/util/PerfTest/packages.linux-x64.lock.json
@@ -944,30 +944,30 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Options": "[9.0.4, )",
-          "NATS.Client.KeyValueStore": "[2.6.0, )"
-        }
-      },
       "natsapphost": {
         "type": "Project",
         "dependencies": {
           "Aspire.Dashboard.Sdk.linux-x64": "[9.2.1, )",
           "Aspire.Hosting.AppHost": "[9.2.1, )",
           "Aspire.Hosting.Orchestration.linux-x64": "[9.2.1, )",
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )"
+          "NatsDistributedCache": "[1.0.0, )"
+        }
+      },
+      "natsdistributedcache": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Options": "[9.0.4, )",
+          "NATS.Client.KeyValueStore": "[2.6.0, )"
         }
       },
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }
diff --git a/util/PerfTest/packages.osx-arm64.lock.json b/util/PerfTest/packages.osx-arm64.lock.json
index ef89a8b..b3330df 100644
--- a/util/PerfTest/packages.osx-arm64.lock.json
+++ b/util/PerfTest/packages.osx-arm64.lock.json
@@ -944,30 +944,30 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Options": "[9.0.4, )",
-          "NATS.Client.KeyValueStore": "[2.6.0, )"
-        }
-      },
       "natsapphost": {
         "type": "Project",
         "dependencies": {
           "Aspire.Dashboard.Sdk.osx-arm64": "[9.2.1, )",
           "Aspire.Hosting.AppHost": "[9.2.1, )",
           "Aspire.Hosting.Orchestration.osx-arm64": "[9.2.1, )",
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )"
+          "NatsDistributedCache": "[1.0.0, )"
+        }
+      },
+      "natsdistributedcache": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Options": "[9.0.4, )",
+          "NATS.Client.KeyValueStore": "[2.6.0, )"
         }
       },
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }
diff --git a/util/PerfTest/packages.win-x64.lock.json b/util/PerfTest/packages.win-x64.lock.json
index a5570e6..b8ae234 100644
--- a/util/PerfTest/packages.win-x64.lock.json
+++ b/util/PerfTest/packages.win-x64.lock.json
@@ -944,30 +944,30 @@
         "resolved": "16.3.0",
         "contentHash": "SgMOdxbz8X65z8hraIs6hOEdnkH6hESTAIUa7viEngHOYaH+6q5XJmwr1+yb9vJpNQ19hCQY69xbFsLtXpobQA=="
       },
-      "codecargo.natsdistributedcache": {
-        "type": "Project",
-        "dependencies": {
-          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
-          "Microsoft.Extensions.Options": "[9.0.4, )",
-          "NATS.Client.KeyValueStore": "[2.6.0, )"
-        }
-      },
       "natsapphost": {
         "type": "Project",
         "dependencies": {
           "Aspire.Dashboard.Sdk.win-x64": "[9.2.1, )",
           "Aspire.Hosting.AppHost": "[9.2.1, )",
           "Aspire.Hosting.Orchestration.win-x64": "[9.2.1, )",
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )"
+          "NatsDistributedCache": "[1.0.0, )"
+        }
+      },
+      "natsdistributedcache": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Caching.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Logging.Abstractions": "[9.0.4, )",
+          "Microsoft.Extensions.Options": "[9.0.4, )",
+          "NATS.Client.KeyValueStore": "[2.6.0, )"
         }
       },
       "testutils": {
         "type": "Project",
         "dependencies": {
-          "CodeCargo.NatsDistributedCache": "[1.0.0, )",
           "Microsoft.Extensions.Logging": "[9.0.4, )",
           "NATS.Net": "[2.6.0, )",
+          "NatsDistributedCache": "[1.0.0, )",
           "xunit.v3.assert": "[2.0.2, )",
           "xunit.v3.extensibility.core": "[2.0.2, )"
         }