diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj
index 85e8989..b2d0c01 100644
--- a/Infrastructure/Infrastructure.csproj
+++ b/Infrastructure/Infrastructure.csproj
@@ -43,7 +43,6 @@
     <Folder Include="MassTransit\RoutingSlip\Variables\" />
     <Folder Include="MassTransit\Filters\" />
     <Folder Include="MassTransit\EventBus\" />
-    <Folder Include="MassTransit\DependencyInjection\" />
   </ItemGroup>
 
 </Project>
diff --git a/Infrastructure/MassTransit/Consumers/MessagingHelper.cs b/Infrastructure/MassTransit/Consumers/EndpointHelper.cs
similarity index 90%
rename from Infrastructure/MassTransit/Consumers/MessagingHelper.cs
rename to Infrastructure/MassTransit/Consumers/EndpointHelper.cs
index 914781a..47c8efd 100644
--- a/Infrastructure/MassTransit/Consumers/MessagingHelper.cs
+++ b/Infrastructure/MassTransit/Consumers/EndpointHelper.cs
@@ -1,6 +1,6 @@
 namespace Musify.Infrastructure.MassTransit.Consumers
 {
-    internal static class MessagingHelper
+    internal static class EndpointHelper
     {
         internal static Uri BuildExecuteActivityUri(string endpointName) => new($"queue:{endpointName}_execute");
 
diff --git a/Infrastructure/MassTransit/DependencyInjection/MessagingDependencyInjection.cs b/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
similarity index 98%
rename from Infrastructure/MassTransit/DependencyInjection/MessagingDependencyInjection.cs
rename to Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
index 1406c5b..a4301db 100644
--- a/Infrastructure/MassTransit/DependencyInjection/MessagingDependencyInjection.cs
+++ b/Infrastructure/MassTransit/DependencyInjection/MassTransitDependencyInjection.cs
@@ -14,7 +14,7 @@ using Musify.Infrastructure.MassTransit.Activities.Files;
 
 namespace Musify.Infrastructure.MassTransit
 {
-    public static class MessagingDependencyInjection
+    public static class MassTransitDependencyInjection
     {
         public static IServiceCollection AddMassTransitClient(this IServiceCollection serviceDescriptors)
         {
@@ -183,7 +183,7 @@ namespace Musify.Infrastructure.MassTransit
         {
             busFactoryConfigurator.ReceiveEndpoint($"{endpointName}_execute", endpointConfigurator =>
                 endpointConfigurator.ExecuteActivityHost<TActivity, TArguments>(
-                    MessagingHelper.BuildCompensateActivityUri(endpointName),
+                    EndpointHelper.BuildCompensateActivityUri(endpointName),
                     busRegistrationContext)
             );
 
diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs
index 6a29463..6008d78 100644
--- a/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs
+++ b/Infrastructure/MassTransit/RoutingSlip/Builders/AudioWorkflowRoutingSlipBuilder.cs
@@ -19,19 +19,19 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
             routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
 
             routingSlipBuilder.AddSubscription(
-                MessagingHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
+                EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
                 RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.GenerateAudioWorkflowPaths,
-                MessagingHelper.BuildExecuteActivityUri(GenerateAudioWorkflowPathsActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(GenerateAudioWorkflowPathsActivity.ExecuteEndpointName),
                 new GenerateAudioWorkflowPathsArguments(
                     workerConfiguration.Routes.TemporaryFilesDirectory,
                     message.SourceKeyName));
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.DownloadFile,
-                MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
                 new DownloadFileFromBucketArguments(
                     message.SourceBucketName,
                     message.SourceKeyName,
@@ -39,14 +39,14 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.TranscodeAudio,
-                MessagingHelper.BuildExecuteActivityUri(TranscodeDashAudioActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(TranscodeDashAudioActivity.ExecuteEndpointName),
                 new TranscodeDashAudioArguments(
                     RoutingSlipVariableNames.Audio.SourceFilePath,
                     RoutingSlipVariableNames.Workflow.TemporalDirectory));
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.TransferFiles,
-                MessagingHelper.BuildExecuteActivityUri(TransferFilesToBucketActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(TransferFilesToBucketActivity.ExecuteEndpointName),
                 new TransferFilesToBucketArguments(
                     message.DestinationBucketName,
                     RoutingSlipVariableNames.Audio.TranscodedDirectory,
@@ -54,7 +54,7 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.UpdateTrackAudio,
-                MessagingHelper.BuildExecuteActivityUri(UpdateTrackAudioActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(UpdateTrackAudioActivity.ExecuteEndpointName),
                 new UpdateTrackAudioArguments(
                     message.TrackId,
                     message.DestinationFolderKeyName));
diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs
index 9b660e8..ce0cd27 100644
--- a/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs
+++ b/Infrastructure/MassTransit/RoutingSlip/Builders/PictureWorkflowRoutingSlipBuilder.cs
@@ -30,7 +30,7 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.UpdateTrackPicture,
-                MessagingHelper.BuildExecuteActivityUri(UpdateTrackPictureActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(UpdateTrackPictureActivity.ExecuteEndpointName),
                 new UpdateTrackPictureArguments(
                     message.TrackId,
                     message.SourceKeyName,
@@ -59,7 +59,7 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.UpdatePlayListPicture,
-                MessagingHelper.BuildExecuteActivityUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(UpdatePlayListPictureActivity.ExecuteEndpointName),
                 new UpdatePlayListPictureArguments(
                     message.PlayListId,
                     message.SourceKeyName,
@@ -87,21 +87,21 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
             var routingSlipBuilder = new RoutingSlipBuilder(NewId.NextGuid());
 
             routingSlipBuilder.AddSubscription(
-                MessagingHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
+                EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
                 RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
 
             routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.GeneratePictureWorkflowPaths,
-                MessagingHelper.BuildExecuteActivityUri(GeneratePictureWorkflowPathsActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(GeneratePictureWorkflowPathsActivity.ExecuteEndpointName),
                 new GeneratePictureWorkflowPathsArguments(
                     workerConfiguration.Routes.TemporaryFilesDirectory,
                     sourceKeyName));
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.DownloadFile,
-                MessagingHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(DownloadFileFromBucketActivity.ExecuteEndpointName),
                 new DownloadFileFromBucketArguments(
                     bucketName,
                     sourceKeyName,
@@ -152,7 +152,7 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
         {
             routingSlipBuilder.AddActivity(
                 resizeActivityName,
-                MessagingHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(ResizePictureActivity.ExecuteEndpointName),
                 new ResizePictureLocalArguments(
                     RoutingSlipVariableNames.Picture.OriginalFilePath,
                     destinationFilePathVariableName,
@@ -161,7 +161,7 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
 
             routingSlipBuilder.AddActivity(
                 uploadActivityName,
-                MessagingHelper.BuildExecuteActivityUri(UploadFileToBucketActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(UploadFileToBucketActivity.ExecuteEndpointName),
                 new UploadFileToBucketArguments(
                     destinationFilePathVariableName,
                     bucketName,
diff --git a/Infrastructure/MassTransit/RoutingSlip/Builders/RemoveFileFromBucketRoutingSlipBuilder.cs b/Infrastructure/MassTransit/RoutingSlip/Builders/RemoveFileFromBucketRoutingSlipBuilder.cs
index 8336635..f7b60ed 100644
--- a/Infrastructure/MassTransit/RoutingSlip/Builders/RemoveFileFromBucketRoutingSlipBuilder.cs
+++ b/Infrastructure/MassTransit/RoutingSlip/Builders/RemoveFileFromBucketRoutingSlipBuilder.cs
@@ -16,12 +16,12 @@ namespace Musify.Infrastructure.MassTransit.RoutingSlip.Builders
             routingSlipBuilder.AddVariable(RoutingSlipVariableNames.Workflow.CorrelationId, correlationId ?? Guid.Empty);
 
             routingSlipBuilder.AddSubscription(
-                MessagingHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
+                EndpointHelper.BuildConsumerUri(RoutingSlipCleanUpConsumer.QueueName),
                 RoutingSlipEvents.Completed | RoutingSlipEvents.Faulted);
 
             routingSlipBuilder.AddActivity(
                 ActivityNames.RemoveFile,
-                MessagingHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
+                EndpointHelper.BuildExecuteActivityUri(RemoveFileFromBucketActivity.ExecuteEndpointName),
                 new RemoveFileFromBucketArguments(
                     message.BucketName,
                     message.KeyName));