diff --git a/Client/Client.csproj b/Client/Client.csproj
index 45633c4..2c7b60f 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Provider\Provider.csproj" />
+    <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Client/Program.cs b/Client/Program.cs
index 1b6a20f..15ad374 100644
--- a/Client/Program.cs
+++ b/Client/Program.cs
@@ -2,9 +2,8 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Orleans.Configuration;
-using Orleans.Runtime;
-using Provider;
 using StackExchange.Redis;
+using Universley.OrleansContrib.StreamsProvider.Redis;
 
 using IHost host = new HostBuilder()
      .UseOrleansClient(clientBuilder =>
diff --git a/Provider/RedisStreamAdapter.cs b/Provider/RedisStreamAdapter.cs
index bdcd29f..87a70e5 100644
--- a/Provider/RedisStreamAdapter.cs
+++ b/Provider/RedisStreamAdapter.cs
@@ -1,10 +1,9 @@
 using Microsoft.Extensions.Logging;
-using Orleans.Runtime;
 using Orleans.Streams;
 using StackExchange.Redis;
 using System.Text.Json;
 
-namespace Provider
+namespace Universley.OrleansContrib.StreamsProvider.Redis
 {
     public class RedisStreamAdapter : IQueueAdapter
     {
diff --git a/Provider/RedisStreamBatchContainer.cs b/Provider/RedisStreamBatchContainer.cs
index c799067..1da1f52 100644
--- a/Provider/RedisStreamBatchContainer.cs
+++ b/Provider/RedisStreamBatchContainer.cs
@@ -1,9 +1,8 @@
-using Orleans.Runtime;
-using Orleans.Streams;
+using Orleans.Streams;
 using StackExchange.Redis;
 using System.Text.Json;
 
-namespace Provider
+namespace Universley.OrleansContrib.StreamsProvider.Redis
 {
     public class RedisStreamBatchContainer : IBatchContainer
     {
diff --git a/Provider/RedisStreamFactory.cs b/Provider/RedisStreamFactory.cs
index 1daae03..a705675 100644
--- a/Provider/RedisStreamFactory.cs
+++ b/Provider/RedisStreamFactory.cs
@@ -5,7 +5,7 @@ using Orleans.Providers.Streams.Common;
 using Orleans.Streams;
 using StackExchange.Redis;
 
-namespace Provider
+namespace Universley.OrleansContrib.StreamsProvider.Redis
 {
     public class RedisStreamFactory : IQueueAdapterFactory
     {
diff --git a/Provider/RedisStreamFailureHandler.cs b/Provider/RedisStreamFailureHandler.cs
index 0cf0790..600b0ae 100644
--- a/Provider/RedisStreamFailureHandler.cs
+++ b/Provider/RedisStreamFailureHandler.cs
@@ -1,8 +1,7 @@
 using Microsoft.Extensions.Logging;
-using Orleans.Runtime;
 using Orleans.Streams;
 
-namespace Provider
+namespace Universley.OrleansContrib.StreamsProvider.Redis
 {
     public class RedisStreamFailureHandler : IStreamFailureHandler
     {
diff --git a/Provider/RedisStreamReceiver.cs b/Provider/RedisStreamReceiver.cs
index fb2ddf2..a6928d7 100644
--- a/Provider/RedisStreamReceiver.cs
+++ b/Provider/RedisStreamReceiver.cs
@@ -3,7 +3,7 @@ using Orleans.Streams;
 using StackExchange.Redis;
 
 
-namespace Provider
+namespace Universley.OrleansContrib.StreamsProvider.Redis
 {
     public class RedisStreamReceiver : IQueueAdapterReceiver
     {
diff --git a/Provider/RedisStreamSequenceToken.cs b/Provider/RedisStreamSequenceToken.cs
index cd2fcc5..e32c34e 100644
--- a/Provider/RedisStreamSequenceToken.cs
+++ b/Provider/RedisStreamSequenceToken.cs
@@ -1,7 +1,7 @@
 using Orleans.Streams;
 using StackExchange.Redis;
 
-namespace Provider
+namespace Universley.OrleansContrib.StreamsProvider.Redis
 {
     [GenerateSerializer]
     public class RedisStreamSequenceToken : StreamSequenceToken
diff --git a/Provider/Provider.csproj b/Provider/Universley.OrleansContrib.StreamsProvider.Redis.csproj
similarity index 100%
rename from Provider/Provider.csproj
rename to Provider/Universley.OrleansContrib.StreamsProvider.Redis.csproj
diff --git a/RedisStreamsInOrleans.sln b/RedisStreamsInOrleans.sln
index 9318f4d..279ec62 100644
--- a/RedisStreamsInOrleans.sln
+++ b/RedisStreamsInOrleans.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{B7477618-DE9C-4586-98D2-46CFF1CB0C74}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Provider", "Provider\Provider.csproj", "{70F8E685-F662-4225-A60C-D318E0C6ED18}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Universley.OrleansContrib.StreamsProvider.Redis", "Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj", "{70F8E685-F662-4225-A60C-D318E0C6ED18}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisStreamsProvider.UnitTests", "RedisStreamsProvider.UnitTests\RedisStreamsProvider.UnitTests.csproj", "{DF927C2B-A141-4476-86CF-3B4DC8ECB4DE}"
 EndProject
diff --git a/RedisStreamsProvider.UnitTests/RedisStreamAdapterTests.cs b/RedisStreamsProvider.UnitTests/RedisStreamAdapterTests.cs
index 4cb399a..87fb0f1 100644
--- a/RedisStreamsProvider.UnitTests/RedisStreamAdapterTests.cs
+++ b/RedisStreamsProvider.UnitTests/RedisStreamAdapterTests.cs
@@ -2,11 +2,8 @@ using Moq;
 using StackExchange.Redis;
 using Microsoft.Extensions.Logging;
 using Orleans.Streams;
-using Xunit;
-using Provider;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Orleans.Configuration;
+using Universley.OrleansContrib.StreamsProvider.Redis;
 
 namespace RedisStreamsProvider.UnitTests
 {
diff --git a/RedisStreamsProvider.UnitTests/RedisStreamBatchContainerTests.cs b/RedisStreamsProvider.UnitTests/RedisStreamBatchContainerTests.cs
index 9b6c5d1..5e2d307 100644
--- a/RedisStreamsProvider.UnitTests/RedisStreamBatchContainerTests.cs
+++ b/RedisStreamsProvider.UnitTests/RedisStreamBatchContainerTests.cs
@@ -1,7 +1,6 @@
-using Provider;
 using StackExchange.Redis;
 using System.Text.Json;
-using Xunit;
+using Universley.OrleansContrib.StreamsProvider.Redis;
 
 namespace RedisStreamsProvider.UnitTests
 {
diff --git a/RedisStreamsProvider.UnitTests/RedisStreamFactoryTests.cs b/RedisStreamsProvider.UnitTests/RedisStreamFactoryTests.cs
index 9f32d7b..665827b 100644
--- a/RedisStreamsProvider.UnitTests/RedisStreamFactoryTests.cs
+++ b/RedisStreamsProvider.UnitTests/RedisStreamFactoryTests.cs
@@ -1,12 +1,10 @@
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Moq;
 using Orleans.Configuration;
 using Orleans.Providers.Streams.Common;
 using Orleans.Streams;
-using Provider;
 using StackExchange.Redis;
-using Xunit;
+using Universley.OrleansContrib.StreamsProvider.Redis;
 
 namespace RedisStreamsProvider.UnitTests
 {
diff --git a/RedisStreamsProvider.UnitTests/RedisStreamReceiverTests.cs b/RedisStreamsProvider.UnitTests/RedisStreamReceiverTests.cs
index 442e3ce..86761d2 100644
--- a/RedisStreamsProvider.UnitTests/RedisStreamReceiverTests.cs
+++ b/RedisStreamsProvider.UnitTests/RedisStreamReceiverTests.cs
@@ -1,12 +1,8 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using Orleans.Streams;
-using Provider;
 using StackExchange.Redis;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Xunit;
+using Universley.OrleansContrib.StreamsProvider.Redis;
 
 namespace RedisStreamsProvider.UnitTests
 {
diff --git a/RedisStreamsProvider.UnitTests/RedisStreamSequenceTokenTests.cs b/RedisStreamsProvider.UnitTests/RedisStreamSequenceTokenTests.cs
index e5912c0..9446117 100644
--- a/RedisStreamsProvider.UnitTests/RedisStreamSequenceTokenTests.cs
+++ b/RedisStreamsProvider.UnitTests/RedisStreamSequenceTokenTests.cs
@@ -1,9 +1,7 @@
-using Xunit;
-using StackExchange.Redis;
-using Provider;
+using StackExchange.Redis;
 using Orleans.Streams;
-using System;
 using Moq;
+using Universley.OrleansContrib.StreamsProvider.Redis;
 
 namespace Provider.Tests
 {
diff --git a/RedisStreamsProvider.UnitTests/RedisStreamsProvider.UnitTests.csproj b/RedisStreamsProvider.UnitTests/RedisStreamsProvider.UnitTests.csproj
index e52d684..6cff32f 100644
--- a/RedisStreamsProvider.UnitTests/RedisStreamsProvider.UnitTests.csproj
+++ b/RedisStreamsProvider.UnitTests/RedisStreamsProvider.UnitTests.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Provider\Provider.csproj" />
+    <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Server/Program.cs b/Server/Program.cs
index 61c9a86..e45ff42 100644
--- a/Server/Program.cs
+++ b/Server/Program.cs
@@ -2,9 +2,9 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Orleans.Configuration;
-using Orleans.Runtime;
 using Orleans.Streams;
 using StackExchange.Redis;
+using Universley.OrleansContrib.StreamsProvider.Redis;
 
 var builder = new HostBuilder()
     .UseOrleans(silo =>
@@ -16,7 +16,7 @@ var builder = new HostBuilder()
         });
         silo.ConfigureLogging(logging => logging.AddConsole());
         silo.AddMemoryGrainStorage("PubSubStore");
-        silo.AddPersistentStreams("RedisStream", Provider.RedisStreamFactory.Create, null);
+        silo.AddPersistentStreams("RedisStream", RedisStreamFactory.Create, null);
         silo.AddMemoryGrainStorageAsDefault();
     }).UseConsoleLifetime();
 builder.ConfigureServices(services =>
diff --git a/Server/Server.csproj b/Server/Server.csproj
index fe8d26c..f34bf50 100644
--- a/Server/Server.csproj
+++ b/Server/Server.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Provider\Provider.csproj" />
+    <ProjectReference Include="..\Provider\Universley.OrleansContrib.StreamsProvider.Redis.csproj" />
   </ItemGroup>
 
 </Project>