diff --git a/Samples.sln b/Samples.sln
index 2913a709d..4548ede28 100644
--- a/Samples.sln
+++ b/Samples.sln
@@ -144,9 +144,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.RebusWorker",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "servicebus", "servicebus", "{47EDFC14-BB99-44BF-A447-035D40D7347B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.ServiceBus.AzureServiceBus", "src\servicebus\Elsa.ServiceBus.AzureServiceBus\Elsa.ServiceBus.AzureServiceBus.csproj", "{D3440E66-A871-4AB0-A1E0-8B3864ACA16A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Rebus.AzureServiceBus", "src\servicebus\Elsa.Rebus.AzureServiceBus\Elsa.Rebus.AzureServiceBus.csproj", "{D3440E66-A871-4AB0-A1E0-8B3864ACA16A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.ServiceBus.RabbitMq", "src\servicebus\Elsa.ServiceBus.RabbitMq\Elsa.ServiceBus.RabbitMq.csproj", "{FC656D28-1AA3-462D-9B18-A10436E47C08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Rebus.RabbitMq", "src\servicebus\Elsa.Rebus.RabbitMq\Elsa.Rebus.RabbitMq.csproj", "{FC656D28-1AA3-462D-9B18-A10436E47C08}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Activities.AzureServiceBus", "src\activities\Elsa.Activities.AzureServiceBus\Elsa.Activities.AzureServiceBus.csproj", "{DD607BC1-F9D9-4685-BC8F-A4056C2C31FA}"
 EndProject
diff --git a/src/samples/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj b/src/samples/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj
index aa90ba825..3879dee2a 100644
--- a/src/samples/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj
+++ b/src/samples/Elsa.Samples.RebusWorker/Elsa.Samples.RebusWorker.csproj
@@ -13,7 +13,7 @@
     <ItemGroup>
       <ProjectReference Include="..\..\activities\Elsa.Activities.Rebus\Elsa.Activities.Rebus.csproj" />
       <ProjectReference Include="..\..\core\Elsa\Elsa.csproj" />
-      <ProjectReference Include="..\..\servicebus\Elsa.ServiceBus.AzureServiceBus\Elsa.ServiceBus.AzureServiceBus.csproj" />
-      <ProjectReference Include="..\..\servicebus\Elsa.ServiceBus.RabbitMq\Elsa.ServiceBus.RabbitMq.csproj" />
+      <ProjectReference Include="..\..\servicebus\Elsa.Rebus.AzureServiceBus\Elsa.Rebus.AzureServiceBus.csproj" />
+      <ProjectReference Include="..\..\servicebus\Elsa.Rebus.RabbitMq\Elsa.Rebus.RabbitMq.csproj" />
     </ItemGroup>
 </Project>
diff --git a/src/samples/Elsa.Samples.RebusWorker/Program.cs b/src/samples/Elsa.Samples.RebusWorker/Program.cs
index 04310c8f4..cdb81a26c 100644
--- a/src/samples/Elsa.Samples.RebusWorker/Program.cs
+++ b/src/samples/Elsa.Samples.RebusWorker/Program.cs
@@ -1,7 +1,7 @@
 using Elsa.Activities.Rebus.Extensions;
 using Elsa.Samples.RebusWorker.Messages;
 using Elsa.Samples.RebusWorker.Workflows;
-using Elsa.ServiceBus.AzureServiceBus;
+using Elsa.Rebus.AzureServiceBus;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using NodaTime;
diff --git a/src/servicebus/Elsa.ServiceBus.AzureServiceBus/Elsa.ServiceBus.AzureServiceBus.csproj b/src/servicebus/Elsa.Rebus.AzureServiceBus/Elsa.Rebus.AzureServiceBus.csproj
similarity index 100%
rename from src/servicebus/Elsa.ServiceBus.AzureServiceBus/Elsa.ServiceBus.AzureServiceBus.csproj
rename to src/servicebus/Elsa.Rebus.AzureServiceBus/Elsa.Rebus.AzureServiceBus.csproj
diff --git a/src/servicebus/Elsa.ServiceBus.AzureServiceBus/Elsa.ServiceBus.AzureServiceBus.csproj.DotSettings b/src/servicebus/Elsa.Rebus.AzureServiceBus/Elsa.Rebus.AzureServiceBus.csproj.DotSettings
similarity index 100%
rename from src/servicebus/Elsa.ServiceBus.AzureServiceBus/Elsa.ServiceBus.AzureServiceBus.csproj.DotSettings
rename to src/servicebus/Elsa.Rebus.AzureServiceBus/Elsa.Rebus.AzureServiceBus.csproj.DotSettings
diff --git a/src/servicebus/Elsa.ServiceBus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs b/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
similarity index 96%
rename from src/servicebus/Elsa.ServiceBus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
rename to src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
index 100c4acd3..dbbe9456b 100644
--- a/src/servicebus/Elsa.ServiceBus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
+++ b/src/servicebus/Elsa.Rebus.AzureServiceBus/Extensions/ElsaOptionsExtensions.cs
@@ -7,7 +7,7 @@ using Rebus.Config;
 using Rebus.Logging;
 using Rebus.Routing.TypeBased;
 
-namespace Elsa.ServiceBus.AzureServiceBus
+namespace Elsa.Rebus.AzureServiceBus
 {
     public static class ElsaOptionsExtensions
     {
diff --git a/src/servicebus/Elsa.ServiceBus.AzureServiceBus/icon.png b/src/servicebus/Elsa.Rebus.AzureServiceBus/icon.png
similarity index 100%
rename from src/servicebus/Elsa.ServiceBus.AzureServiceBus/icon.png
rename to src/servicebus/Elsa.Rebus.AzureServiceBus/icon.png
diff --git a/src/servicebus/Elsa.ServiceBus.RabbitMq/Elsa.ServiceBus.RabbitMq.csproj b/src/servicebus/Elsa.Rebus.RabbitMq/Elsa.Rebus.RabbitMq.csproj
similarity index 100%
rename from src/servicebus/Elsa.ServiceBus.RabbitMq/Elsa.ServiceBus.RabbitMq.csproj
rename to src/servicebus/Elsa.Rebus.RabbitMq/Elsa.Rebus.RabbitMq.csproj
diff --git a/src/servicebus/Elsa.ServiceBus.RabbitMq/Extensions/ElsaOptionsExtensions.cs b/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsExtensions.cs
similarity index 95%
rename from src/servicebus/Elsa.ServiceBus.RabbitMq/Extensions/ElsaOptionsExtensions.cs
rename to src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsExtensions.cs
index 196fa8bd6..ab4eb7eea 100644
--- a/src/servicebus/Elsa.ServiceBus.RabbitMq/Extensions/ElsaOptionsExtensions.cs
+++ b/src/servicebus/Elsa.Rebus.RabbitMq/Extensions/ElsaOptionsExtensions.cs
@@ -4,7 +4,7 @@ using Rebus.Config;
 using Rebus.Logging;
 using Rebus.Routing.TypeBased;
 
-namespace Elsa.ServiceBus.RabbitMq.Extensions
+namespace Elsa.Rebus.RabbitMq.Extensions
 {
     public static class ElsaOptionsExtensions
     {
diff --git a/src/servicebus/Elsa.ServiceBus.RabbitMq/icon.png b/src/servicebus/Elsa.Rebus.RabbitMq/icon.png
similarity index 100%
rename from src/servicebus/Elsa.ServiceBus.RabbitMq/icon.png
rename to src/servicebus/Elsa.Rebus.RabbitMq/icon.png