diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230801213931_IdentitiesOverview.Designer.cs b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230801213931_IdentitiesOverview.Designer.cs
index b69561014f..97ddde3378 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230801213931_IdentitiesOverview.Designer.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230801213931_IdentitiesOverview.Designer.cs
@@ -1,5 +1,6 @@
//
-using AdminUi.Infrastructure.Persistence.Database;
+
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230911150143_Fix_IdentitiesOverview_View.Designer.cs b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230911150143_Fix_IdentitiesOverview_View.Designer.cs
index 0c21164fe9..1c62cbbe29 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230911150143_Fix_IdentitiesOverview_View.Designer.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230911150143_Fix_IdentitiesOverview_View.Designer.cs
@@ -1,6 +1,6 @@
//
using System;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230914082539_TiersOverview.Designer.cs b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230914082539_TiersOverview.Designer.cs
index ad512530a9..b9f6709e96 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230914082539_TiersOverview.Designer.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230914082539_TiersOverview.Designer.cs
@@ -1,6 +1,6 @@
//
using System;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230929151518_ClientsOverview.Designer.cs b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230929151518_ClientsOverview.Designer.cs
index 5726294f8d..9540512663 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230929151518_ClientsOverview.Designer.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/20230929151518_ClientsOverview.Designer.cs
@@ -1,6 +1,6 @@
//
using System;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/AdminUiDbContextModelSnapshot.cs b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/AdminUiDbContextModelSnapshot.cs
index 47e8cf0f12..314f054222 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/AdminUiDbContextModelSnapshot.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.Postgres/Migrations/AdminUiDbContextModelSnapshot.cs
@@ -1,6 +1,6 @@
//
using System;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230801163145_IdentitiesOverview.Designer.cs b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230801163145_IdentitiesOverview.Designer.cs
index 072cde31a8..a16c2a9631 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230801163145_IdentitiesOverview.Designer.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230801163145_IdentitiesOverview.Designer.cs
@@ -1,5 +1,6 @@
//
-using AdminUi.Infrastructure.Persistence.Database;
+
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230911140220_Fix_IdentitiesOverview_View.Designer.cs b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230911140220_Fix_IdentitiesOverview_View.Designer.cs
index 413e4933ec..039d35da2b 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230911140220_Fix_IdentitiesOverview_View.Designer.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230911140220_Fix_IdentitiesOverview_View.Designer.cs
@@ -1,6 +1,6 @@
//
using System;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230914082451_TiersOverview.Designer.cs b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230914082451_TiersOverview.Designer.cs
index 6c576c6de8..df9a19817b 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230914082451_TiersOverview.Designer.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230914082451_TiersOverview.Designer.cs
@@ -1,6 +1,6 @@
//
using System;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230929144733_ClientsOverview.Designer.cs b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230929144733_ClientsOverview.Designer.cs
index 1cc6a75e57..1b646b7ccd 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230929144733_ClientsOverview.Designer.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/20230929144733_ClientsOverview.Designer.cs
@@ -1,6 +1,6 @@
//
using System;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/AdminUiDbContextModelSnapshot.cs b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/AdminUiDbContextModelSnapshot.cs
index 2b9f621290..5f53520188 100644
--- a/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/AdminUiDbContextModelSnapshot.cs
+++ b/AdminUi/src/AdminUi.Infrastructure.Database.SqlServer/Migrations/AdminUiDbContextModelSnapshot.cs
@@ -1,6 +1,6 @@
//
using System;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/AdminUiDbContextModel.cs b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/AdminUiDbContextModel.cs
index 1157e75810..d722c0e5f9 100644
--- a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/AdminUiDbContextModel.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/AdminUiDbContextModel.cs
@@ -1,5 +1,6 @@
//
-using AdminUi.Infrastructure.Persistence.Database;
+
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/ClientOverviewEntityType.cs b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/ClientOverviewEntityType.cs
index c93ec3b1a3..e771759e02 100644
--- a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/ClientOverviewEntityType.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/ClientOverviewEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
-using AdminUi.Infrastructure.DTOs;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.AdminUi.Infrastructure.DTOs;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/IdentityOverviewEntityType.cs b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/IdentityOverviewEntityType.cs
index 8248dc8341..017a6da7ad 100644
--- a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/IdentityOverviewEntityType.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/IdentityOverviewEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
-using AdminUi.Infrastructure.DTOs;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.AdminUi.Infrastructure.DTOs;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/TierOverviewEntityType.cs b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/TierOverviewEntityType.cs
index b70672d1bc..1f8190711f 100644
--- a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/TierOverviewEntityType.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/Postgres/TierOverviewEntityType.cs
@@ -1,7 +1,7 @@
//
using System;
using System.Reflection;
-using AdminUi.Infrastructure.DTOs;
+using Backbone.AdminUi.Infrastructure.DTOs;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/AdminUiDbContextModel.cs b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/AdminUiDbContextModel.cs
index 1a6c5208cf..861b89763a 100644
--- a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/AdminUiDbContextModel.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/AdminUiDbContextModel.cs
@@ -1,5 +1,6 @@
//
-using AdminUi.Infrastructure.Persistence.Database;
+
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/ClientOverviewEntityType.cs b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/ClientOverviewEntityType.cs
index 48bbbf0389..a76007a0b0 100644
--- a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/ClientOverviewEntityType.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/ClientOverviewEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
-using AdminUi.Infrastructure.DTOs;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.AdminUi.Infrastructure.DTOs;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/IdentityOverviewEntityType.cs b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/IdentityOverviewEntityType.cs
index 94c72869e1..c5c770195f 100644
--- a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/IdentityOverviewEntityType.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/IdentityOverviewEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
-using AdminUi.Infrastructure.DTOs;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.AdminUi.Infrastructure.DTOs;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/TierOverviewEntityType.cs b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/TierOverviewEntityType.cs
index cf9649af0d..26ce59077f 100644
--- a/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/TierOverviewEntityType.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/CompiledModels/SqlServer/TierOverviewEntityType.cs
@@ -1,7 +1,7 @@
//
using System;
using System.Reflection;
-using AdminUi.Infrastructure.DTOs;
+using Backbone.AdminUi.Infrastructure.DTOs;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/AdminUi/src/AdminUi.Infrastructure/DTOs/ClientOverview.cs b/AdminUi/src/AdminUi.Infrastructure/DTOs/ClientOverview.cs
index 51a66a066e..e023ae6fd5 100644
--- a/AdminUi/src/AdminUi.Infrastructure/DTOs/ClientOverview.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/DTOs/ClientOverview.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Infrastructure.DTOs;
+namespace Backbone.AdminUi.Infrastructure.DTOs;
public class ClientOverview
{
public string ClientId { get; set; }
diff --git a/AdminUi/src/AdminUi.Infrastructure/DTOs/IdentityOverview.cs b/AdminUi/src/AdminUi.Infrastructure/DTOs/IdentityOverview.cs
index dcb58a3087..537494f4f4 100644
--- a/AdminUi/src/AdminUi.Infrastructure/DTOs/IdentityOverview.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/DTOs/IdentityOverview.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Infrastructure.DTOs;
+namespace Backbone.AdminUi.Infrastructure.DTOs;
public class IdentityOverview
{
diff --git a/AdminUi/src/AdminUi.Infrastructure/DTOs/TierOverview.cs b/AdminUi/src/AdminUi.Infrastructure/DTOs/TierOverview.cs
index 09a9398942..e495385bfe 100644
--- a/AdminUi/src/AdminUi.Infrastructure/DTOs/TierOverview.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/DTOs/TierOverview.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Infrastructure.DTOs;
+namespace Backbone.AdminUi.Infrastructure.DTOs;
public class TierOverview
{
public string Id { get; set; }
diff --git a/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/AdminUiDbContext.cs b/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/AdminUiDbContext.cs
index dd3bd2420e..a558521ee1 100644
--- a/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/AdminUiDbContext.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/AdminUiDbContext.cs
@@ -1,8 +1,8 @@
-using AdminUi.Infrastructure.DTOs;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.DTOs;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
-namespace AdminUi.Infrastructure.Persistence.Database;
+namespace Backbone.AdminUi.Infrastructure.Persistence.Database;
public class AdminUiDbContext : AbstractDbContextBase
{
diff --git a/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/ClientOverviewEntityTypeConfiguration.cs b/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/ClientOverviewEntityTypeConfiguration.cs
index 5ed176bf05..7c26e0ffe3 100644
--- a/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/ClientOverviewEntityTypeConfiguration.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/ClientOverviewEntityTypeConfiguration.cs
@@ -1,8 +1,8 @@
-using AdminUi.Infrastructure.DTOs;
+using Backbone.AdminUi.Infrastructure.DTOs;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
-namespace AdminUi.Infrastructure.Persistence.Database.EntityTypeConfigurations;
+namespace Backbone.AdminUi.Infrastructure.Persistence.Database.EntityTypeConfigurations;
public class ClientOverviewEntityTypeConfiguration : IEntityTypeConfiguration
{
public void Configure(EntityTypeBuilder builder)
diff --git a/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/IdentityOverviewEntityTypeConfiguration.cs b/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/IdentityOverviewEntityTypeConfiguration.cs
index d751119326..d192b2cdc5 100644
--- a/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/IdentityOverviewEntityTypeConfiguration.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/IdentityOverviewEntityTypeConfiguration.cs
@@ -1,8 +1,8 @@
-using AdminUi.Infrastructure.DTOs;
+using Backbone.AdminUi.Infrastructure.DTOs;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
-namespace AdminUi.Infrastructure.Persistence.Database.EntityTypeConfigurations;
+namespace Backbone.AdminUi.Infrastructure.Persistence.Database.EntityTypeConfigurations;
public class IdentityOverviewEntityTypeConfiguration : IEntityTypeConfiguration
{
diff --git a/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/TierOverviewEntityTypeConfiguration.cs b/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/TierOverviewEntityTypeConfiguration.cs
index f18bb38bab..9b20f64531 100644
--- a/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/TierOverviewEntityTypeConfiguration.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/Persistence/Database/EntityTypeConfigurations/TierOverviewEntityTypeConfiguration.cs
@@ -1,8 +1,8 @@
-using AdminUi.Infrastructure.DTOs;
+using Backbone.AdminUi.Infrastructure.DTOs;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
-namespace AdminUi.Infrastructure.Persistence.Database.EntityTypeConfigurations;
+namespace Backbone.AdminUi.Infrastructure.Persistence.Database.EntityTypeConfigurations;
public class TierOverviewEntityTypeConfiguration : IEntityTypeConfiguration
{
diff --git a/AdminUi/src/AdminUi.Infrastructure/Persistence/IServiceCollectionExtension.cs b/AdminUi/src/AdminUi.Infrastructure/Persistence/IServiceCollectionExtension.cs
index bce5206e9a..029017f48d 100644
--- a/AdminUi/src/AdminUi.Infrastructure/Persistence/IServiceCollectionExtension.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/Persistence/IServiceCollectionExtension.cs
@@ -1,8 +1,8 @@
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
-namespace AdminUi.Infrastructure.Persistence;
+namespace Backbone.AdminUi.Infrastructure.Persistence;
public static class IServiceCollectionExtensions
{
@@ -38,7 +38,7 @@ public static IServiceCollection AddDatabase(this IServiceCollection services, A
sqlOptions.CommandTimeout(20);
sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
- }).UseModel(CompiledModels.SqlServer.AdminUiDbContextModel.Instance);
+ }).UseModel(global::AdminUi.Infrastructure.CompiledModels.SqlServer.AdminUiDbContextModel.Instance);
break;
case POSTGRES:
dbContextOptions.UseNpgsql(options.ConnectionString, sqlOptions =>
@@ -46,7 +46,7 @@ public static IServiceCollection AddDatabase(this IServiceCollection services, A
sqlOptions.CommandTimeout(20);
sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
- }).UseModel(CompiledModels.Postgres.AdminUiDbContextModel.Instance);
+ }).UseModel(global::AdminUi.Infrastructure.CompiledModels.Postgres.AdminUiDbContextModel.Instance);
break;
default:
throw new Exception($"Unsupported database provider: {options.Provider}");
diff --git a/AdminUi/src/AdminUi.Infrastructure/Persistence/SqlDatabaseConfiguration.cs b/AdminUi/src/AdminUi.Infrastructure/Persistence/SqlDatabaseConfiguration.cs
index cc3a685f86..872788d220 100644
--- a/AdminUi/src/AdminUi.Infrastructure/Persistence/SqlDatabaseConfiguration.cs
+++ b/AdminUi/src/AdminUi.Infrastructure/Persistence/SqlDatabaseConfiguration.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace AdminUi.Infrastructure.Persistence;
+namespace Backbone.AdminUi.Infrastructure.Persistence;
public class SqlDatabaseConfiguration
{
diff --git a/AdminUi/src/AdminUi/Authentication/ApiKeyAuthenticationSchemeHandler.cs b/AdminUi/src/AdminUi/Authentication/ApiKeyAuthenticationSchemeHandler.cs
index 8545bde514..5716b764e4 100644
--- a/AdminUi/src/AdminUi/Authentication/ApiKeyAuthenticationSchemeHandler.cs
+++ b/AdminUi/src/AdminUi/Authentication/ApiKeyAuthenticationSchemeHandler.cs
@@ -3,7 +3,7 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.Options;
-namespace AdminUi.Authentication;
+namespace Backbone.AdminUi.Authentication;
public class ApiKeyAuthenticationSchemeOptions : AuthenticationSchemeOptions
{
diff --git a/AdminUi/src/AdminUi/Authentication/ApiKeyValidator.cs b/AdminUi/src/AdminUi/Authentication/ApiKeyValidator.cs
index ff0128c44d..9e9ca21654 100644
--- a/AdminUi/src/AdminUi/Authentication/ApiKeyValidator.cs
+++ b/AdminUi/src/AdminUi/Authentication/ApiKeyValidator.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Options;
-namespace AdminUi.Authentication;
+namespace Backbone.AdminUi.Authentication;
public class ApiKeyValidator
{
diff --git a/AdminUi/src/AdminUi/Configuration/AdminConfiguration.cs b/AdminUi/src/AdminUi/Configuration/AdminConfiguration.cs
index 821ca84316..bc0d0d53fb 100644
--- a/AdminUi/src/AdminUi/Configuration/AdminConfiguration.cs
+++ b/AdminUi/src/AdminUi/Configuration/AdminConfiguration.cs
@@ -1,8 +1,8 @@
using System.ComponentModel.DataAnnotations;
-using AdminUi.Infrastructure.Persistence;
-using Backbone.Infrastructure.EventBus;
+using Backbone.AdminUi.Infrastructure.Persistence;
+using Backbone.Backbone.Infrastructure.EventBus;
-namespace AdminUi.Configuration;
+namespace Backbone.AdminUi.Configuration;
public class AdminConfiguration
{
diff --git a/AdminUi/src/AdminUi/Configuration/DevicesConfiguration.cs b/AdminUi/src/AdminUi/Configuration/DevicesConfiguration.cs
index 272b3159c7..90cba5127a 100644
--- a/AdminUi/src/AdminUi/Configuration/DevicesConfiguration.cs
+++ b/AdminUi/src/AdminUi/Configuration/DevicesConfiguration.cs
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Backbone.Modules.Devices.Application;
-namespace AdminUi.Configuration;
+namespace Backbone.AdminUi.Configuration;
public class DevicesConfiguration
{
diff --git a/AdminUi/src/AdminUi/Configuration/QuotasConfiguration.cs b/AdminUi/src/AdminUi/Configuration/QuotasConfiguration.cs
index 07b410bf2c..ff8d3395eb 100644
--- a/AdminUi/src/AdminUi/Configuration/QuotasConfiguration.cs
+++ b/AdminUi/src/AdminUi/Configuration/QuotasConfiguration.cs
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Backbone.Modules.Quotas.Application;
-namespace AdminUi.Configuration;
+namespace Backbone.AdminUi.Configuration;
public class QuotasConfiguration
{
diff --git a/AdminUi/src/AdminUi/Controllers/ApiKeyValidationController.cs b/AdminUi/src/AdminUi/Controllers/ApiKeyValidationController.cs
index 3fdd177bc0..c6c2be6c54 100644
--- a/AdminUi/src/AdminUi/Controllers/ApiKeyValidationController.cs
+++ b/AdminUi/src/AdminUi/Controllers/ApiKeyValidationController.cs
@@ -1,8 +1,8 @@
-using AdminUi.Authentication;
+using Backbone.AdminUi.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Route("api/v1/ValidateApiKey")]
public class ApiKeyValidationController : ControllerBase
diff --git a/AdminUi/src/AdminUi/Controllers/ClientsController.cs b/AdminUi/src/AdminUi/Controllers/ClientsController.cs
index e378d64b22..b8cfe425f9 100644
--- a/AdminUi/src/AdminUi/Controllers/ClientsController.cs
+++ b/AdminUi/src/AdminUi/Controllers/ClientsController.cs
@@ -1,20 +1,20 @@
-using AdminUi.Infrastructure.DTOs;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.DTOs;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
using Backbone.Modules.Devices.Application.Clients.Commands.ChangeClientSecret;
using Backbone.Modules.Devices.Application.Clients.Commands.CreateClient;
using Backbone.Modules.Devices.Application.Clients.Commands.DeleteClient;
using Backbone.Modules.Devices.Application.Clients.Commands.UpdateClient;
using Backbone.Modules.Devices.Application.Clients.DTOs;
using Backbone.Modules.Devices.Application.Clients.Queries.GetClient;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Route("api/v1/[controller]")]
[Authorize("ApiKey")]
diff --git a/AdminUi/src/AdminUi/Controllers/HomeController.cs b/AdminUi/src/AdminUi/Controllers/HomeController.cs
index ec856bd7c7..09712492a0 100644
--- a/AdminUi/src/AdminUi/Controllers/HomeController.cs
+++ b/AdminUi/src/AdminUi/Controllers/HomeController.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Controller]
[Route("")]
diff --git a/AdminUi/src/AdminUi/Controllers/IdentitiesController.cs b/AdminUi/src/AdminUi/Controllers/IdentitiesController.cs
index 3a083906b3..f6b0a7558c 100644
--- a/AdminUi/src/AdminUi/Controllers/IdentitiesController.cs
+++ b/AdminUi/src/AdminUi/Controllers/IdentitiesController.cs
@@ -1,5 +1,11 @@
-using AdminUi.Infrastructure.DTOs;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.DTOs;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
using Backbone.Modules.Devices.Application;
using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.Identities.Commands.UpdateIdentity;
@@ -7,23 +13,17 @@
using Backbone.Modules.Quotas.Application.Tiers.Commands.CreateQuotaForIdentity;
using Backbone.Modules.Quotas.Application.Tiers.Commands.DeleteQuotaForIdentity;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
using GetIdentityQueryDevices = Backbone.Modules.Devices.Application.Identities.Queries.GetIdentity.GetIdentityQuery;
using GetIdentityQueryQuotas = Backbone.Modules.Quotas.Application.Identities.Queries.GetIdentity.GetIdentityQuery;
using GetIdentityResponseDevices = Backbone.Modules.Devices.Application.Identities.Queries.GetIdentity.GetIdentityResponse;
using GetIdentityResponseQuotas = Backbone.Modules.Quotas.Application.Identities.Queries.GetIdentity.GetIdentityResponse;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Route("api/v1/[controller]")]
[Authorize("ApiKey")]
diff --git a/AdminUi/src/AdminUi/Controllers/LogsController.cs b/AdminUi/src/AdminUi/Controllers/LogsController.cs
index 3dd35b1dd5..15f3b2d2f4 100644
--- a/AdminUi/src/AdminUi/Controllers/LogsController.cs
+++ b/AdminUi/src/AdminUi/Controllers/LogsController.cs
@@ -1,14 +1,14 @@
-using Backbone.Modules.Devices.Application;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Devices.Application;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Route("api/v1/[controller]")]
[Authorize("ApiKey")]
diff --git a/AdminUi/src/AdminUi/Controllers/MetricsController.cs b/AdminUi/src/AdminUi/Controllers/MetricsController.cs
index 542c8ece27..351fab554d 100644
--- a/AdminUi/src/AdminUi/Controllers/MetricsController.cs
+++ b/AdminUi/src/AdminUi/Controllers/MetricsController.cs
@@ -1,11 +1,11 @@
-using Backbone.Modules.Quotas.Application.Metrics.Queries.ListMetrics;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.Modules.Quotas.Application.Metrics.Queries.ListMetrics;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Route("api/v1/[controller]")]
[Authorize("ApiKey")]
diff --git a/AdminUi/src/AdminUi/Controllers/QuotasController.cs b/AdminUi/src/AdminUi/Controllers/QuotasController.cs
index 02b12f534e..d66b26a7e4 100644
--- a/AdminUi/src/AdminUi/Controllers/QuotasController.cs
+++ b/AdminUi/src/AdminUi/Controllers/QuotasController.cs
@@ -1,9 +1,9 @@
-using Enmeshed.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Route("api/v1/[controller]")]
[Authorize("ApiKey")]
diff --git a/AdminUi/src/AdminUi/Controllers/TiersController.cs b/AdminUi/src/AdminUi/Controllers/TiersController.cs
index 9530a2c6df..48e486b17a 100644
--- a/AdminUi/src/AdminUi/Controllers/TiersController.cs
+++ b/AdminUi/src/AdminUi/Controllers/TiersController.cs
@@ -1,5 +1,11 @@
-using AdminUi.Infrastructure.DTOs;
-using AdminUi.Infrastructure.Persistence.Database;
+using Backbone.AdminUi.Infrastructure.DTOs;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
using Backbone.Modules.Devices.Application;
using Backbone.Modules.Devices.Application.Tiers.Commands.CreateTier;
using Backbone.Modules.Devices.Application.Tiers.Commands.DeleteTier;
@@ -8,19 +14,13 @@
using Backbone.Modules.Quotas.Application.Tiers.Commands.DeleteTierQuotaDefinition;
using Backbone.Modules.Quotas.Application.Tiers.Queries.GetTierById;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Route("api/v1/[controller]")]
[Authorize("ApiKey")]
diff --git a/AdminUi/src/AdminUi/Controllers/XSRFController.cs b/AdminUi/src/AdminUi/Controllers/XSRFController.cs
index 43348b5145..2216cc94b9 100644
--- a/AdminUi/src/AdminUi/Controllers/XSRFController.cs
+++ b/AdminUi/src/AdminUi/Controllers/XSRFController.cs
@@ -2,7 +2,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
-namespace AdminUi.Controllers;
+namespace Backbone.AdminUi.Controllers;
[Route("api/v1/xsrf")]
[Authorize("ApiKey")]
diff --git a/AdminUi/src/AdminUi/Extensions/DevicesServiceCollectionExtensions.cs b/AdminUi/src/AdminUi/Extensions/DevicesServiceCollectionExtensions.cs
index ecef3569be..3f5ab9437d 100644
--- a/AdminUi/src/AdminUi/Extensions/DevicesServiceCollectionExtensions.cs
+++ b/AdminUi/src/AdminUi/Extensions/DevicesServiceCollectionExtensions.cs
@@ -1,10 +1,10 @@
-using AdminUi.Configuration;
+using Backbone.AdminUi.Configuration;
+using Backbone.Crypto.Abstractions;
+using Backbone.Crypto.Implementations;
using Backbone.Modules.Devices.Application.Extensions;
using Backbone.Modules.Devices.Infrastructure.Persistence;
-using Enmeshed.Crypto.Abstractions;
-using Enmeshed.Crypto.Implementations;
-namespace AdminUi.Extensions;
+namespace Backbone.AdminUi.Extensions;
public static class DevicesServiceCollectionExtensions
{
diff --git a/AdminUi/src/AdminUi/Extensions/IServiceCollectionExtensions.cs b/AdminUi/src/AdminUi/Extensions/IServiceCollectionExtensions.cs
index c712fc3646..b3d0b06d24 100644
--- a/AdminUi/src/AdminUi/Extensions/IServiceCollectionExtensions.cs
+++ b/AdminUi/src/AdminUi/Extensions/IServiceCollectionExtensions.cs
@@ -1,16 +1,16 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-using AdminUi.Authentication;
-using AdminUi.Configuration;
+using Backbone.AdminUi.Authentication;
+using Backbone.AdminUi.Configuration;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc.ExceptionFilters;
using Backbone.Modules.Devices.Application.Devices.Commands.RegisterDevice;
using Backbone.Modules.Devices.Application.Devices.DTOs;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc.ExceptionFilters;
using FluentValidation;
using FluentValidation.AspNetCore;
using Microsoft.AspNetCore.Mvc;
-namespace AdminUi.Extensions;
+namespace Backbone.AdminUi.Extensions;
public static class IServiceCollectionExtensions
{
diff --git a/AdminUi/src/AdminUi/Extensions/QuotasServiceCollectionExtensions.cs b/AdminUi/src/AdminUi/Extensions/QuotasServiceCollectionExtensions.cs
index 5d1b06a933..a964a2a37b 100644
--- a/AdminUi/src/AdminUi/Extensions/QuotasServiceCollectionExtensions.cs
+++ b/AdminUi/src/AdminUi/Extensions/QuotasServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using AdminUi.Configuration;
+using Backbone.AdminUi.Configuration;
using Backbone.Modules.Quotas.Application.Extensions;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
-namespace AdminUi.Extensions;
+namespace Backbone.AdminUi.Extensions;
public static class QuotasServiceCollectionExtensions
{
diff --git a/AdminUi/src/AdminUi/Program.cs b/AdminUi/src/AdminUi/Program.cs
index 54a46d2282..f40c0b8def 100644
--- a/AdminUi/src/AdminUi/Program.cs
+++ b/AdminUi/src/AdminUi/Program.cs
@@ -1,19 +1,18 @@
using System.Reflection;
-using AdminUi.Authentication;
-using AdminUi.Configuration;
-using AdminUi.Extensions;
-using AdminUi.Infrastructure.Persistence;
-using AdminUi.Infrastructure.Persistence.Database;
using Autofac.Extensions.DependencyInjection;
-using Backbone.Infrastructure.EventBus;
+using Backbone.AdminUi.Authentication;
+using Backbone.AdminUi.Configuration;
+using Backbone.AdminUi.Extensions;
+using Backbone.AdminUi.Infrastructure.Persistence;
+using Backbone.AdminUi.Infrastructure.Persistence.Database;
+using Backbone.Backbone.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.QuotaCheck;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
using Backbone.Modules.Devices.Application;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.QuotaCheck;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Logging;
@@ -158,6 +157,9 @@ static void Configure(WebApplication app)
});
}
-public partial class Program
+namespace Backbone.AdminUi
{
+ public partial class Program
+ {
+ }
}
diff --git a/AdminUi/test/AdminUi.Tests.Integration/API/BaseApi.cs b/AdminUi/test/AdminUi.Tests.Integration/API/BaseApi.cs
index b27002e833..d6c3270357 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/API/BaseApi.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/API/BaseApi.cs
@@ -1,13 +1,13 @@
using System.Net;
using System.Net.Http.Headers;
-using AdminUi.Tests.Integration.Configuration;
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.Configuration;
+using Backbone.AdminUi.Tests.Integration.Models;
using FluentValidation.TestHelper;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
-using HttpResponse = AdminUi.Tests.Integration.Models.HttpResponse;
+using HttpResponse = Backbone.AdminUi.Tests.Integration.Models.HttpResponse;
-namespace AdminUi.Tests.Integration.API;
+namespace Backbone.AdminUi.Tests.Integration.API;
public class BaseApi
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/API/ClientsApi.cs b/AdminUi/test/AdminUi.Tests.Integration/API/ClientsApi.cs
index aa3319626f..f35857904e 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/API/ClientsApi.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/API/ClientsApi.cs
@@ -1,8 +1,8 @@
-using AdminUi.Tests.Integration.Configuration;
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.Configuration;
+using Backbone.AdminUi.Tests.Integration.Models;
using Microsoft.Extensions.Options;
-namespace AdminUi.Tests.Integration.API;
+namespace Backbone.AdminUi.Tests.Integration.API;
public class ClientsApi : BaseApi
{
public ClientsApi(IOptions httpConfiguration, HttpClientFactory factory) : base(httpConfiguration, factory) { }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/API/IdentitiesApi.cs b/AdminUi/test/AdminUi.Tests.Integration/API/IdentitiesApi.cs
index b84aad0f1f..e562938a10 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/API/IdentitiesApi.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/API/IdentitiesApi.cs
@@ -1,8 +1,8 @@
-using AdminUi.Tests.Integration.Configuration;
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.Configuration;
+using Backbone.AdminUi.Tests.Integration.Models;
using Microsoft.Extensions.Options;
-namespace AdminUi.Tests.Integration.API;
+namespace Backbone.AdminUi.Tests.Integration.API;
public class IdentitiesApi : BaseApi
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/API/LogsApi.cs b/AdminUi/test/AdminUi.Tests.Integration/API/LogsApi.cs
index 59f0fb42eb..75a39c37e6 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/API/LogsApi.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/API/LogsApi.cs
@@ -1,8 +1,8 @@
-using AdminUi.Tests.Integration.Configuration;
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.Configuration;
+using Backbone.AdminUi.Tests.Integration.Models;
using Microsoft.Extensions.Options;
-namespace AdminUi.Tests.Integration.API;
+namespace Backbone.AdminUi.Tests.Integration.API;
public class LogsApi : BaseApi
{
public LogsApi(IOptions httpConfiguration, HttpClientFactory factory) : base(httpConfiguration, factory) { }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/API/MetricsApi.cs b/AdminUi/test/AdminUi.Tests.Integration/API/MetricsApi.cs
index 07e744b601..30378133ba 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/API/MetricsApi.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/API/MetricsApi.cs
@@ -1,8 +1,8 @@
-using AdminUi.Tests.Integration.Configuration;
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.Configuration;
+using Backbone.AdminUi.Tests.Integration.Models;
using Microsoft.Extensions.Options;
-namespace AdminUi.Tests.Integration.API;
+namespace Backbone.AdminUi.Tests.Integration.API;
public class MetricsApi : BaseApi
{
public MetricsApi(IOptions httpConfiguration, HttpClientFactory factory) : base(httpConfiguration, factory) { }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/API/TiersApi.cs b/AdminUi/test/AdminUi.Tests.Integration/API/TiersApi.cs
index f15a636da1..07e8097db3 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/API/TiersApi.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/API/TiersApi.cs
@@ -1,8 +1,8 @@
-using AdminUi.Tests.Integration.Configuration;
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.Configuration;
+using Backbone.AdminUi.Tests.Integration.Models;
using Microsoft.Extensions.Options;
-namespace AdminUi.Tests.Integration.API;
+namespace Backbone.AdminUi.Tests.Integration.API;
public class TiersApi : BaseApi
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Configuration/HttpClientOptions.cs b/AdminUi/test/AdminUi.Tests.Integration/Configuration/HttpClientOptions.cs
index ccc21f876c..b97964c481 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Configuration/HttpClientOptions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Configuration/HttpClientOptions.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace AdminUi.Tests.Integration.Configuration;
+namespace Backbone.AdminUi.Tests.Integration.Configuration;
public class HttpClientOptions
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/CustomWebApplicationFactory.cs b/AdminUi/test/AdminUi.Tests.Integration/CustomWebApplicationFactory.cs
index 083c3e18b0..04f0964525 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/CustomWebApplicationFactory.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/CustomWebApplicationFactory.cs
@@ -1,9 +1,9 @@
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
-namespace AdminUi.Tests.Integration;
+namespace Backbone.AdminUi.Tests.Integration;
public class CustomWebApplicationFactory : WebApplicationFactory where TStartup : class
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Extensions/HttpResponseExtensions.cs b/AdminUi/test/AdminUi.Tests.Integration/Extensions/HttpResponseExtensions.cs
index cc688a9b26..2defca0e32 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Extensions/HttpResponseExtensions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Extensions/HttpResponseExtensions.cs
@@ -1,7 +1,7 @@
-using AdminUi.Tests.Integration.Models;
-using AdminUi.Tests.Integration.Support;
+using Backbone.AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.Support;
-namespace AdminUi.Tests.Integration.Extensions;
+namespace Backbone.AdminUi.Tests.Integration.Extensions;
public static class HttpResponseExtensions
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Hooks/Hooks.cs b/AdminUi/test/AdminUi.Tests.Integration/Hooks/Hooks.cs
index 682e2060e7..6c057633c7 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Hooks/Hooks.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Hooks/Hooks.cs
@@ -1,6 +1,6 @@
-using SpecFlowCucumberResultsExporter.Extensions;
+using Backbone.SpecFlowCucumberResultsExporter.Extensions;
-namespace AdminUi.Tests.Integration.Hooks;
+namespace Backbone.AdminUi.Tests.Integration.Hooks;
[Binding]
public sealed class Hooks
diff --git a/AdminUi/test/AdminUi.Tests.Integration/HttpClientFactory.cs b/AdminUi/test/AdminUi.Tests.Integration/HttpClientFactory.cs
index 0c7eb359ac..3d25bf3479 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/HttpClientFactory.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/HttpClientFactory.cs
@@ -1,6 +1,6 @@
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
-namespace AdminUi.Tests.Integration;
+namespace Backbone.AdminUi.Tests.Integration;
public class HttpClientFactory
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/ChangeClientSecretRequest.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/ChangeClientSecretRequest.cs
index 7fc73f8110..5f9b9c3bcd 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/ChangeClientSecretRequest.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/ChangeClientSecretRequest.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class ChangeClientSecretRequest
{
public string NewSecret { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/ChangeClientSecretResponse.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/ChangeClientSecretResponse.cs
index 3a1ef508ae..326f7070e6 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/ChangeClientSecretResponse.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/ChangeClientSecretResponse.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class ChangeClientSecretResponse
{
public string ClientId { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/ClientDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/ClientDTO.cs
index db02ca8411..8f563ffb89 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/ClientDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/ClientDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class ClientDTO
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/ClientOverviewDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/ClientOverviewDTO.cs
index e9207ab67a..28eb2a3952 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/ClientOverviewDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/ClientOverviewDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class ClientOverviewDTO
{
public string ClientId { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateClientRequest.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateClientRequest.cs
index 8f0b45df1d..f8c801be95 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateClientRequest.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateClientRequest.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class CreateClientRequest
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateClientResponse.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateClientResponse.cs
index ba25b8abdc..f8e7c59435 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateClientResponse.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateClientResponse.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class CreateClientResponse
{
public string ClientId { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateIndividualQuotaRequest.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateIndividualQuotaRequest.cs
index e917a98f7f..4356b1cc22 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateIndividualQuotaRequest.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateIndividualQuotaRequest.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class CreateIndividualQuotaRequest
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateTierQuotaRequest.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateTierQuotaRequest.cs
index 82b66a546b..20ece775a1 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateTierQuotaRequest.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateTierQuotaRequest.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class CreateTierQuotaRequest
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateTierRequest.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateTierRequest.cs
index 47f9918486..2e8c489ed0 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/CreateTierRequest.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/CreateTierRequest.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class CreateTierRequest
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/Error.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/Error.cs
index 21dc393951..1f402ef38a 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/Error.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/Error.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class Error
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/HttpResponse.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/HttpResponse.cs
index b58124c4c2..242dc70031 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/HttpResponse.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/HttpResponse.cs
@@ -1,6 +1,6 @@
using System.Net;
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class HttpResponse
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/IdentityOverviewDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/IdentityOverviewDTO.cs
index 7793bd8c64..420cf5b13c 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/IdentityOverviewDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/IdentityOverviewDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class IdentityOverviewDTO
{
public string Address { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/IdentitySummaryDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/IdentitySummaryDTO.cs
index 319dad8ef3..f561927074 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/IdentitySummaryDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/IdentitySummaryDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class IdentitySummaryDTO
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/IndividualQuotaDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/IndividualQuotaDTO.cs
index b3a6cb3aa1..ff26eff982 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/IndividualQuotaDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/IndividualQuotaDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class IndividualQuotaDTO
{
public string Id { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/LogRequest.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/LogRequest.cs
index 1ef21cc9db..d32ff9b3b2 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/LogRequest.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/LogRequest.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class LogRequest
{
public LogLevel LogLevel { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/MetricDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/MetricDTO.cs
index fb0365794f..be38e66eaa 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/MetricDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/MetricDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class MetricDTO
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/RequestConfiguration.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/RequestConfiguration.cs
index f35d9be2b5..04be474541 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/RequestConfiguration.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/RequestConfiguration.cs
@@ -1,6 +1,6 @@
using Newtonsoft.Json;
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class RequestConfiguration
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/ResponseContent.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/ResponseContent.cs
index 77468ea129..fc0c3f66d5 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/ResponseContent.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/ResponseContent.cs
@@ -1,6 +1,6 @@
using Newtonsoft.Json;
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class ResponseContent
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/TierDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/TierDTO.cs
index fd2099a92c..09a5399e98 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/TierDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/TierDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class TierDTO
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/TierDetailsDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/TierDetailsDTO.cs
index b03fbf0f32..225bd3d8db 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/TierDetailsDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/TierDetailsDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class TierDetailsDTO
{
public string Id { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/TierOverviewDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/TierOverviewDTO.cs
index df3867beeb..169bf2396e 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/TierOverviewDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/TierOverviewDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class TierOverviewDTO
{
public string Id { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/TierQuotaDTO.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/TierQuotaDTO.cs
index d13f6d4a42..bf2aa8e4d7 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/TierQuotaDTO.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/TierQuotaDTO.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class TierQuotaDTO
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/UpdateClientRequest.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/UpdateClientRequest.cs
index c00936f17a..f99277cf0a 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/UpdateClientRequest.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/UpdateClientRequest.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class UpdateClientRequest
{
public string DefaultTier { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Models/UpdateClientResponse.cs b/AdminUi/test/AdminUi.Tests.Integration/Models/UpdateClientResponse.cs
index eb7dc20ea4..336b894d4f 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Models/UpdateClientResponse.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Models/UpdateClientResponse.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.Models;
+namespace Backbone.AdminUi.Tests.Integration.Models;
public class UpdateClientResponse
{
public string ClientId { get; set; }
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/BaseStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/BaseStepDefinitions.cs
index d36e719906..989523b180 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/BaseStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/BaseStepDefinitions.cs
@@ -1,6 +1,6 @@
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.Models;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Binding]
public class BaseStepDefinitions
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/ClientDetailsStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/ClientDetailsStepDefinitions.cs
index b67a783e23..9cb2a823d6 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/ClientDetailsStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/ClientDetailsStepDefinitions.cs
@@ -1,9 +1,9 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Extensions;
-using AdminUi.Tests.Integration.Models;
-using Enmeshed.UnitTestTools.Data;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Extensions;
+using Backbone.AdminUi.Tests.Integration.Models;
+using Backbone.UnitTestTools.Data;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
public class ClientDetailsStepDefinitions : BaseStepDefinitions
{
private readonly ClientsApi _clientsApi;
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/ClientsStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/ClientsStepDefinitions.cs
index 7f7bc87502..970bf88e7b 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/ClientsStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/ClientsStepDefinitions.cs
@@ -1,9 +1,9 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Extensions;
-using AdminUi.Tests.Integration.Models;
-using Enmeshed.UnitTestTools.Data;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Extensions;
+using Backbone.AdminUi.Tests.Integration.Models;
+using Backbone.UnitTestTools.Data;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "GET Clients")]
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/IdentitiesApiStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/IdentitiesApiStepDefinitions.cs
index c2b51a9035..05ffdc0d56 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/IdentitiesApiStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/IdentitiesApiStepDefinitions.cs
@@ -1,9 +1,9 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Extensions;
-using AdminUi.Tests.Integration.Models;
-using AdminUi.Tests.Integration.TestData;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Extensions;
+using Backbone.AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.TestData;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "GET Identities")]
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/IndividualQuotaStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/IndividualQuotaStepDefinitions.cs
index dd00d9a592..637d4df27b 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/IndividualQuotaStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/IndividualQuotaStepDefinitions.cs
@@ -1,9 +1,9 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Extensions;
-using AdminUi.Tests.Integration.Models;
-using AdminUi.Tests.Integration.TestData;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Extensions;
+using Backbone.AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.TestData;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "POST IndividualQuota")]
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/LogsStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/LogsStepDefinitions.cs
index 803e490507..d806f168de 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/LogsStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/LogsStepDefinitions.cs
@@ -1,7 +1,7 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Models;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "POST Log")]
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/MetricsStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/MetricsStepDefinitions.cs
index 71f80fa9fb..66346b0b97 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/MetricsStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/MetricsStepDefinitions.cs
@@ -1,8 +1,8 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Extensions;
-using AdminUi.Tests.Integration.Models;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Extensions;
+using Backbone.AdminUi.Tests.Integration.Models;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "GET Metrics")]
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TierDetailsStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TierDetailsStepDefinitions.cs
index 0884cb0b90..24477bf059 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TierDetailsStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TierDetailsStepDefinitions.cs
@@ -1,9 +1,9 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Extensions;
-using AdminUi.Tests.Integration.Models;
-using Enmeshed.UnitTestTools.Data;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Extensions;
+using Backbone.AdminUi.Tests.Integration.Models;
+using Backbone.UnitTestTools.Data;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "GET Tier Details")]
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TierQuotaStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TierQuotaStepDefinitions.cs
index 854c7ce1cd..0ecc7435a5 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TierQuotaStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TierQuotaStepDefinitions.cs
@@ -1,9 +1,9 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Extensions;
-using AdminUi.Tests.Integration.Models;
-using Enmeshed.UnitTestTools.Data;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Extensions;
+using Backbone.AdminUi.Tests.Integration.Models;
+using Backbone.UnitTestTools.Data;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Scope(Feature = "POST TierQuota")]
[Scope(Feature = "DELETE TierQuota")]
diff --git a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TiersStepDefinitions.cs b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TiersStepDefinitions.cs
index 481b552399..c9f00f7f7b 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TiersStepDefinitions.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/StepDefinitions/TiersStepDefinitions.cs
@@ -1,10 +1,10 @@
using System.Net;
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Extensions;
-using AdminUi.Tests.Integration.Models;
-using Enmeshed.UnitTestTools.Data;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Extensions;
+using Backbone.AdminUi.Tests.Integration.Models;
+using Backbone.UnitTestTools.Data;
-namespace AdminUi.Tests.Integration.StepDefinitions;
+namespace Backbone.AdminUi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "GET Tiers")]
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Support/Dependencies.cs b/AdminUi/test/AdminUi.Tests.Integration/Support/Dependencies.cs
index 23537641dd..db7a3d560c 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Support/Dependencies.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Support/Dependencies.cs
@@ -1,10 +1,10 @@
-using AdminUi.Tests.Integration.API;
-using AdminUi.Tests.Integration.Configuration;
+using Backbone.AdminUi.Tests.Integration.API;
+using Backbone.AdminUi.Tests.Integration.Configuration;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using SolidToken.SpecFlow.DependencyInjection;
-namespace AdminUi.Tests.Integration.Support;
+namespace Backbone.AdminUi.Tests.Integration.Support;
public static class Dependencies
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/Support/JsonValidators.cs b/AdminUi/test/AdminUi.Tests.Integration/Support/JsonValidators.cs
index defd28f2a4..b890f87259 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/Support/JsonValidators.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/Support/JsonValidators.cs
@@ -3,7 +3,7 @@
using Newtonsoft.Json.Schema.Generation;
using Newtonsoft.Json.Serialization;
-namespace AdminUi.Tests.Integration.Support;
+namespace Backbone.AdminUi.Tests.Integration.Support;
public class JsonValidators
{
diff --git a/AdminUi/test/AdminUi.Tests.Integration/TestData/Identities.cs b/AdminUi/test/AdminUi.Tests.Integration/TestData/Identities.cs
index ff150853d9..e27d7482a2 100644
--- a/AdminUi/test/AdminUi.Tests.Integration/TestData/Identities.cs
+++ b/AdminUi/test/AdminUi.Tests.Integration/TestData/Identities.cs
@@ -1,4 +1,4 @@
-namespace AdminUi.Tests.Integration.TestData;
+namespace Backbone.AdminUi.Tests.Integration.TestData;
public static class Identities
{
diff --git a/Backbone.Infrastructure/EventBus/EventBusConfiguration.cs b/Backbone.Infrastructure/EventBus/EventBusConfiguration.cs
index 1b58a5202b..eddb1ae259 100644
--- a/Backbone.Infrastructure/EventBus/EventBusConfiguration.cs
+++ b/Backbone.Infrastructure/EventBus/EventBusConfiguration.cs
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Infrastructure.EventBus;
-namespace Backbone.Infrastructure.EventBus;
+namespace Backbone.Backbone.Infrastructure.EventBus;
public class EventBusConfiguration
{
diff --git a/Backbone.Infrastructure/EventBus/EventBusInMemory.cs b/Backbone.Infrastructure/EventBus/EventBusInMemory.cs
index b0e8500e7f..45a049832c 100644
--- a/Backbone.Infrastructure/EventBus/EventBusInMemory.cs
+++ b/Backbone.Infrastructure/EventBus/EventBusInMemory.cs
@@ -1,11 +1,11 @@
using System.Reflection;
using Autofac;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
-namespace Backbone.Infrastructure.EventBus;
+namespace Backbone.Backbone.Infrastructure.EventBus;
public class EventBusInMemory : IEventBus
{
diff --git a/Backbone.Infrastructure/EventBus/EventBusServiceCollectionExtensions.cs b/Backbone.Infrastructure/EventBus/EventBusServiceCollectionExtensions.cs
index d12e875738..f050721c8a 100644
--- a/Backbone.Infrastructure/EventBus/EventBusServiceCollectionExtensions.cs
+++ b/Backbone.Infrastructure/EventBus/EventBusServiceCollectionExtensions.cs
@@ -1,10 +1,10 @@
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
+using Backbone.BuildingBlocks.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
+using Backbone.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
+using Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
using Microsoft.Extensions.DependencyInjection;
-namespace Backbone.Infrastructure.EventBus;
+namespace Backbone.Backbone.Infrastructure.EventBus;
public static class EventBusServiceCollectionExtensions
{
@@ -19,14 +19,14 @@ public static void AddEventBus(this IServiceCollection services, EventBusConfigu
case AZURE:
services.AddAzureServiceBus(options =>
{
- LoadBasicBusOptions(configuration, options);
+ LoadBasicBusOptions(configuration, options);
options.ConnectionString = configuration.ConnectionInfo;
});
break;
case GOOGLE_CLOUD:
services.AddGoogleCloudPubSub(options =>
{
- LoadBasicBusOptions(configuration, options);
+ LoadBasicBusOptions(configuration, options);
options.ProjectId = configuration.GcpPubSubProjectId;
options.TopicName = configuration.GcpPubSubTopicName;
options.ConnectionInfo = configuration.ConnectionInfo;
@@ -35,7 +35,7 @@ public static void AddEventBus(this IServiceCollection services, EventBusConfigu
case RABBIT_MQ:
services.AddRabbitMq(options =>
{
- LoadBasicBusOptions(configuration, options);
+ LoadBasicBusOptions(configuration, options);
options.HostName = configuration.ConnectionInfo;
options.Username = configuration.RabbitMqUsername;
options.Password = configuration.RabbitMqPassword;
diff --git a/Backbone.Infrastructure/UserContext/AspNetCoreUserContext.cs b/Backbone.Infrastructure/UserContext/AspNetCoreUserContext.cs
index 505be413af..6c75d48baf 100644
--- a/Backbone.Infrastructure/UserContext/AspNetCoreUserContext.cs
+++ b/Backbone.Infrastructure/UserContext/AspNetCoreUserContext.cs
@@ -1,11 +1,11 @@
using System.ComponentModel;
using System.Security.Claims;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Microsoft.AspNetCore.Http;
-namespace Backbone.Infrastructure.UserContext;
+namespace Backbone.Backbone.Infrastructure.UserContext;
public class AspNetCoreUserContext : IUserContext
{
diff --git a/Backbone.Tests.ArchUnit/BackboneArchitecture.cs b/Backbone.Tests.ArchUnit/BackboneArchitecture.cs
index a13543c0c7..bb48609759 100644
--- a/Backbone.Tests.ArchUnit/BackboneArchitecture.cs
+++ b/Backbone.Tests.ArchUnit/BackboneArchitecture.cs
@@ -3,7 +3,7 @@
using ArchUnitNET.Loader;
using Assembly = System.Reflection.Assembly;
-namespace Backbone.Tests.ArchUnit;
+namespace Backbone.Backbone.Tests.ArchUnit;
public static class Backbone
{
public static readonly Architecture ARCHITECTURE =
diff --git a/Backbone.Tests.ArchUnit/CQRS.cs b/Backbone.Tests.ArchUnit/CQRS.cs
index dfb6e52560..8bf7de2425 100644
--- a/Backbone.Tests.ArchUnit/CQRS.cs
+++ b/Backbone.Tests.ArchUnit/CQRS.cs
@@ -3,7 +3,7 @@
using MediatR;
using static ArchUnitNET.Fluent.ArchRuleDefinition;
-namespace Backbone.Tests.ArchUnit;
+namespace Backbone.Backbone.Tests.ArchUnit;
public class Cqrs
{
private static readonly IObjectProvider NON_ABSTRACT_CLASSES_IMPLEMENTING_IREQUEST =
diff --git a/Backbone.Tests.ArchUnit/CleanArchitecture.cs b/Backbone.Tests.ArchUnit/CleanArchitecture.cs
index 12fcc57760..30d535c142 100644
--- a/Backbone.Tests.ArchUnit/CleanArchitecture.cs
+++ b/Backbone.Tests.ArchUnit/CleanArchitecture.cs
@@ -3,7 +3,7 @@
using ArchUnitNET.xUnit;
using static ArchUnitNET.Fluent.ArchRuleDefinition;
-namespace Backbone.Tests.ArchUnit;
+namespace Backbone.Backbone.Tests.ArchUnit;
public class CleanArchitecture
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/AbstractModule.cs b/BuildingBlocks/src/BuildingBlocks.API/AbstractModule.cs
index bbab77d7be..f1d5a6f1f6 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/AbstractModule.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/AbstractModule.cs
@@ -1,8 +1,8 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-namespace Enmeshed.BuildingBlocks.API;
+namespace Backbone.BuildingBlocks.API;
public abstract class AbstractModule
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomLookupNormalizer.cs b/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomLookupNormalizer.cs
index f095e179a0..5a0ca38f7d 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomLookupNormalizer.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomLookupNormalizer.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Identity;
-namespace Enmeshed.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
+namespace Backbone.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
public class CustomLookupNormalizer : ILookupNormalizer
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomSigninManager.cs b/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomSigninManager.cs
index 371b18f6b3..000f2ea9de 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomSigninManager.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomSigninManager.cs
@@ -5,7 +5,7 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
-namespace Enmeshed.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
+namespace Backbone.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
public class CustomSigninManager : SignInManager
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomUserStore.cs b/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomUserStore.cs
index dd259a1369..75d03877d1 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomUserStore.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/AspNetCoreIdentityCustomizations/CustomUserStore.cs
@@ -5,7 +5,7 @@
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
-namespace Enmeshed.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
+namespace Backbone.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
public class CustomUserStore : UserStore
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Extensions/HealthCheckWriter.cs b/BuildingBlocks/src/BuildingBlocks.API/Extensions/HealthCheckWriter.cs
index 91f5d1c0c0..4bc497b945 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Extensions/HealthCheckWriter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Extensions/HealthCheckWriter.cs
@@ -3,7 +3,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Diagnostics.HealthChecks;
-namespace Enmeshed.BuildingBlocks.API.Extensions;
+namespace Backbone.BuildingBlocks.API.Extensions;
public static class HealthCheckWriter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs b/BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs
index 3e98461563..f2672be814 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Extensions/HostExtensions.cs
@@ -5,7 +5,7 @@
using Microsoft.Extensions.Logging;
using Polly;
-namespace Enmeshed.BuildingBlocks.API.Extensions;
+namespace Backbone.BuildingBlocks.API.Extensions;
public static class HostExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Extensions/IHostEnvironmentExtensions.cs b/BuildingBlocks/src/BuildingBlocks.API/Extensions/IHostEnvironmentExtensions.cs
index fc442b1d00..524a4a803b 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Extensions/IHostEnvironmentExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Extensions/IHostEnvironmentExtensions.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Hosting;
-namespace Enmeshed.BuildingBlocks.API.Extensions;
+namespace Backbone.BuildingBlocks.API.Extensions;
public static class IHostEnvironmentExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Extensions/ModelStateDictionaryExtensions.cs b/BuildingBlocks/src/BuildingBlocks.API/Extensions/ModelStateDictionaryExtensions.cs
index 7fb2560849..5752a85d51 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Extensions/ModelStateDictionaryExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Extensions/ModelStateDictionaryExtensions.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.ModelBinding;
-namespace Enmeshed.BuildingBlocks.API.Extensions;
+namespace Backbone.BuildingBlocks.API.Extensions;
public static class ModelStateDictionaryExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Extensions/ServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.API/Extensions/ServiceCollectionExtensions.cs
index 980f19fe0b..f18852eb7c 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Extensions/ServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Extensions/ServiceCollectionExtensions.cs
@@ -1,13 +1,13 @@
-using Backbone.Modules.Devices.Domain.Entities;
+using Backbone.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
+using Backbone.Modules.Devices.Domain.Entities;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.API.AspNetCoreIdentityCustomizations;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-namespace Enmeshed.BuildingBlocks.API.Extensions;
+namespace Backbone.BuildingBlocks.API.Extensions;
public static class ServiceCollectionExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/HttpError.cs b/BuildingBlocks/src/BuildingBlocks.API/HttpError.cs
index 9bedf8dc93..010c2302ae 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/HttpError.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/HttpError.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
-namespace Enmeshed.BuildingBlocks.API;
+namespace Backbone.BuildingBlocks.API;
//[JsonConverter(typeof(HttpErrorConverter))]
public class HttpError
diff --git a/BuildingBlocks/src/BuildingBlocks.API/HttpResponseEnvelope.cs b/BuildingBlocks/src/BuildingBlocks.API/HttpResponseEnvelope.cs
index 462ae70763..ba56034018 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/HttpResponseEnvelope.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/HttpResponseEnvelope.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.API;
+namespace Backbone.BuildingBlocks.API;
public class HttpResponseEnvelope
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/ApiControllerBase.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/ApiControllerBase.cs
index 08e30408d3..8c49486adf 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/ApiControllerBase.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/ApiControllerBase.cs
@@ -1,10 +1,10 @@
using System.Net.Mime;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-namespace Enmeshed.BuildingBlocks.API.Mvc;
+namespace Backbone.BuildingBlocks.API.Mvc;
[Produces(MediaTypeNames.Application.Json)]
[ApiController]
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/ControllerAttributes/ProducesErrorAttribute.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/ControllerAttributes/ProducesErrorAttribute.cs
index bddd58c6ef..62a1ee22a4 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/ControllerAttributes/ProducesErrorAttribute.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/ControllerAttributes/ProducesErrorAttribute.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc;
-namespace Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
+namespace Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
public class ProducesErrorAttribute : ProducesResponseTypeAttribute
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/ExceptionFilters/CustomExceptionFilter.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/ExceptionFilters/CustomExceptionFilter.cs
index 14df253a2e..d73040941a 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/ExceptionFilters/CustomExceptionFilter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/ExceptionFilters/CustomExceptionFilter.cs
@@ -1,11 +1,11 @@
using System.Net;
using System.Text.Json;
using System.Text.RegularExpressions;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
-using Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Infrastructure.Exceptions;
using Microsoft.ApplicationInsights.AspNetCore.Extensions;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
@@ -13,9 +13,9 @@
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
-namespace Enmeshed.BuildingBlocks.API.Mvc.ExceptionFilters;
+namespace Backbone.BuildingBlocks.API.Mvc.ExceptionFilters;
[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
public class CustomExceptionFilter : ExceptionFilterAttribute
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/DeviceIdJsonConverter.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/DeviceIdJsonConverter.cs
index 0505714b43..330e9d069b 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/DeviceIdJsonConverter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/DeviceIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
-namespace Enmeshed.BuildingBlocks.API.Mvc.JsonConverters;
+namespace Backbone.BuildingBlocks.API.Mvc.JsonConverters;
public class DeviceIdJsonConverter : JsonConverter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/IdentityAddressJsonConverter.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/IdentityAddressJsonConverter.cs
index a33c10aa60..bc9a04ba34 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/IdentityAddressJsonConverter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/IdentityAddressJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
-namespace Enmeshed.BuildingBlocks.API.Mvc.JsonConverters;
+namespace Backbone.BuildingBlocks.API.Mvc.JsonConverters;
public class IdentityAddressJsonConverter : JsonConverter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/UsernameJsonConverter.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/UsernameJsonConverter.cs
index 73d8cd21a7..be59cdd301 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/UsernameJsonConverter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/UsernameJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
-namespace Enmeshed.BuildingBlocks.API.Mvc.JsonConverters;
+namespace Backbone.BuildingBlocks.API.Mvc.JsonConverters;
public class UsernameJsonConverter : JsonConverter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/UtcDateTimeConverter.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/UtcDateTimeConverter.cs
index 48c9055130..08ba0f8739 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/UtcDateTimeConverter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/JsonConverters/UtcDateTimeConverter.cs
@@ -1,7 +1,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Enmeshed.BuildingBlocks.API.Mvc.JsonConverters;
+namespace Backbone.BuildingBlocks.API.Mvc.JsonConverters;
public class UtcDateTimeConverter : JsonConverter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/RequestResponseTimeMiddleware.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/RequestResponseTimeMiddleware.cs
index 1938f6afc0..8d9058d1db 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/RequestResponseTimeMiddleware.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/RequestResponseTimeMiddleware.cs
@@ -1,7 +1,7 @@
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.AspNetCore.Http;
-namespace Enmeshed.BuildingBlocks.API.Mvc.Middleware;
+namespace Backbone.BuildingBlocks.API.Mvc.Middleware;
public class RequestResponseTimeMiddleware
{
diff --git a/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/ResponseDurationMiddleware.cs b/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/ResponseDurationMiddleware.cs
index 81c0e9ba6a..fb2c9cd70c 100644
--- a/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/ResponseDurationMiddleware.cs
+++ b/BuildingBlocks/src/BuildingBlocks.API/Mvc/Middleware/ResponseDurationMiddleware.cs
@@ -1,7 +1,7 @@
using System.Diagnostics;
using Microsoft.AspNetCore.Http;
-namespace Enmeshed.BuildingBlocks.API.Mvc.Middleware;
+namespace Backbone.BuildingBlocks.API.Mvc.Middleware;
public class ResponseDurationMiddleware
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ActionForbiddenException.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ActionForbiddenException.cs
index 1cd6dab51c..ec3f2dd6d8 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ActionForbiddenException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ActionForbiddenException.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
public class ActionForbiddenException : ApplicationException
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ApplicationError.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ApplicationError.cs
index 0d1ac93dee..9ffb99940e 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ApplicationError.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ApplicationError.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
public class ApplicationError
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ApplicationException.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ApplicationException.cs
index da868c3c20..ccde396d04 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ApplicationException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ApplicationException.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
public class ApplicationException : Exception
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/GenericApplicationErrors.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/GenericApplicationErrors.cs
index c8b52e403e..eb227d5f67 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/GenericApplicationErrors.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/GenericApplicationErrors.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
public static class GenericApplicationErrors
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/NotFoundException.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/NotFoundException.cs
index feb112a02a..e7c4f240c3 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/NotFoundException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/NotFoundException.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
public class NotFoundException : ApplicationException
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/OperationFailedException.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/OperationFailedException.cs
index 480ec5c7de..1a8095e13b 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/OperationFailedException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/OperationFailedException.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
public class OperationFailedException : ApplicationException
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/QuotaExhaustedException.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/QuotaExhaustedException.cs
index c373d0bda6..f83f0d5e4e 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/QuotaExhaustedException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/QuotaExhaustedException.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
public class QuotaExhaustedException : ApplicationException
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ValidationException.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ValidationException.cs
index 7ca099c70e..e9b5df646c 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ValidationException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Exceptions/ValidationException.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
public class ValidationException : ApplicationException
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/Events/IntegrationEvent.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/Events/IntegrationEvent.cs
index 3d26ca6fe6..a7652a5f9e 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/Events/IntegrationEvent.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/Events/IntegrationEvent.cs
@@ -1,6 +1,6 @@
-using Enmeshed.Tooling;
+using Backbone.Tooling;
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
public class IntegrationEvent
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IDynamicIntegrationEventHandler.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IDynamicIntegrationEventHandler.cs
index 1458043679..9abd20f59c 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IDynamicIntegrationEventHandler.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IDynamicIntegrationEventHandler.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
public interface IDynamicIntegrationEventHandler
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IEventBus.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IEventBus.cs
index 425ef0aa39..a6c077c5d5 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IEventBus.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IEventBus.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
public interface IEventBus
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IIntegrationEventHandler.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IIntegrationEventHandler.cs
index f1d0c7444c..06c9f63e8b 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IIntegrationEventHandler.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/EventBus/IIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
public interface IIntegrationEventHandler : IIntegrationEventHandler
where TIntegrationEvent : IntegrationEvent
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Mapping/IHaveCustomMapping.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Mapping/IHaveCustomMapping.cs
index e54693008b..cacfa9dbeb 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Mapping/IHaveCustomMapping.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Mapping/IHaveCustomMapping.cs
@@ -1,6 +1,6 @@
using AutoMapper;
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
public interface IHaveCustomMapping
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Mapping/IMapTo.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Mapping/IMapTo.cs
index 91a9266ea2..753711d817 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Mapping/IMapTo.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Mapping/IMapTo.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
// ReSharper disable once UnusedTypeParameter
public interface IMapTo
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/BlobStorage/BlobAlreadyExistsException.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/BlobStorage/BlobAlreadyExistsException.cs
index d212f9f2db..bac40e839b 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/BlobStorage/BlobAlreadyExistsException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/BlobStorage/BlobAlreadyExistsException.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
public class BlobAlreadyExistsException : Exception
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/BlobStorage/IBlobStorage.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/BlobStorage/IBlobStorage.cs
index 757756603b..35b69fd5b0 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/BlobStorage/IBlobStorage.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/BlobStorage/IBlobStorage.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
public interface IBlobStorage
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/DbPaginationResult.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/DbPaginationResult.cs
index d18780e780..60187d4e0c 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/DbPaginationResult.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/DbPaginationResult.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
public class DbPaginationResult
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/IDbContext.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/IDbContext.cs
index 9ea76f32ce..04e4081c03 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/IDbContext.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/Database/IDbContext.cs
@@ -1,7 +1,7 @@
using System.Data;
using Microsoft.EntityFrameworkCore;
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
public interface IDbContext
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/IRepository.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/IRepository.cs
index 5e449b6b88..2a24920c18 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/IRepository.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/Persistence/IRepository.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence;
public interface IRepository where T : class
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/UserContext/IUserContext.cs b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/UserContext/IUserContext.cs
index 4244d71ca2..cbc6ba50d2 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/UserContext/IUserContext.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application.Abstractions/Infrastructure/UserContext/IUserContext.cs
@@ -1,6 +1,6 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
-namespace Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+namespace Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
public interface IUserContext
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Attributes/ApplyQuotasForMetricsAttribute.cs b/BuildingBlocks/src/BuildingBlocks.Application/Attributes/ApplyQuotasForMetricsAttribute.cs
index f228f1b5b2..3bb3eec8be 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/Attributes/ApplyQuotasForMetricsAttribute.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/Attributes/ApplyQuotasForMetricsAttribute.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
-namespace Enmeshed.BuildingBlocks.Application.Attributes;
+namespace Backbone.BuildingBlocks.Application.Attributes;
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
public class ApplyQuotasForMetricsAttribute : Attribute
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/AutoMapper/AutoMapperProfileBase.cs b/BuildingBlocks/src/BuildingBlocks.Application/AutoMapper/AutoMapperProfileBase.cs
index 361dd19435..a87e10b6f5 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/AutoMapper/AutoMapperProfileBase.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/AutoMapper/AutoMapperProfileBase.cs
@@ -1,7 +1,7 @@
using System.Reflection;
using AutoMapper;
-namespace Enmeshed.BuildingBlocks.Application.AutoMapper;
+namespace Backbone.BuildingBlocks.Application.AutoMapper;
public abstract class AutoMapperProfileBase : Profile
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/AutoMapper/MapperProfileHelper.cs b/BuildingBlocks/src/BuildingBlocks.Application/AutoMapper/MapperProfileHelper.cs
index bf77f4ba0f..c5b05a0204 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/AutoMapper/MapperProfileHelper.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/AutoMapper/MapperProfileHelper.cs
@@ -1,7 +1,7 @@
using System.Reflection;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-namespace Enmeshed.BuildingBlocks.Application.AutoMapper;
+namespace Backbone.BuildingBlocks.Application.AutoMapper;
internal static class MapperProfileHelper
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/CQRS/BaseClasses/CollectionCommandBase.cs b/BuildingBlocks/src/BuildingBlocks.Application/CQRS/BaseClasses/CollectionCommandBase.cs
index 9bf866ba61..c381b82d03 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/CQRS/BaseClasses/CollectionCommandBase.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/CQRS/BaseClasses/CollectionCommandBase.cs
@@ -1,7 +1,7 @@
using System.Collections;
using MediatR;
-namespace Enmeshed.BuildingBlocks.Application.CQRS.BaseClasses;
+namespace Backbone.BuildingBlocks.Application.CQRS.BaseClasses;
public abstract class CollectionCommandBase : IRequest, ICollection
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/CQRS/BaseClasses/EnumerableResponseBase.cs b/BuildingBlocks/src/BuildingBlocks.Application/CQRS/BaseClasses/EnumerableResponseBase.cs
index 6eaaae2421..2e7d865358 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/CQRS/BaseClasses/EnumerableResponseBase.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/CQRS/BaseClasses/EnumerableResponseBase.cs
@@ -1,6 +1,6 @@
using System.Collections;
-namespace Enmeshed.BuildingBlocks.Application.CQRS.BaseClasses;
+namespace Backbone.BuildingBlocks.Application.CQRS.BaseClasses;
public abstract class EnumerableResponseBase : IEnumerable
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Extensions/DbSetExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Application/Extensions/DbSetExtensions.cs
index bbb8b1e69b..422da045d5 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/Extensions/DbSetExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/Extensions/DbSetExtensions.cs
@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
-namespace Enmeshed.BuildingBlocks.Application.Extensions;
+namespace Backbone.BuildingBlocks.Application.Extensions;
public static class DbSetExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Extensions/DbUpdateExceptionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Application/Extensions/DbUpdateExceptionExtensions.cs
index bac907c181..61e1820997 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/Extensions/DbUpdateExceptionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/Extensions/DbUpdateExceptionExtensions.cs
@@ -1,7 +1,7 @@
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
-namespace Enmeshed.BuildingBlocks.Application.Extensions;
+namespace Backbone.BuildingBlocks.Application.Extensions;
public enum DbUpdateExceptionReason
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Extensions/IQueryableExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Application/Extensions/IQueryableExtensions.cs
index e08c0bd04b..2154b7d297 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/Extensions/IQueryableExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/Extensions/IQueryableExtensions.cs
@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
-namespace Enmeshed.BuildingBlocks.Application.Extensions;
+namespace Backbone.BuildingBlocks.Application.Extensions;
public static class IQueryableExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Extensions/IQueryablePaginationExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Application/Extensions/IQueryablePaginationExtensions.cs
index 1844b99e7c..e7fc6dadbc 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/Extensions/IQueryablePaginationExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/Extensions/IQueryablePaginationExtensions.cs
@@ -1,10 +1,10 @@
using System.Collections;
using System.Linq.Expressions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
using Microsoft.EntityFrameworkCore;
-namespace Enmeshed.BuildingBlocks.Application.Extensions;
+namespace Backbone.BuildingBlocks.Application.Extensions;
public static class IQueryablePaginationExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/DetailedNotEmptyValidator.cs b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/DetailedNotEmptyValidator.cs
index 1b682892b3..9fcbae6784 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/DetailedNotEmptyValidator.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/DetailedNotEmptyValidator.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using FluentValidation;
-namespace Enmeshed.BuildingBlocks.Application.FluentValidation;
+namespace Backbone.BuildingBlocks.Application.FluentValidation;
public static class DetailedNotEmptyValidatorRuleBuilderExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/DetailedNotNullValidator.cs b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/DetailedNotNullValidator.cs
index 9a403c8a6a..e1eb9a633d 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/DetailedNotNullValidator.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/DetailedNotNullValidator.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using FluentValidation;
-namespace Enmeshed.BuildingBlocks.Application.FluentValidation;
+namespace Backbone.BuildingBlocks.Application.FluentValidation;
public static class DetailedNotNullValidatorRuleBuilderExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/IRuleBuilderExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/IRuleBuilderExtensions.cs
index ebac9c4ea6..8f0fea2691 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/IRuleBuilderExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/IRuleBuilderExtensions.cs
@@ -1,8 +1,8 @@
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
using FluentValidation;
using FluentValidation.Results;
-namespace Enmeshed.BuildingBlocks.Application.FluentValidation;
+namespace Backbone.BuildingBlocks.Application.FluentValidation;
public static class IRuleBuilderExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/NumberOfBytesValidator.cs b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/NumberOfBytesValidator.cs
index 95a0ee8526..b59d255005 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/NumberOfBytesValidator.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/NumberOfBytesValidator.cs
@@ -1,8 +1,8 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using FluentValidation;
using FluentValidation.Validators;
-namespace Enmeshed.BuildingBlocks.Application.FluentValidation;
+namespace Backbone.BuildingBlocks.Application.FluentValidation;
public class NumberOfBytesValidator : PropertyValidator, ILengthValidator
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/UniqueCollectionValidator.cs b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/UniqueCollectionValidator.cs
index 1ceee81638..5076c522af 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/UniqueCollectionValidator.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/UniqueCollectionValidator.cs
@@ -1,8 +1,8 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using FluentValidation;
using FluentValidation.Validators;
-namespace Enmeshed.BuildingBlocks.Application.FluentValidation;
+namespace Backbone.BuildingBlocks.Application.FluentValidation;
public class UniqueCollectionValidator : PropertyValidator>
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/ValueInValidator.cs b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/ValueInValidator.cs
index e751566bd2..e5010ed934 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/ValueInValidator.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/FluentValidation/ValueInValidator.cs
@@ -1,9 +1,9 @@
using System.Collections;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using FluentValidation;
using FluentValidation.Validators;
-namespace Enmeshed.BuildingBlocks.Application.FluentValidation;
+namespace Backbone.BuildingBlocks.Application.FluentValidation;
public class ValueInValidator : PropertyValidator
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/MediatR/LoggingBehavior.cs b/BuildingBlocks/src/BuildingBlocks.Application/MediatR/LoggingBehavior.cs
index dabbf09204..47b6b1a099 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/MediatR/LoggingBehavior.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/MediatR/LoggingBehavior.cs
@@ -2,7 +2,7 @@
using MediatR;
using Microsoft.Extensions.Logging;
-namespace Enmeshed.BuildingBlocks.Application.MediatR;
+namespace Backbone.BuildingBlocks.Application.MediatR;
public class LoggingBehavior : IPipelineBehavior
where TRequest : IRequest
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/MediatR/QuotaEnforcerBehavior.cs b/BuildingBlocks/src/BuildingBlocks.Application/MediatR/QuotaEnforcerBehavior.cs
index 9bc644f9d5..130d980675 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/MediatR/QuotaEnforcerBehavior.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/MediatR/QuotaEnforcerBehavior.cs
@@ -1,12 +1,12 @@
using System.Collections.ObjectModel;
using System.Reflection;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Attributes;
-using Enmeshed.BuildingBlocks.Application.QuotaCheck;
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Attributes;
+using Backbone.BuildingBlocks.Application.QuotaCheck;
+using Backbone.BuildingBlocks.Domain;
using MediatR;
-namespace Enmeshed.BuildingBlocks.Application.MediatR;
+namespace Backbone.BuildingBlocks.Application.MediatR;
public class QuotaEnforcerBehavior : IPipelineBehavior where TRequest : notnull
{
private readonly IQuotaChecker _quotaChecker;
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/MediatR/RequestValidationBehavior.cs b/BuildingBlocks/src/BuildingBlocks.Application/MediatR/RequestValidationBehavior.cs
index 1caf974d86..a8cffef3cf 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/MediatR/RequestValidationBehavior.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/MediatR/RequestValidationBehavior.cs
@@ -1,9 +1,9 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using FluentValidation;
using MediatR;
-using ValidationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ValidationException;
+using ValidationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ValidationException;
-namespace Enmeshed.BuildingBlocks.Application.MediatR;
+namespace Backbone.BuildingBlocks.Application.MediatR;
public class RequestValidationBehavior : IPipelineBehavior
where TRequest : IRequest
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Pagination/PagedResponse.cs b/BuildingBlocks/src/BuildingBlocks.Application/Pagination/PagedResponse.cs
index 3913b85a77..94f1b1c445 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/Pagination/PagedResponse.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/Pagination/PagedResponse.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Application.CQRS.BaseClasses;
+using Backbone.BuildingBlocks.Application.CQRS.BaseClasses;
-namespace Enmeshed.BuildingBlocks.Application.Pagination;
+namespace Backbone.BuildingBlocks.Application.Pagination;
public class PagedResponse : EnumerableResponseBase
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/Pagination/PaginationFilter.cs b/BuildingBlocks/src/BuildingBlocks.Application/Pagination/PaginationFilter.cs
index c4d2e3ee8f..16cf77bdfa 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/Pagination/PaginationFilter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/Pagination/PaginationFilter.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Application.Pagination;
+namespace Backbone.BuildingBlocks.Application.Pagination;
public class PaginationFilter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/AlwaysSuccessQuotaChecker.cs b/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/AlwaysSuccessQuotaChecker.cs
index a046545174..0cdb03d056 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/AlwaysSuccessQuotaChecker.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/AlwaysSuccessQuotaChecker.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
-namespace Enmeshed.BuildingBlocks.Application.QuotaCheck;
+namespace Backbone.BuildingBlocks.Application.QuotaCheck;
public class AlwaysSuccessQuotaChecker : IQuotaChecker
{
public Task CheckQuotaExhaustion(IEnumerable metricKeys)
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/CheckQuotaResult.cs b/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/CheckQuotaResult.cs
index a5f8ce7455..a1228ee81a 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/CheckQuotaResult.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/CheckQuotaResult.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
-namespace Enmeshed.BuildingBlocks.Application.QuotaCheck;
+namespace Backbone.BuildingBlocks.Application.QuotaCheck;
public class CheckQuotaResult
{
public CheckQuotaResult(IEnumerable exhaustedStatuses)
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/IQuotaChecker.cs b/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/IQuotaChecker.cs
index 5c171af434..a7c7faba93 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/IQuotaChecker.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/IQuotaChecker.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
-namespace Enmeshed.BuildingBlocks.Application.QuotaCheck;
+namespace Backbone.BuildingBlocks.Application.QuotaCheck;
public interface IQuotaChecker
{
Task CheckQuotaExhaustion(IEnumerable metricKeys);
diff --git a/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/QuotaCheckerImpl.cs b/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/QuotaCheckerImpl.cs
index fcc6871456..9888a9d1e0 100644
--- a/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/QuotaCheckerImpl.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Application/QuotaCheck/QuotaCheckerImpl.cs
@@ -1,8 +1,8 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.Common.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Common.Infrastructure.Persistence.Repository;
-namespace Enmeshed.BuildingBlocks.Application.QuotaCheck;
+namespace Backbone.BuildingBlocks.Application.QuotaCheck;
public class QuotaCheckerImpl : IQuotaChecker
{
private readonly IUserContext _userContext;
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/DomainException.cs b/BuildingBlocks/src/BuildingBlocks.Domain/DomainException.cs
index b45421807b..18f05350b5 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/DomainException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/DomainException.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
-namespace Enmeshed.BuildingBlocks.Domain;
+namespace Backbone.BuildingBlocks.Domain;
public class DomainException : Exception
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/Errors/DomainError.cs b/BuildingBlocks/src/BuildingBlocks.Domain/Errors/DomainError.cs
index 4c608afab5..18606893a3 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/Errors/DomainError.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/Errors/DomainError.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Domain.Errors;
+namespace Backbone.BuildingBlocks.Domain.Errors;
public class DomainError
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/Errors/GenericDomainErrors.cs b/BuildingBlocks/src/BuildingBlocks.Domain/Errors/GenericDomainErrors.cs
index 5a93f250a0..faeded71a9 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/Errors/GenericDomainErrors.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/Errors/GenericDomainErrors.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Domain.Errors;
+namespace Backbone.BuildingBlocks.Domain.Errors;
public static class GenericDomainErrors
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/InvalidIdException.cs b/BuildingBlocks/src/BuildingBlocks.Domain/InvalidIdException.cs
index 3bc6bc9c5d..5696142000 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/InvalidIdException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/InvalidIdException.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Domain;
+namespace Backbone.BuildingBlocks.Domain;
public class InvalidIdException : Exception
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/MetricKey.cs b/BuildingBlocks/src/BuildingBlocks.Domain/MetricKey.cs
index 353b1eba9e..d4e354e0fa 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/MetricKey.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/MetricKey.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Domain;
+namespace Backbone.BuildingBlocks.Domain;
public record MetricKey(string Value)
{
public string Value { get; } = Value;
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/MetricStatus.cs b/BuildingBlocks/src/BuildingBlocks.Domain/MetricStatus.cs
index 44443f219d..9d271bba2d 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/MetricStatus.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/MetricStatus.cs
@@ -1,6 +1,6 @@
-using Enmeshed.Tooling;
+using Backbone.Tooling;
-namespace Enmeshed.BuildingBlocks.Domain;
+namespace Backbone.BuildingBlocks.Domain;
public class MetricStatus
{
public bool IsExhausted => IsExhaustedUntil.HasValue && IsExhaustedUntil > SystemTime.UtcNow;
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/StringExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Domain/StringExtensions.cs
index 340a9809e6..a1237feebe 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/StringExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/StringExtensions.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Domain;
+namespace Backbone.BuildingBlocks.Domain;
public static class StringExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/StringUtils.cs b/BuildingBlocks/src/BuildingBlocks.Domain/StringUtils.cs
index ab3de4bc86..532561e6d8 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/StringUtils.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/StringUtils.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Domain;
+namespace Backbone.BuildingBlocks.Domain;
public static class StringUtils
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Classes/StronglyTypedId.cs b/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Classes/StronglyTypedId.cs
index ceb95e26da..1f6be5ef17 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Classes/StronglyTypedId.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Classes/StronglyTypedId.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+namespace Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
public class StronglyTypedIdHelpers
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Records/StronglyTypedId.cs b/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Records/StronglyTypedId.cs
index 74d8e544bb..c2a382fa1a 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Records/StronglyTypedId.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Records/StronglyTypedId.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Records;
+namespace Backbone.BuildingBlocks.Domain.StronglyTypedIds.Records;
public abstract record StronglyTypedId(string Value)
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Records/StronglyTypedIdHelpers.cs b/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Records/StronglyTypedIdHelpers.cs
index ea96949d15..a9effebf39 100644
--- a/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Records/StronglyTypedIdHelpers.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Domain/StronglyTypedIds/Records/StronglyTypedIdHelpers.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
-namespace Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Records;
+namespace Backbone.BuildingBlocks.Domain.StronglyTypedIds.Records;
public class StronglyTypedIdHelpers
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/AzureServiceBusServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/AzureServiceBusServiceCollectionExtensions.cs
index e083b63c1a..f462ea2f83 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/AzureServiceBusServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/AzureServiceBusServiceCollectionExtensions.cs
@@ -1,9 +1,9 @@
using Autofac;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
public static class AzureServiceBusServiceCollectionExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/DefaultServiceBusPersisterConnection.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/DefaultServiceBusPersisterConnection.cs
index 4c3657c6af..6754bab890 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/DefaultServiceBusPersisterConnection.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/DefaultServiceBusPersisterConnection.cs
@@ -1,7 +1,7 @@
using Azure.Messaging.ServiceBus;
using Azure.Messaging.ServiceBus.Administration;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
public class DefaultServiceBusPersisterConnection : IServiceBusPersisterConnection
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.cs
index 96e0303f8a..6b69b844b9 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/EventBusAzureServiceBus.cs
@@ -2,13 +2,13 @@
using Autofac;
using Azure.Messaging.ServiceBus;
using Azure.Messaging.ServiceBus.Administration;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus.Json;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Infrastructure.EventBus.Json;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
public class EventBusAzureServiceBus : IEventBus, IDisposable
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/IServiceBusPersisterConnection.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/IServiceBusPersisterConnection.cs
index 7507f0bb3a..42541d8154 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/IServiceBusPersisterConnection.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/AzureServiceBus/IServiceBusPersisterConnection.cs
@@ -1,7 +1,7 @@
using Azure.Messaging.ServiceBus;
using Azure.Messaging.ServiceBus.Administration;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.AzureServiceBus;
public interface IServiceBusPersisterConnection : IDisposable
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/BasicBusOptions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/BasicBusOptions.cs
index b2a3d57ead..41beb62b61 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/BasicBusOptions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/BasicBusOptions.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus;
public class BasicBusOptions
{
#pragma warning disable CS8618
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/EventBusRetryPolicyFactory.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/EventBusRetryPolicyFactory.cs
index ccf734229b..38f8dc0342 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/EventBusRetryPolicyFactory.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/EventBusRetryPolicyFactory.cs
@@ -1,7 +1,7 @@
using Polly;
using Polly.Retry;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus;
internal class EventBusRetryPolicyFactory
{
static internal AsyncRetryPolicy Create(HandlerRetryBehavior handlerRetryBehavior, Action onRetry)
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/DefaultGoogleCloudPubSubPersisterConnection.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/DefaultGoogleCloudPubSubPersisterConnection.cs
index cc0d1e349e..5c9b2905bf 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/DefaultGoogleCloudPubSubPersisterConnection.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/DefaultGoogleCloudPubSubPersisterConnection.cs
@@ -1,9 +1,9 @@
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Google.Api.Gax;
using Google.Apis.Auth.OAuth2;
using Google.Cloud.PubSub.V1;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
public class DefaultGoogleCloudPubSubPersisterConnection : IGoogleCloudPubSubPersisterConnection
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.cs
index deb1b52515..b71d1f53af 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/EventBusGoogleCloudPubSub.cs
@@ -1,14 +1,14 @@
using System.Text.RegularExpressions;
using Autofac;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus.Json;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Infrastructure.EventBus.Json;
using Google.Cloud.PubSub.V1;
using Google.Protobuf;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
public class EventBusGoogleCloudPubSub : IEventBus, IDisposable
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/GoogleCloudPubSubServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/GoogleCloudPubSubServiceCollectionExtensions.cs
index e90c9e6d94..3f4ff3588a 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/GoogleCloudPubSubServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/GoogleCloudPubSubServiceCollectionExtensions.cs
@@ -1,9 +1,9 @@
using Autofac;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
public static class GoogleCloudPubSubServiceCollectionExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/IGoogleCloudPubSubPersisterConnection.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/IGoogleCloudPubSubPersisterConnection.cs
index 90d959a0fe..575d06b1ad 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/IGoogleCloudPubSubPersisterConnection.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/GoogleCloudPubSub/IGoogleCloudPubSubPersisterConnection.cs
@@ -1,6 +1,6 @@
using Google.Cloud.PubSub.V1;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
public interface IGoogleCloudPubSubPersisterConnection
: IDisposable
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/HandlerRetryBehavior.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/HandlerRetryBehavior.cs
index e0e90adc4f..7d99fde97d 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/HandlerRetryBehavior.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/HandlerRetryBehavior.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus;
public class HandlerRetryBehavior
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/IEventBusSubscriptionsManager.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/IEventBusSubscriptionsManager.cs
index 51c4ecd26f..cbee263f0c 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/IEventBusSubscriptionsManager.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/IEventBusSubscriptionsManager.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus;
public interface IEventBusSubscriptionsManager
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/InMemoryEventBusSubscriptionsManager.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/InMemoryEventBusSubscriptionsManager.cs
index 39aa4e40b6..dc88d55ef9 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/InMemoryEventBusSubscriptionsManager.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/InMemoryEventBusSubscriptionsManager.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus;
public class InMemoryEventBusSubscriptionsManager : IEventBusSubscriptionsManager
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/Json/ContractResolverWithPrivates.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/Json/ContractResolverWithPrivates.cs
index f62f971d63..30f432bd89 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/Json/ContractResolverWithPrivates.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/Json/ContractResolverWithPrivates.cs
@@ -2,7 +2,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.Json;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.Json;
public class ContractResolverWithPrivates : CamelCasePropertyNamesContractResolver
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/DefaultRabbitMQPersisterConnection.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/DefaultRabbitMQPersisterConnection.cs
index 9d01d14c7f..68ab00b1eb 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/DefaultRabbitMQPersisterConnection.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/DefaultRabbitMQPersisterConnection.cs
@@ -5,7 +5,7 @@
using RabbitMQ.Client.Events;
using RabbitMQ.Client.Exceptions;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
public class DefaultRabbitMqPersistentConnection
: IRabbitMqPersistentConnection
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMQ.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMQ.cs
index 5ff1108ae7..d7ff37bb2a 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMQ.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/EventBusRabbitMQ.cs
@@ -1,9 +1,9 @@
using System.Net.Sockets;
using System.Text;
using Autofac;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus.Json;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Infrastructure.EventBus.Json;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Polly;
@@ -11,7 +11,7 @@
using RabbitMQ.Client.Events;
using RabbitMQ.Client.Exceptions;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
public class EventBusRabbitMq : IEventBus, IDisposable
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/IRabbitMQPersisterConnection.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/IRabbitMQPersisterConnection.cs
index 0e9da788ac..7f5173863b 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/IRabbitMQPersisterConnection.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/IRabbitMQPersisterConnection.cs
@@ -1,6 +1,6 @@
using RabbitMQ.Client;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
public interface IRabbitMqPersistentConnection
: IDisposable
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/RabbitMQServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/RabbitMQServiceCollectionExtensions.cs
index 68400293ea..b631f2b23c 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/RabbitMQServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/EventBus/RabbitMQ/RabbitMQServiceCollectionExtensions.cs
@@ -1,10 +1,10 @@
using Autofac;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using RabbitMQ.Client;
-namespace Enmeshed.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
+namespace Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
public static class RabbitMqServiceCollectionExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/GenericInfrastructureErrors.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/GenericInfrastructureErrors.cs
index 7b28de4874..f8d3ae117e 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/GenericInfrastructureErrors.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/GenericInfrastructureErrors.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
+namespace Backbone.BuildingBlocks.Infrastructure.Exceptions;
public static class GenericInfrastructureErrors
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/InfrastructureError.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/InfrastructureError.cs
index 008f141ca9..7d456b40fb 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/InfrastructureError.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/InfrastructureError.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
+namespace Backbone.BuildingBlocks.Infrastructure.Exceptions;
public class InfrastructureError
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/InfrastructureException.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/InfrastructureException.cs
index ebc700624c..b9634fa01c 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/InfrastructureException.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Exceptions/InfrastructureException.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
+namespace Backbone.BuildingBlocks.Infrastructure.Exceptions;
public class InfrastructureException : Exception
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccount.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccount.cs
index d1b5996998..163c21d9d9 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccount.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccount.cs
@@ -1,10 +1,10 @@
using Azure;
using Azure.Storage.Blobs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Microsoft.Extensions.Logging;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
public class AzureStorageAccount : IBlobStorage, IDisposable
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountContainerClientFactory.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountContainerClientFactory.cs
index f28476df2a..9a2553513d 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountContainerClientFactory.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountContainerClientFactory.cs
@@ -4,7 +4,7 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
public class AzureStorageAccountContainerClientFactory
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountServiceCollectionExtensions.cs
index dd7dc6595f..2b3cfea7bd 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/AzureStorageAccount/AzureStorageAccountServiceCollectionExtensions.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Microsoft.Extensions.DependencyInjection;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
public static class AzureStorageAccountServiceCollectionExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/BlobStorageServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/BlobStorageServiceCollectionExtensions.cs
index f98deb463e..31f70030be 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/BlobStorageServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/BlobStorageServiceCollectionExtensions.cs
@@ -1,9 +1,9 @@
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage;
+using Backbone.Tooling.Extensions;
using Microsoft.Extensions.DependencyInjection;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
public static class BlobStorageServiceCollectionExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/GoogleCloudStorage/GoogleCloudStorage.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/GoogleCloudStorage/GoogleCloudStorage.cs
index 374d1a7599..6b06db8577 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/GoogleCloudStorage/GoogleCloudStorage.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/GoogleCloudStorage/GoogleCloudStorage.cs
@@ -1,11 +1,11 @@
using System.Net;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Google;
using Google.Cloud.Storage.V1;
using Microsoft.Extensions.Logging;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage;
public class GoogleCloudStorage : IBlobStorage, IDisposable
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/GoogleCloudStorage/GoogleCloudStorageServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/GoogleCloudStorage/GoogleCloudStorageServiceCollectionExtensions.cs
index 2e9d2ade6f..ac5c0bdaa9 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/GoogleCloudStorage/GoogleCloudStorageServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/BlobStorage/GoogleCloudStorage/GoogleCloudStorageServiceCollectionExtensions.cs
@@ -1,11 +1,11 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.Tooling.Extensions;
using Google.Apis.Auth.OAuth2;
using Google.Cloud.Storage.V1;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage;
public static class GoogleCloudStorageServiceCollectionExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/AbstractDbContextBase.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/AbstractDbContextBase.cs
index 2540ab7937..d2dd9b9dec 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/AbstractDbContextBase.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/AbstractDbContextBase.cs
@@ -1,14 +1,14 @@
using System.Data;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling.Extensions;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.DependencyInjection;
using Npgsql.EntityFrameworkCore.PostgreSQL;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
public class AbstractDbContextBase : DbContext, IDbContext
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/DbContextOptionsBuilderExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/DbContextOptionsBuilderExtensions.cs
index 3fb0d633d9..01e382af41 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/DbContextOptionsBuilderExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/DbContextOptionsBuilderExtensions.cs
@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
public static class DbContextOptionsBuilderExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
index 5dbe5e9241..3368ee3041 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
public static class IServiceCollectionExtensions
{
public static IServiceCollection AddSaveChangesTimeInterceptor(this IServiceCollection services)
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ModelBuilderExtensions.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ModelBuilderExtensions.cs
index f111b4f368..211b2867e0 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ModelBuilderExtensions.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ModelBuilderExtensions.cs
@@ -1,7 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
public static class ModelBuilderExtensions
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/SaveChangesTimeInterceptor.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/SaveChangesTimeInterceptor.cs
index aa840ae645..3c54debc4b 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/SaveChangesTimeInterceptor.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/SaveChangesTimeInterceptor.cs
@@ -1,9 +1,9 @@
using System.Diagnostics;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.Extensions.Logging;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
public class SaveChangesTimeInterceptor : SaveChangesInterceptor
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/DateTimeValueConverter.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/DateTimeValueConverter.cs
index e553282529..da987cef3b 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/DateTimeValueConverter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/DateTimeValueConverter.cs
@@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
public class DateTimeValueConverter : ValueConverter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/DeviceIdValueConverter.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/DeviceIdValueConverter.cs
index 5ef2f7cd96..0c02470b90 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/DeviceIdValueConverter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/DeviceIdValueConverter.cs
@@ -1,7 +1,7 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
public class DeviceIdValueConverter : ValueConverter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/IdentityAddressValueConverter.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/IdentityAddressValueConverter.cs
index 324c00273d..9613877800 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/IdentityAddressValueConverter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/IdentityAddressValueConverter.cs
@@ -1,7 +1,7 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
public class IdentityAddressValueConverter : ValueConverter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/UsernameValueConverter.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/UsernameValueConverter.cs
index eb02050dee..918109efd8 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/UsernameValueConverter.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Database/ValueConverters/UsernameValueConverter.cs
@@ -1,7 +1,7 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
public class UsernameValueConverter : ValueConverter
{
diff --git a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Repository/AbstractEntityFrameworkRepository.cs b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Repository/AbstractEntityFrameworkRepository.cs
index de71d42b4c..54e6028f46 100644
--- a/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Repository/AbstractEntityFrameworkRepository.cs
+++ b/BuildingBlocks/src/BuildingBlocks.Infrastructure/Persistence/Repository/AbstractEntityFrameworkRepository.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Persistence.Repository;
+namespace Backbone.BuildingBlocks.Infrastructure.Persistence.Repository;
public abstract class AbstractEntityFrameworkRepository : IRepository where T : class
{
diff --git a/BuildingBlocks/src/Crypto/Abstractions/IKeyAgreementHelper.cs b/BuildingBlocks/src/Crypto/Abstractions/IKeyAgreementHelper.cs
index 70505ceee5..74938838c8 100644
--- a/BuildingBlocks/src/Crypto/Abstractions/IKeyAgreementHelper.cs
+++ b/BuildingBlocks/src/Crypto/Abstractions/IKeyAgreementHelper.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Crypto.Abstractions;
+namespace Backbone.Crypto.Abstractions;
public interface IKeyAgreementHelper
{
diff --git a/BuildingBlocks/src/Crypto/Abstractions/IKeyGenerator.cs b/BuildingBlocks/src/Crypto/Abstractions/IKeyGenerator.cs
index 18f5aa15e6..3d589fbef0 100644
--- a/BuildingBlocks/src/Crypto/Abstractions/IKeyGenerator.cs
+++ b/BuildingBlocks/src/Crypto/Abstractions/IKeyGenerator.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Crypto.Abstractions;
+namespace Backbone.Crypto.Abstractions;
public interface IKeyGenerator
{
diff --git a/BuildingBlocks/src/Crypto/Abstractions/ISignatureHelper.cs b/BuildingBlocks/src/Crypto/Abstractions/ISignatureHelper.cs
index 236fab2cce..1492123ec5 100644
--- a/BuildingBlocks/src/Crypto/Abstractions/ISignatureHelper.cs
+++ b/BuildingBlocks/src/Crypto/Abstractions/ISignatureHelper.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Crypto.Abstractions;
+namespace Backbone.Crypto.Abstractions;
public interface ISignatureHelper
{
diff --git a/BuildingBlocks/src/Crypto/Abstractions/ISymmetricEncrypter.cs b/BuildingBlocks/src/Crypto/Abstractions/ISymmetricEncrypter.cs
index 8a7c62f57c..13156a8498 100644
--- a/BuildingBlocks/src/Crypto/Abstractions/ISymmetricEncrypter.cs
+++ b/BuildingBlocks/src/Crypto/Abstractions/ISymmetricEncrypter.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Crypto.Abstractions;
+namespace Backbone.Crypto.Abstractions;
public interface ISymmetricEncrypter
{
diff --git a/BuildingBlocks/src/Crypto/ConvertibleString.cs b/BuildingBlocks/src/Crypto/ConvertibleString.cs
index ea72411455..5e7ef12bd1 100644
--- a/BuildingBlocks/src/Crypto/ConvertibleString.cs
+++ b/BuildingBlocks/src/Crypto/ConvertibleString.cs
@@ -1,6 +1,6 @@
using System.Text;
-namespace Enmeshed.Crypto;
+namespace Backbone.Crypto;
public class ConvertibleString
{
diff --git a/BuildingBlocks/src/Crypto/ExtensionMethods/IEnumerableExtensions.cs b/BuildingBlocks/src/Crypto/ExtensionMethods/IEnumerableExtensions.cs
index c49d2ecd1f..3d0910d4a1 100644
--- a/BuildingBlocks/src/Crypto/ExtensionMethods/IEnumerableExtensions.cs
+++ b/BuildingBlocks/src/Crypto/ExtensionMethods/IEnumerableExtensions.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Crypto.ExtensionMethods;
+namespace Backbone.Crypto.ExtensionMethods;
public static class IEnumerableExtensions
{
diff --git a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/Asymmetric/EllipticCurveSignatureHelper.cs b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/Asymmetric/EllipticCurveSignatureHelper.cs
index 86ed4716be..45a14a7cfc 100644
--- a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/Asymmetric/EllipticCurveSignatureHelper.cs
+++ b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/Asymmetric/EllipticCurveSignatureHelper.cs
@@ -1,9 +1,9 @@
-using Enmeshed.Crypto.Abstractions;
-using Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.ExtensionMethods;
+using Backbone.Crypto.Abstractions;
+using Backbone.Crypto.Implementations.Deprecated.BouncyCastle.ExtensionMethods;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Security;
-namespace Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.Asymmetric;
+namespace Backbone.Crypto.Implementations.Deprecated.BouncyCastle.Asymmetric;
public class EllipticCurveSignatureHelper : ISignatureHelper
{
diff --git a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/ExtensionMethods/GcmBlockCipherExtensions.cs b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/ExtensionMethods/GcmBlockCipherExtensions.cs
index 33dee6d185..6fd2a536a9 100644
--- a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/ExtensionMethods/GcmBlockCipherExtensions.cs
+++ b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/ExtensionMethods/GcmBlockCipherExtensions.cs
@@ -1,7 +1,7 @@
using Org.BouncyCastle.Crypto.Modes;
using Org.BouncyCastle.Crypto.Parameters;
-namespace Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.ExtensionMethods;
+namespace Backbone.Crypto.Implementations.Deprecated.BouncyCastle.ExtensionMethods;
public static class GcmBlockCipherExtensions
{
diff --git a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/ExtensionMethods/ISignerExtensions.cs b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/ExtensionMethods/ISignerExtensions.cs
index 82ddbb9098..4f0657b029 100644
--- a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/ExtensionMethods/ISignerExtensions.cs
+++ b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/ExtensionMethods/ISignerExtensions.cs
@@ -1,7 +1,7 @@
using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Parameters;
-namespace Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.ExtensionMethods;
+namespace Backbone.Crypto.Implementations.Deprecated.BouncyCastle.ExtensionMethods;
// ReSharper disable once InconsistentNaming
internal static class ISignerExtensions
diff --git a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/KeyGenerator.cs b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/KeyGenerator.cs
index 0e8a344371..718fa1f669 100644
--- a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/KeyGenerator.cs
+++ b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/KeyGenerator.cs
@@ -1,8 +1,8 @@
-using Enmeshed.Crypto.Abstractions;
+using Backbone.Crypto.Abstractions;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Security;
-namespace Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle;
+namespace Backbone.Crypto.Implementations.Deprecated.BouncyCastle;
public class KeyGenerator : IKeyGenerator
{
diff --git a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/Symmetric/AesSymmetricEncrypter.cs b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/Symmetric/AesSymmetricEncrypter.cs
index fce0c7b37b..37a002ff11 100644
--- a/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/Symmetric/AesSymmetricEncrypter.cs
+++ b/BuildingBlocks/src/Crypto/Implementations/Deprecated/BouncyCastle/Symmetric/AesSymmetricEncrypter.cs
@@ -1,12 +1,12 @@
-using Enmeshed.Crypto.Abstractions;
-using Enmeshed.Crypto.ExtensionMethods;
-using Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.ExtensionMethods;
+using Backbone.Crypto.Abstractions;
+using Backbone.Crypto.ExtensionMethods;
+using Backbone.Crypto.Implementations.Deprecated.BouncyCastle.ExtensionMethods;
using Org.BouncyCastle.Crypto.Engines;
using Org.BouncyCastle.Crypto.Modes;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Security;
-namespace Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.Symmetric;
+namespace Backbone.Crypto.Implementations.Deprecated.BouncyCastle.Symmetric;
public class AesSymmetricEncrypter : ISymmetricEncrypter
{
diff --git a/BuildingBlocks/src/Crypto/Implementations/KeyAgreementHelper.cs b/BuildingBlocks/src/Crypto/Implementations/KeyAgreementHelper.cs
index 5b422a0748..872ac55dec 100644
--- a/BuildingBlocks/src/Crypto/Implementations/KeyAgreementHelper.cs
+++ b/BuildingBlocks/src/Crypto/Implementations/KeyAgreementHelper.cs
@@ -1,7 +1,7 @@
-using Enmeshed.Crypto.Abstractions;
+using Backbone.Crypto.Abstractions;
using NSec.Cryptography;
-namespace Enmeshed.Crypto.Implementations;
+namespace Backbone.Crypto.Implementations;
public class KeyAgreementHelper : IKeyAgreementHelper
{
diff --git a/BuildingBlocks/src/Crypto/Implementations/KeyGenerator.cs b/BuildingBlocks/src/Crypto/Implementations/KeyGenerator.cs
index 5d65913a82..5e86a439a1 100644
--- a/BuildingBlocks/src/Crypto/Implementations/KeyGenerator.cs
+++ b/BuildingBlocks/src/Crypto/Implementations/KeyGenerator.cs
@@ -1,7 +1,7 @@
-using Enmeshed.Crypto.Abstractions;
+using Backbone.Crypto.Abstractions;
using NSec.Cryptography;
-namespace Enmeshed.Crypto.Implementations;
+namespace Backbone.Crypto.Implementations;
public class KeyGenerator : IKeyGenerator
{
diff --git a/BuildingBlocks/src/Crypto/Implementations/SignatureHelper.cs b/BuildingBlocks/src/Crypto/Implementations/SignatureHelper.cs
index d1240168be..3d560c59ba 100644
--- a/BuildingBlocks/src/Crypto/Implementations/SignatureHelper.cs
+++ b/BuildingBlocks/src/Crypto/Implementations/SignatureHelper.cs
@@ -1,7 +1,7 @@
-using Enmeshed.Crypto.Abstractions;
+using Backbone.Crypto.Abstractions;
using NSec.Cryptography;
-namespace Enmeshed.Crypto.Implementations;
+namespace Backbone.Crypto.Implementations;
public class SignatureHelper : ISignatureHelper
{
diff --git a/BuildingBlocks/src/Crypto/KeyPair.cs b/BuildingBlocks/src/Crypto/KeyPair.cs
index 6341d4a458..8f548ce710 100644
--- a/BuildingBlocks/src/Crypto/KeyPair.cs
+++ b/BuildingBlocks/src/Crypto/KeyPair.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Crypto;
+namespace Backbone.Crypto;
public class KeyPair
{
diff --git a/BuildingBlocks/src/DevelopmentKit.Identity/Entities/Device.cs b/BuildingBlocks/src/DevelopmentKit.Identity/Entities/Device.cs
index 1ad65cf5f7..6c19818a7e 100644
--- a/BuildingBlocks/src/DevelopmentKit.Identity/Entities/Device.cs
+++ b/BuildingBlocks/src/DevelopmentKit.Identity/Entities/Device.cs
@@ -1,7 +1,7 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
#pragma warning disable CS8618 // turn off nullable checks
-namespace Enmeshed.DevelopmentKit.Identity.Entities;
+namespace Backbone.DevelopmentKit.Identity.Entities;
public class Device
{
diff --git a/BuildingBlocks/src/DevelopmentKit.Identity/Entities/Identity.cs b/BuildingBlocks/src/DevelopmentKit.Identity/Entities/Identity.cs
index d4013798d0..a74ab9fe24 100644
--- a/BuildingBlocks/src/DevelopmentKit.Identity/Entities/Identity.cs
+++ b/BuildingBlocks/src/DevelopmentKit.Identity/Entities/Identity.cs
@@ -1,7 +1,7 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
#pragma warning disable CS8618 // turn off nullable checks
-namespace Enmeshed.DevelopmentKit.Identity.Entities;
+namespace Backbone.DevelopmentKit.Identity.Entities;
public class Identity
{
diff --git a/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/DeviceId.cs b/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/DeviceId.cs
index 6a03989b9e..c1ad8dddc6 100644
--- a/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/DeviceId.cs
+++ b/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/DeviceId.cs
@@ -1,9 +1,9 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
-namespace Enmeshed.DevelopmentKit.Identity.ValueObjects;
+namespace Backbone.DevelopmentKit.Identity.ValueObjects;
[Serializable]
[TypeConverter(typeof(DeviceIdTypeConverter))]
diff --git a/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/IdentityAddress.cs b/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/IdentityAddress.cs
index e662f77801..1e31fcafea 100644
--- a/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/IdentityAddress.cs
+++ b/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/IdentityAddress.cs
@@ -2,10 +2,10 @@
using System.Globalization;
using System.Security.Cryptography;
using System.Text;
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
using SimpleBase;
-namespace Enmeshed.DevelopmentKit.Identity.ValueObjects;
+namespace Backbone.DevelopmentKit.Identity.ValueObjects;
[Serializable]
[TypeConverter(typeof(IdentityAddressTypeConverter))]
diff --git a/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/Username.cs b/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/Username.cs
index 201d9cff8e..a6530be141 100644
--- a/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/Username.cs
+++ b/BuildingBlocks/src/DevelopmentKit.Identity/ValueObjects/Username.cs
@@ -1,9 +1,9 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
-namespace Enmeshed.DevelopmentKit.Identity.ValueObjects;
+namespace Backbone.DevelopmentKit.Identity.ValueObjects;
[Serializable]
[TypeConverter(typeof(DeviceNameTypeConverter))]
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/FeatureEventArgs.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/FeatureEventArgs.cs
index 6584078349..f56af195bb 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/FeatureEventArgs.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/FeatureEventArgs.cs
@@ -1,7 +1,7 @@
-using SpecFlowCucumberResultsExporter.Model;
-using SpecFlowCucumberResultsExporter.Reporting;
+using Backbone.SpecFlowCucumberResultsExporter.Model;
+using Backbone.SpecFlowCucumberResultsExporter.Reporting;
-namespace SpecFlowCucumberResultsExporter.EventArgs;
+namespace Backbone.SpecFlowCucumberResultsExporter.EventArgs;
public class FeatureEventArgs : ReportEventArgs
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/ReportEventArgs.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/ReportEventArgs.cs
index 1695c36989..7baa7bcb31 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/ReportEventArgs.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/ReportEventArgs.cs
@@ -1,7 +1,7 @@
-using SpecFlowCucumberResultsExporter.Model;
-using SpecFlowCucumberResultsExporter.Reporting;
+using Backbone.SpecFlowCucumberResultsExporter.Model;
+using Backbone.SpecFlowCucumberResultsExporter.Reporting;
-namespace SpecFlowCucumberResultsExporter.EventArgs;
+namespace Backbone.SpecFlowCucumberResultsExporter.EventArgs;
public class ReportEventArgs : System.EventArgs
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/ScenarioEventArgs.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/ScenarioEventArgs.cs
index e00c2aa10b..d6a0e56387 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/ScenarioEventArgs.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/ScenarioEventArgs.cs
@@ -1,7 +1,7 @@
-using SpecFlowCucumberResultsExporter.Model;
-using SpecFlowCucumberResultsExporter.Reporting;
+using Backbone.SpecFlowCucumberResultsExporter.Model;
+using Backbone.SpecFlowCucumberResultsExporter.Reporting;
-namespace SpecFlowCucumberResultsExporter.EventArgs;
+namespace Backbone.SpecFlowCucumberResultsExporter.EventArgs;
public class ScenarioEventArgs : FeatureEventArgs
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/StepEventArgs.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/StepEventArgs.cs
index 8b3e0e15f0..3bea10867d 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/StepEventArgs.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/EventArgs/StepEventArgs.cs
@@ -1,7 +1,7 @@
-using SpecFlowCucumberResultsExporter.Model;
-using SpecFlowCucumberResultsExporter.Reporting;
+using Backbone.SpecFlowCucumberResultsExporter.Model;
+using Backbone.SpecFlowCucumberResultsExporter.Reporting;
-namespace SpecFlowCucumberResultsExporter.EventArgs;
+namespace Backbone.SpecFlowCucumberResultsExporter.EventArgs;
public class StepEventArgs : ScenarioEventArgs
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/Exporter.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/Exporter.cs
index 69311f1553..054ecfeea5 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/Exporter.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/Exporter.cs
@@ -1,6 +1,6 @@
-using SpecFlowCucumberResultsExporter.Reporting;
+using Backbone.SpecFlowCucumberResultsExporter.Reporting;
-namespace SpecFlowCucumberResultsExporter.Extensions;
+namespace Backbone.SpecFlowCucumberResultsExporter.Extensions;
public class Exporter : ReportingStepDefinitions
{
public static void ExportToCucumber(string path = default, string fileName = default)
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ExtensionMethods.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ExtensionMethods.cs
index d896178e38..72dc7eaf55 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ExtensionMethods.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ExtensionMethods.cs
@@ -1,7 +1,7 @@
using System.Reflection;
-using SpecFlowCucumberResultsExporter.Model;
+using Backbone.SpecFlowCucumberResultsExporter.Model;
-namespace SpecFlowCucumberResultsExporter.Extensions;
+namespace Backbone.SpecFlowCucumberResultsExporter.Extensions;
public static class Extensions
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/JsonReporter.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/JsonReporter.cs
index b4be9db1f8..019bcdeb0b 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/JsonReporter.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/JsonReporter.cs
@@ -1,9 +1,9 @@
using System.Text;
+using Backbone.SpecFlowCucumberResultsExporter.Reporting;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
-using SpecFlowCucumberResultsExporter.Reporting;
-namespace SpecFlowCucumberResultsExporter.Extensions;
+namespace Backbone.SpecFlowCucumberResultsExporter.Extensions;
public class JsonReporter : Reporter
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ReportContractResolver.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ReportContractResolver.cs
index a606299d51..ce8f3651c1 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ReportContractResolver.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ReportContractResolver.cs
@@ -2,7 +2,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
-namespace SpecFlowCucumberResultsExporter.Extensions;
+namespace Backbone.SpecFlowCucumberResultsExporter.Extensions;
public class ReportContractResolver : DefaultContractResolver
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ReportingStepDefinitions.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ReportingStepDefinitions.cs
index 436dff5c67..fe9fcec981 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ReportingStepDefinitions.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Extensions/ReportingStepDefinitions.cs
@@ -1,6 +1,6 @@
-using SpecFlowCucumberResultsExporter.Reporting;
+using Backbone.SpecFlowCucumberResultsExporter.Reporting;
-namespace SpecFlowCucumberResultsExporter.Extensions;
+namespace Backbone.SpecFlowCucumberResultsExporter.Extensions;
public abstract class ReportingStepDefinitions : ContextBoundObject
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Embedding.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Embedding.cs
index 1e17d84883..070428db07 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Embedding.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Embedding.cs
@@ -1,6 +1,6 @@
using Newtonsoft.Json;
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class Embedding
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/ExceptionData.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/ExceptionData.cs
index 626721585c..0721db1fa2 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/ExceptionData.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/ExceptionData.cs
@@ -1,6 +1,6 @@
-using SpecFlowCucumberResultsExporter.Extensions;
+using Backbone.SpecFlowCucumberResultsExporter.Extensions;
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
///
/// Contains the information about an .
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Feature.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Feature.cs
index 850502b6a5..4145eeadce 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Feature.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Feature.cs
@@ -1,4 +1,4 @@
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class Feature : TaggedReportItem
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Report.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Report.cs
index 3d914644e5..50af531fcd 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Report.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Report.cs
@@ -1,4 +1,4 @@
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class Report : ReportItem
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/ReportItem.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/ReportItem.cs
index 52b7b19b28..7f378ea839 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/ReportItem.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/ReportItem.cs
@@ -1,6 +1,6 @@
using Newtonsoft.Json;
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public abstract class ReportItem
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Row.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Row.cs
index 0003c82363..a5b77b19e6 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Row.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Row.cs
@@ -1,4 +1,4 @@
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class Row
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Scenario.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Scenario.cs
index 17d06e82e8..2351a20fa7 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Scenario.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Scenario.cs
@@ -1,4 +1,4 @@
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class Scenario : TaggedReportItem
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Step.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Step.cs
index c1005cb00f..45b5dea554 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Step.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/Step.cs
@@ -1,6 +1,6 @@
using Newtonsoft.Json;
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class Step : ReportItem
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/StepResult.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/StepResult.cs
index a466174016..99593dbec9 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/StepResult.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/StepResult.cs
@@ -1,6 +1,6 @@
using Newtonsoft.Json;
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class StepResult
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TableParam.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TableParam.cs
index d8de385a04..6612eb6fdd 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TableParam.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TableParam.cs
@@ -1,6 +1,6 @@
using System.Xml.Serialization;
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class TableParam
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TaggedReportItem.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TaggedReportItem.cs
index 399aae4b30..c1a0d47fba 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TaggedReportItem.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TaggedReportItem.cs
@@ -1,4 +1,4 @@
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public class Tag : ReportItem
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TestResult.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TestResult.cs
index 9bb241f1ce..7aca53d986 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TestResult.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Model/TestResult.cs
@@ -1,4 +1,4 @@
-namespace SpecFlowCucumberResultsExporter.Model;
+namespace Backbone.SpecFlowCucumberResultsExporter.Model;
public enum TestResult
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporter.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporter.cs
index 092658baaa..5625cd2807 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporter.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporter.cs
@@ -1,6 +1,6 @@
-using SpecFlowCucumberResultsExporter.Model;
+using Backbone.SpecFlowCucumberResultsExporter.Model;
-namespace SpecFlowCucumberResultsExporter.Reporting;
+namespace Backbone.SpecFlowCucumberResultsExporter.Reporting;
public abstract class Reporter
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.Events.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.Events.cs
index 55d7c1795e..39b6e6509e 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.Events.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.Events.cs
@@ -1,6 +1,6 @@
-using SpecFlowCucumberResultsExporter.EventArgs;
+using Backbone.SpecFlowCucumberResultsExporter.EventArgs;
-namespace SpecFlowCucumberResultsExporter.Reporting;
+namespace Backbone.SpecFlowCucumberResultsExporter.Reporting;
public partial class Reporters
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.SpecFlowHooks.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.SpecFlowHooks.cs
index 209fa16c3c..5a7a67d896 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.SpecFlowHooks.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.SpecFlowHooks.cs
@@ -1,7 +1,7 @@
-using SpecFlowCucumberResultsExporter.Extensions;
-using SpecFlowCucumberResultsExporter.Model;
+using Backbone.SpecFlowCucumberResultsExporter.Extensions;
+using Backbone.SpecFlowCucumberResultsExporter.Model;
-namespace SpecFlowCucumberResultsExporter.Reporting;
+namespace Backbone.SpecFlowCucumberResultsExporter.Reporting;
public partial class Reporters
{
diff --git a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.cs b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.cs
index 2183672384..d2a89a8d4a 100644
--- a/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.cs
+++ b/BuildingBlocks/src/SpecFlowCucumberResultsExporter/Reporting/Reporters.cs
@@ -1,9 +1,9 @@
using System.Reflection;
using System.Text.RegularExpressions;
-using SpecFlowCucumberResultsExporter.Extensions;
-using SpecFlowCucumberResultsExporter.Model;
+using Backbone.SpecFlowCucumberResultsExporter.Extensions;
+using Backbone.SpecFlowCucumberResultsExporter.Model;
-namespace SpecFlowCucumberResultsExporter.Reporting;
+namespace Backbone.SpecFlowCucumberResultsExporter.Reporting;
[Binding]
public partial class Reporters
diff --git a/BuildingBlocks/src/Tooling/Extensions/DateTimeExtensions.cs b/BuildingBlocks/src/Tooling/Extensions/DateTimeExtensions.cs
index 572196d575..cf36007a69 100644
--- a/BuildingBlocks/src/Tooling/Extensions/DateTimeExtensions.cs
+++ b/BuildingBlocks/src/Tooling/Extensions/DateTimeExtensions.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Tooling.Extensions;
+namespace Backbone.Tooling.Extensions;
public static class DateTimeExtensions
{
diff --git a/BuildingBlocks/src/Tooling/Extensions/EnvironmentVariables.cs b/BuildingBlocks/src/Tooling/Extensions/EnvironmentVariables.cs
index bc008ff417..7a103d832c 100644
--- a/BuildingBlocks/src/Tooling/Extensions/EnvironmentVariables.cs
+++ b/BuildingBlocks/src/Tooling/Extensions/EnvironmentVariables.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Tooling.Extensions;
+namespace Backbone.Tooling.Extensions;
public static class EnvironmentVariables
{
public static readonly bool DEBUG_PERFORMANCE = !Environment.GetEnvironmentVariable("DEBUG_PERFORMANCE").IsNullOrEmpty();
diff --git a/BuildingBlocks/src/Tooling/Extensions/ILoggerExtensions.cs b/BuildingBlocks/src/Tooling/Extensions/ILoggerExtensions.cs
index dc474094c8..41a63c5df1 100644
--- a/BuildingBlocks/src/Tooling/Extensions/ILoggerExtensions.cs
+++ b/BuildingBlocks/src/Tooling/Extensions/ILoggerExtensions.cs
@@ -1,5 +1,5 @@
using System.Diagnostics;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
// ReSharper disable once CheckNamespace
namespace Microsoft.Extensions.Logging;
diff --git a/BuildingBlocks/src/Tooling/Extensions/IntegerExtensions.cs b/BuildingBlocks/src/Tooling/Extensions/IntegerExtensions.cs
index 8ecfdeb893..060222dd7c 100644
--- a/BuildingBlocks/src/Tooling/Extensions/IntegerExtensions.cs
+++ b/BuildingBlocks/src/Tooling/Extensions/IntegerExtensions.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Tooling.Extensions;
+namespace Backbone.Tooling.Extensions;
public static class IntegerExtensions
{
diff --git a/BuildingBlocks/src/Tooling/Extensions/LogEventIds.cs b/BuildingBlocks/src/Tooling/Extensions/LogEventIds.cs
index 8888549692..c306e4d567 100644
--- a/BuildingBlocks/src/Tooling/Extensions/LogEventIds.cs
+++ b/BuildingBlocks/src/Tooling/Extensions/LogEventIds.cs
@@ -1,6 +1,6 @@
using Microsoft.Extensions.Logging;
-namespace Enmeshed.Tooling.Extensions;
+namespace Backbone.Tooling.Extensions;
public static class LogEventIds
{
public static readonly EventId EXECUTION_TIME = new(1000, "ExecutionTime");
diff --git a/BuildingBlocks/src/Tooling/Extensions/StringExtensions.cs b/BuildingBlocks/src/Tooling/Extensions/StringExtensions.cs
index 1c0e012bbf..9b8443a1b7 100644
--- a/BuildingBlocks/src/Tooling/Extensions/StringExtensions.cs
+++ b/BuildingBlocks/src/Tooling/Extensions/StringExtensions.cs
@@ -1,6 +1,6 @@
using System.Text.RegularExpressions;
-namespace Enmeshed.Tooling.Extensions;
+namespace Backbone.Tooling.Extensions;
public static class StringExtensions
{
diff --git a/BuildingBlocks/src/Tooling/JsonConverters/UrlSafeBase64ToByteArrayJsonConverter.cs b/BuildingBlocks/src/Tooling/JsonConverters/UrlSafeBase64ToByteArrayJsonConverter.cs
index d94254943e..bec8655ff2 100644
--- a/BuildingBlocks/src/Tooling/JsonConverters/UrlSafeBase64ToByteArrayJsonConverter.cs
+++ b/BuildingBlocks/src/Tooling/JsonConverters/UrlSafeBase64ToByteArrayJsonConverter.cs
@@ -2,7 +2,7 @@
using System.Text.Json.Serialization;
using NeoSmart.Utils;
-namespace Enmeshed.Tooling.JsonConverters;
+namespace Backbone.Tooling.JsonConverters;
public class UrlSafeBase64ToByteArrayJsonConverter : JsonConverter
{
diff --git a/BuildingBlocks/src/Tooling/SystemTime.cs b/BuildingBlocks/src/Tooling/SystemTime.cs
index dad26b88f7..07102a2ef4 100644
--- a/BuildingBlocks/src/Tooling/SystemTime.cs
+++ b/BuildingBlocks/src/Tooling/SystemTime.cs
@@ -1,6 +1,6 @@
using System.Diagnostics;
-namespace Enmeshed.Tooling;
+namespace Backbone.Tooling;
///
/// Provides access to system time while allowing it to be set to a fixed value.
diff --git a/BuildingBlocks/src/UnitTestTools/BaseClasses/AbstractTestsBase.cs b/BuildingBlocks/src/UnitTestTools/BaseClasses/AbstractTestsBase.cs
index ab065ec8b1..9bf910a73b 100644
--- a/BuildingBlocks/src/UnitTestTools/BaseClasses/AbstractTestsBase.cs
+++ b/BuildingBlocks/src/UnitTestTools/BaseClasses/AbstractTestsBase.cs
@@ -1,6 +1,6 @@
-using Enmeshed.Tooling;
+using Backbone.Tooling;
-namespace Enmeshed.UnitTestTools.BaseClasses;
+namespace Backbone.UnitTestTools.BaseClasses;
public abstract class AbstractTestsBase : IDisposable
{
diff --git a/BuildingBlocks/src/UnitTestTools/BaseClasses/RequestHandlerTestsBase.cs b/BuildingBlocks/src/UnitTestTools/BaseClasses/RequestHandlerTestsBase.cs
index 44d861d5ab..1e0a15b27e 100644
--- a/BuildingBlocks/src/UnitTestTools/BaseClasses/RequestHandlerTestsBase.cs
+++ b/BuildingBlocks/src/UnitTestTools/BaseClasses/RequestHandlerTestsBase.cs
@@ -1,7 +1,7 @@
-using Enmeshed.UnitTestTools.TestDoubles.Fakes;
+using Backbone.UnitTestTools.TestDoubles.Fakes;
using Microsoft.EntityFrameworkCore;
-namespace Enmeshed.UnitTestTools.BaseClasses;
+namespace Backbone.UnitTestTools.BaseClasses;
public abstract class RequestHandlerTestsBase : AbstractTestsBase where TDbContext : DbContext
{
diff --git a/BuildingBlocks/src/UnitTestTools/Behaviors/NextMock.cs b/BuildingBlocks/src/UnitTestTools/Behaviors/NextMock.cs
index 7260a87222..f8830509e4 100644
--- a/BuildingBlocks/src/UnitTestTools/Behaviors/NextMock.cs
+++ b/BuildingBlocks/src/UnitTestTools/Behaviors/NextMock.cs
@@ -1,6 +1,6 @@
using MediatR;
-namespace Enmeshed.UnitTestTools.Behaviors;
+namespace Backbone.UnitTestTools.Behaviors;
public class NextMock where TResponse : new()
{
public NextMock()
diff --git a/BuildingBlocks/src/UnitTestTools/Data/TestDataGenerator.cs b/BuildingBlocks/src/UnitTestTools/Data/TestDataGenerator.cs
index 9833db5499..82d3106b4c 100644
--- a/BuildingBlocks/src/UnitTestTools/Data/TestDataGenerator.cs
+++ b/BuildingBlocks/src/UnitTestTools/Data/TestDataGenerator.cs
@@ -1,6 +1,6 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
-namespace Enmeshed.UnitTestTools.Data;
+namespace Backbone.UnitTestTools.Data;
public static class TestDataGenerator
{
diff --git a/BuildingBlocks/src/UnitTestTools/Extensions/DateTimeAssertionsExtensions.cs b/BuildingBlocks/src/UnitTestTools/Extensions/DateTimeAssertionsExtensions.cs
index b9e6ecb409..e67da88817 100644
--- a/BuildingBlocks/src/UnitTestTools/Extensions/DateTimeAssertionsExtensions.cs
+++ b/BuildingBlocks/src/UnitTestTools/Extensions/DateTimeAssertionsExtensions.cs
@@ -1,7 +1,7 @@
using FluentAssertions;
using FluentAssertions.Primitives;
-namespace Enmeshed.UnitTestTools.Extensions;
+namespace Backbone.UnitTestTools.Extensions;
public static class DateTimeAssertionsExtensions
{
diff --git a/BuildingBlocks/src/UnitTestTools/Extensions/IEnumerableExtensions.cs b/BuildingBlocks/src/UnitTestTools/Extensions/IEnumerableExtensions.cs
index f31d1dba96..d0b13fd8fb 100644
--- a/BuildingBlocks/src/UnitTestTools/Extensions/IEnumerableExtensions.cs
+++ b/BuildingBlocks/src/UnitTestTools/Extensions/IEnumerableExtensions.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.UnitTestTools.Extensions;
+namespace Backbone.UnitTestTools.Extensions;
public static class EnumerableExtensions
{
public static T Second(this IEnumerable enumerable)
diff --git a/BuildingBlocks/src/UnitTestTools/Extensions/NonGenericAsyncFunctionAssertionsExtensions.cs b/BuildingBlocks/src/UnitTestTools/Extensions/NonGenericAsyncFunctionAssertionsExtensions.cs
index 10b079ac2b..9076f90ed6 100644
--- a/BuildingBlocks/src/UnitTestTools/Extensions/NonGenericAsyncFunctionAssertionsExtensions.cs
+++ b/BuildingBlocks/src/UnitTestTools/Extensions/NonGenericAsyncFunctionAssertionsExtensions.cs
@@ -1,6 +1,6 @@
using FluentAssertions.Specialized;
-namespace Enmeshed.UnitTestTools.Extensions;
+namespace Backbone.UnitTestTools.Extensions;
public static class NonGenericAsyncFunctionAssertionsExtensions
{
diff --git a/BuildingBlocks/src/UnitTestTools/FluentAssertions/Extensions/ObjectAssertionsExtensions.cs b/BuildingBlocks/src/UnitTestTools/FluentAssertions/Extensions/ObjectAssertionsExtensions.cs
index 7ef297503d..dd1d710021 100644
--- a/BuildingBlocks/src/UnitTestTools/FluentAssertions/Extensions/ObjectAssertionsExtensions.cs
+++ b/BuildingBlocks/src/UnitTestTools/FluentAssertions/Extensions/ObjectAssertionsExtensions.cs
@@ -2,7 +2,7 @@
using FluentAssertions.Primitives;
using Xunit.Sdk;
-namespace Enmeshed.UnitTestTools.FluentAssertions.Extensions;
+namespace Backbone.UnitTestTools.FluentAssertions.Extensions;
public static class ObjectAssertionsExtensions
{
diff --git a/BuildingBlocks/src/UnitTestTools/FluentAssertions/Extensions/StringAssertionsExtensions.cs b/BuildingBlocks/src/UnitTestTools/FluentAssertions/Extensions/StringAssertionsExtensions.cs
index ae75b16a94..2b21745c93 100644
--- a/BuildingBlocks/src/UnitTestTools/FluentAssertions/Extensions/StringAssertionsExtensions.cs
+++ b/BuildingBlocks/src/UnitTestTools/FluentAssertions/Extensions/StringAssertionsExtensions.cs
@@ -3,7 +3,7 @@
using FluentAssertions.Execution;
using FluentAssertions.Primitives;
-namespace Enmeshed.UnitTestTools.FluentAssertions.Extensions;
+namespace Backbone.UnitTestTools.FluentAssertions.Extensions;
public static class StringAssertionsExtensions
{
public static AndConstraint Be(this DateTimeAssertions it, string dateTimeString)
diff --git a/BuildingBlocks/src/UnitTestTools/FluentValidation/Extensions.cs b/BuildingBlocks/src/UnitTestTools/FluentValidation/Extensions.cs
index e1cb227dbb..cd74690b64 100644
--- a/BuildingBlocks/src/UnitTestTools/FluentValidation/Extensions.cs
+++ b/BuildingBlocks/src/UnitTestTools/FluentValidation/Extensions.cs
@@ -3,7 +3,7 @@
using FluentValidation.Results;
using Xunit.Sdk;
-namespace Enmeshed.UnitTestTools.FluentValidation;
+namespace Backbone.UnitTestTools.FluentValidation;
public static class StringExtensions
{
diff --git a/BuildingBlocks/src/UnitTestTools/TestDoubles/Fakes/FakeDbContextFactory.cs b/BuildingBlocks/src/UnitTestTools/TestDoubles/Fakes/FakeDbContextFactory.cs
index cb7b692f5f..b8251a8337 100644
--- a/BuildingBlocks/src/UnitTestTools/TestDoubles/Fakes/FakeDbContextFactory.cs
+++ b/BuildingBlocks/src/UnitTestTools/TestDoubles/Fakes/FakeDbContextFactory.cs
@@ -1,9 +1,7 @@
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
-namespace Enmeshed.UnitTestTools.TestDoubles.Fakes;
+namespace Backbone.UnitTestTools.TestDoubles.Fakes;
public static class FakeDbContextFactory
{
diff --git a/BuildingBlocks/test/BuildingBlocks.API.Tests/UnitTest1.cs b/BuildingBlocks/test/BuildingBlocks.API.Tests/UnitTest1.cs
index 527ddef74f..792c7d0599 100644
--- a/BuildingBlocks/test/BuildingBlocks.API.Tests/UnitTest1.cs
+++ b/BuildingBlocks/test/BuildingBlocks.API.Tests/UnitTest1.cs
@@ -1,6 +1,6 @@
using Xunit;
-namespace Enmeshed.BuildingBlocks.API.Tests;
+namespace Backbone.BuildingBlocks.API.Tests;
public class UnitTest1
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Application.Tests/FluentValidation/ValueInValidatorTests.cs b/BuildingBlocks/test/BuildingBlocks.Application.Tests/FluentValidation/ValueInValidatorTests.cs
index f5f2cc7103..86f5374d5d 100644
--- a/BuildingBlocks/test/BuildingBlocks.Application.Tests/FluentValidation/ValueInValidatorTests.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Application.Tests/FluentValidation/ValueInValidatorTests.cs
@@ -1,9 +1,9 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentAssertions;
using FluentValidation;
using Xunit;
-namespace Enmeshed.BuildingBlocks.Application.Tests.FluentValidation;
+namespace Backbone.BuildingBlocks.Application.Tests.FluentValidation;
public class ValueInValidatorTests
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Application.Tests/Mediatr/MetricStatusesStubRepository.cs b/BuildingBlocks/test/BuildingBlocks.Application.Tests/Mediatr/MetricStatusesStubRepository.cs
index 4e754b9e56..e6e1fbd7aa 100644
--- a/BuildingBlocks/test/BuildingBlocks.Application.Tests/Mediatr/MetricStatusesStubRepository.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Application.Tests/Mediatr/MetricStatusesStubRepository.cs
@@ -1,8 +1,8 @@
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.Common.Infrastructure.Persistence.Repository;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Common.Infrastructure.Persistence.Repository;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
-namespace Enmeshed.BuildingBlocks.Application.Tests.Mediatr;
+namespace Backbone.BuildingBlocks.Application.Tests.Mediatr;
public class MetricStatusesStubRepository : IMetricStatusesRepository
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Application.Tests/Mediatr/QuotaEnforcerBehaviorTests.cs b/BuildingBlocks/test/BuildingBlocks.Application.Tests/Mediatr/QuotaEnforcerBehaviorTests.cs
index a8df70ad62..0e47418482 100644
--- a/BuildingBlocks/test/BuildingBlocks.Application.Tests/Mediatr/QuotaEnforcerBehaviorTests.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Application.Tests/Mediatr/QuotaEnforcerBehaviorTests.cs
@@ -1,15 +1,15 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Attributes;
-using Enmeshed.BuildingBlocks.Application.MediatR;
-using Enmeshed.BuildingBlocks.Application.QuotaCheck;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.UnitTestTools.Behaviors;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Attributes;
+using Backbone.BuildingBlocks.Application.MediatR;
+using Backbone.BuildingBlocks.Application.QuotaCheck;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.UnitTestTools.Behaviors;
+using Backbone.UnitTestTools.Extensions;
using FluentAssertions;
using MediatR;
using Xunit;
-namespace Enmeshed.BuildingBlocks.Application.Tests.Mediatr;
+namespace Backbone.BuildingBlocks.Application.Tests.Mediatr;
public class QuotaEnforcerBehaviorTests
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Application.Tests/Pagination/PaginationDataTests.cs b/BuildingBlocks/test/BuildingBlocks.Application.Tests/Pagination/PaginationDataTests.cs
index 3b1b7c6adb..c65ba1adae 100644
--- a/BuildingBlocks/test/BuildingBlocks.Application.Tests/Pagination/PaginationDataTests.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Application.Tests/Pagination/PaginationDataTests.cs
@@ -1,8 +1,8 @@
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
using FluentAssertions;
using Xunit;
-namespace Enmeshed.BuildingBlocks.Application.Tests.Pagination;
+namespace Backbone.BuildingBlocks.Application.Tests.Pagination;
public class PaginationDataTests
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/GoogleCloudPubSubTests.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/GoogleCloudPubSubTests.cs
index 28935e4be8..9e99edc7e2 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/GoogleCloudPubSubTests.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/GoogleCloudPubSubTests.cs
@@ -1,11 +1,11 @@
using Autofac;
using Autofac.Extensions.DependencyInjection;
+using Backbone.BuildingBlocks.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
+using Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEventHandlers;
+using Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
+using Backbone.Tooling.Extensions;
using Divergic.Logging.Xunit;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus.GoogleCloudPubSub;
-using Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEventHandlers;
-using Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
-using Enmeshed.Tooling.Extensions;
using FluentAssertions;
using FluentAssertions.Extensions;
using Google.Api.Gax;
@@ -16,7 +16,7 @@
using Xunit;
using Xunit.Abstractions;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub;
public class GoogleCloudPubSubTests : IDisposable
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent1IntegrationEventHandler1.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent1IntegrationEventHandler1.cs
index 89e6c57d4c..be4f9b2ad1 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent1IntegrationEventHandler1.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent1IntegrationEventHandler1.cs
@@ -1,10 +1,10 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
using FluentAssertions;
using Polly;
using Xunit.Sdk;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEventHandlers;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEventHandlers;
public class TestEvent1IntegrationEventHandler1 : IIntegrationEventHandler
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent1IntegrationEventHandler2.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent1IntegrationEventHandler2.cs
index 8f528ed3aa..04cfb22925 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent1IntegrationEventHandler2.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent1IntegrationEventHandler2.cs
@@ -1,11 +1,11 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
using FluentAssertions;
using FluentAssertions.Extensions;
using Polly;
using Xunit.Sdk;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEventHandlers;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEventHandlers;
public class TestEvent1IntegrationEventHandler2 : IIntegrationEventHandler
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent2IntegrationEventHandler.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent2IntegrationEventHandler.cs
index e0c0517c91..cb557ca6a5 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent2IntegrationEventHandler.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEventHandlers/TestEvent2IntegrationEventHandler.cs
@@ -1,10 +1,10 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
using FluentAssertions;
using Polly;
using Xunit.Sdk;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEventHandlers;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEventHandlers;
public class TestEvent2IntegrationEventHandler : IIntegrationEventHandler
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEvents/TestEvent1IntegrationEvent.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEvents/TestEvent1IntegrationEvent.cs
index 88f69a5e33..1543cf5700 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEvents/TestEvent1IntegrationEvent.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEvents/TestEvent1IntegrationEvent.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
public class TestEvent1IntegrationEvent : IntegrationEvent
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEvents/TestEvent2IntegrationEvent.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEvents/TestEvent2IntegrationEvent.cs
index b849bf9284..7a2e283269 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEvents/TestEvent2IntegrationEvent.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/EventBus/GoogleCloudPubSub/TestIntegrationEvents/TestEvent2IntegrationEvent.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests.EventBus.GoogleCloudPubSub.TestIntegrationEvents;
public class TestEvent2IntegrationEvent : IntegrationEvent
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/StringExtensions.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/StringExtensions.cs
index b42ef50f8f..f605efa182 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/StringExtensions.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/StringExtensions.cs
@@ -1,6 +1,6 @@
using System.Text;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests;
public static class StringExtensions
{
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/AzureStorageAccountTests.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/AzureStorageAccountTests.cs
index f9eeeada5a..ba99ab2776 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/AzureStorageAccountTests.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/AzureStorageAccountTests.cs
@@ -1,12 +1,12 @@
using System.Diagnostics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.AzureStorageAccount;
using FluentAssertions;
using Microsoft.Extensions.DependencyInjection;
using Xunit;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests.Tests;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests.Tests;
[Collection("AzureBlobStorageTests")]
public class AzureStorageAccountTests
diff --git a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/GoogleCloudStorageTests.cs b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/GoogleCloudStorageTests.cs
index 2b8e69dc80..46776461b6 100644
--- a/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/GoogleCloudStorageTests.cs
+++ b/BuildingBlocks/test/BuildingBlocks.Infrastructure.Tests/Tests/GoogleCloudStorageTests.cs
@@ -1,13 +1,13 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage.GoogleCloudStorage;
using FluentAssertions;
using Google.Apis.Auth.OAuth2;
using Google.Cloud.Storage.V1;
using Xunit;
using Xunit.Abstractions;
-namespace Enmeshed.BuildingBlocks.Infrastructure.Tests.Tests;
+namespace Backbone.BuildingBlocks.Infrastructure.Tests.Tests;
public class GoogleCloudStorageTests : IAsyncLifetime
{
diff --git a/BuildingBlocks/test/Crypto.Tests/KeyGeneratorTests.cs b/BuildingBlocks/test/Crypto.Tests/KeyGeneratorTests.cs
index 3469c18dcc..d99c6637d7 100644
--- a/BuildingBlocks/test/Crypto.Tests/KeyGeneratorTests.cs
+++ b/BuildingBlocks/test/Crypto.Tests/KeyGeneratorTests.cs
@@ -1,8 +1,8 @@
-using Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle;
-using Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.Symmetric;
+using Backbone.Crypto.Implementations.Deprecated.BouncyCastle;
+using Backbone.Crypto.Implementations.Deprecated.BouncyCastle.Symmetric;
using Xunit;
-namespace Enmeshed.Crypto.Tests;
+namespace Backbone.Crypto.Tests;
public class KeyGeneratorTests : IDisposable
{
diff --git a/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/Deprecated/BouncyCastle/AesEncryptionHelperTests.cs b/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/Deprecated/BouncyCastle/AesEncryptionHelperTests.cs
index a9dc8d2bf2..4c566c2ae7 100644
--- a/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/Deprecated/BouncyCastle/AesEncryptionHelperTests.cs
+++ b/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/Deprecated/BouncyCastle/AesEncryptionHelperTests.cs
@@ -1,8 +1,8 @@
-using Enmeshed.Crypto.Abstractions;
-using Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.Symmetric;
+using Backbone.Crypto.Abstractions;
+using Backbone.Crypto.Implementations.Deprecated.BouncyCastle.Symmetric;
using Xunit;
-namespace Enmeshed.Crypto.Tests.Tests.Implementations.Deprecated.BouncyCastle;
+namespace Backbone.Crypto.Tests.Tests.Implementations.Deprecated.BouncyCastle;
public class AesEncryptionHelperTests : IDisposable
{
diff --git a/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/Deprecated/BouncyCastle/EllipticCurveSignatureHelperTests.cs b/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/Deprecated/BouncyCastle/EllipticCurveSignatureHelperTests.cs
index fff8cb2f33..e5f286aa26 100644
--- a/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/Deprecated/BouncyCastle/EllipticCurveSignatureHelperTests.cs
+++ b/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/Deprecated/BouncyCastle/EllipticCurveSignatureHelperTests.cs
@@ -1,7 +1,7 @@
-using Enmeshed.Crypto.Implementations.Deprecated.BouncyCastle.Asymmetric;
+using Backbone.Crypto.Implementations.Deprecated.BouncyCastle.Asymmetric;
using Xunit;
-namespace Enmeshed.Crypto.Tests.Tests.Implementations.Deprecated.BouncyCastle;
+namespace Backbone.Crypto.Tests.Tests.Implementations.Deprecated.BouncyCastle;
public class EllipticCurveSignatureHelperTests : IDisposable
{
diff --git a/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/KeyAgreementHelperTests.cs b/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/KeyAgreementHelperTests.cs
index dcfdececd3..a59b7c32d5 100644
--- a/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/KeyAgreementHelperTests.cs
+++ b/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/KeyAgreementHelperTests.cs
@@ -1,8 +1,8 @@
-using Enmeshed.Crypto.Implementations;
+using Backbone.Crypto.Implementations;
using FluentAssertions;
using Xunit;
-namespace Enmeshed.Crypto.Tests.Tests.Implementations;
+namespace Backbone.Crypto.Tests.Tests.Implementations;
public class KeyAgreementHelperTests : IDisposable
{
diff --git a/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/SignatureAlgorithmTests.cs b/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/SignatureAlgorithmTests.cs
index ae2e3a90fc..e034112778 100644
--- a/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/SignatureAlgorithmTests.cs
+++ b/BuildingBlocks/test/Crypto.Tests/Tests/Implementations/SignatureAlgorithmTests.cs
@@ -1,8 +1,8 @@
-using Enmeshed.Crypto.Implementations;
+using Backbone.Crypto.Implementations;
using NSec.Cryptography;
using Xunit;
-namespace Enmeshed.Crypto.Tests.Tests.Implementations;
+namespace Backbone.Crypto.Tests.Tests.Implementations;
public class SignatureHelperTests : IDisposable
{
diff --git a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/IdentityAddressTests.cs b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/IdentityAddressTests.cs
index 054d625c23..c59344978d 100644
--- a/BuildingBlocks/test/DevelopmentKit.Identity.Tests/IdentityAddressTests.cs
+++ b/BuildingBlocks/test/DevelopmentKit.Identity.Tests/IdentityAddressTests.cs
@@ -1,8 +1,8 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using FluentAssertions;
using Xunit;
-namespace Enmeshed.DevelopmentKit.Identity.Tests;
+namespace Backbone.DevelopmentKit.Identity.Tests;
public class IdentityAddressTests
{
diff --git a/BuildingBlocks/test/StronglyTypedIds.Tests/UnitTest1.cs b/BuildingBlocks/test/StronglyTypedIds.Tests/UnitTest1.cs
index 1accfb1c96..1140a001d4 100644
--- a/BuildingBlocks/test/StronglyTypedIds.Tests/UnitTest1.cs
+++ b/BuildingBlocks/test/StronglyTypedIds.Tests/UnitTest1.cs
@@ -1,6 +1,6 @@
using Xunit;
-namespace Enmeshed.StronglyTypedIds.Tests;
+namespace Backbone.StronglyTypedIds.Tests;
public class UnitTest1
{
diff --git a/BuildingBlocks/test/Tooling.Tests/Tests/DateTimeExtensionsTests.cs b/BuildingBlocks/test/Tooling.Tests/Tests/DateTimeExtensionsTests.cs
index 593bef0bdc..3634410882 100644
--- a/BuildingBlocks/test/Tooling.Tests/Tests/DateTimeExtensionsTests.cs
+++ b/BuildingBlocks/test/Tooling.Tests/Tests/DateTimeExtensionsTests.cs
@@ -1,10 +1,10 @@
using System.Collections;
-using Enmeshed.Tooling.Extensions;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.Tooling.Extensions;
+using Backbone.UnitTestTools.Extensions;
using FluentAssertions;
using Xunit;
-namespace Enmeshed.Tooling.Tests.Tests;
+namespace Backbone.Tooling.Tests.Tests;
public class DateTimeExtensionsTests
{
[Theory]
diff --git a/BuildingBlocks/test/Tooling.Tests/Tests/UrlSafeBase64ToByteArrayJsonConverterTests.cs b/BuildingBlocks/test/Tooling.Tests/Tests/UrlSafeBase64ToByteArrayJsonConverterTests.cs
index 3f7a846563..1966f8fde1 100644
--- a/BuildingBlocks/test/Tooling.Tests/Tests/UrlSafeBase64ToByteArrayJsonConverterTests.cs
+++ b/BuildingBlocks/test/Tooling.Tests/Tests/UrlSafeBase64ToByteArrayJsonConverterTests.cs
@@ -1,10 +1,10 @@
using System.Text;
using System.Text.Json;
-using Enmeshed.Tooling.JsonConverters;
+using Backbone.Tooling.JsonConverters;
using FluentAssertions;
using Xunit;
-namespace Enmeshed.Tooling.Tests.Tests;
+namespace Backbone.Tooling.Tests.Tests;
public class UrlSafeBase64ToByteArrayJsonConverterTests
{
diff --git a/BuildingBlocks/test/UnitTestTools.Tests/UnitTest1.cs b/BuildingBlocks/test/UnitTestTools.Tests/UnitTest1.cs
index c45ecc629d..42518e8d83 100644
--- a/BuildingBlocks/test/UnitTestTools.Tests/UnitTest1.cs
+++ b/BuildingBlocks/test/UnitTestTools.Tests/UnitTest1.cs
@@ -1,6 +1,6 @@
using Xunit;
-namespace Enmeshed.UnitTestTools.Tests;
+namespace Backbone.UnitTestTools.Tests;
public class UnitTest1
{
diff --git a/Common/src/Common.Infrastructure/IServiceCollectionExtension.cs b/Common/src/Common.Infrastructure/IServiceCollectionExtension.cs
index 84d9b443b3..16649830e4 100644
--- a/Common/src/Common.Infrastructure/IServiceCollectionExtension.cs
+++ b/Common/src/Common.Infrastructure/IServiceCollectionExtension.cs
@@ -1,9 +1,9 @@
-using Dapper;
-using Enmeshed.Common.Infrastructure.Persistence.Context;
-using Enmeshed.Common.Infrastructure.Persistence.Repository;
+using Backbone.Common.Infrastructure.Persistence.Context;
+using Backbone.Common.Infrastructure.Persistence.Repository;
+using Dapper;
using Microsoft.Extensions.DependencyInjection;
-namespace Enmeshed.Common.Infrastructure;
+namespace Backbone.Common.Infrastructure;
public static class IServiceCollectionExtension
{
private const string SQLSERVER = "SqlServer";
diff --git a/Common/src/Common.Infrastructure/Persistence/Context/MetricKeyTypeHandler.cs b/Common/src/Common.Infrastructure/Persistence/Context/MetricKeyTypeHandler.cs
index 7658e32ecd..dd28b63178 100644
--- a/Common/src/Common.Infrastructure/Persistence/Context/MetricKeyTypeHandler.cs
+++ b/Common/src/Common.Infrastructure/Persistence/Context/MetricKeyTypeHandler.cs
@@ -1,8 +1,8 @@
using System.Data;
+using Backbone.BuildingBlocks.Domain;
using Dapper;
-using Enmeshed.BuildingBlocks.Domain;
-namespace Enmeshed.Common.Infrastructure.Persistence.Context;
+namespace Backbone.Common.Infrastructure.Persistence.Context;
internal class MetricKeyTypeHandler : SqlMapper.TypeHandler
{
public override MetricKey Parse(object value)
diff --git a/Common/src/Common.Infrastructure/Persistence/Repository/IMetricStatusesRepository.cs b/Common/src/Common.Infrastructure/Persistence/Repository/IMetricStatusesRepository.cs
index b6480c5ad7..8a4b94bfce 100644
--- a/Common/src/Common.Infrastructure/Persistence/Repository/IMetricStatusesRepository.cs
+++ b/Common/src/Common.Infrastructure/Persistence/Repository/IMetricStatusesRepository.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
-namespace Enmeshed.Common.Infrastructure.Persistence.Repository;
+namespace Backbone.Common.Infrastructure.Persistence.Repository;
public interface IMetricStatusesRepository
{
Task> GetMetricStatuses(IdentityAddress identity, IEnumerable keys);
diff --git a/Common/src/Common.Infrastructure/Persistence/Repository/MetricStatusesRepositoryOptions.cs b/Common/src/Common.Infrastructure/Persistence/Repository/MetricStatusesRepositoryOptions.cs
index f29de751ab..8205793f80 100644
--- a/Common/src/Common.Infrastructure/Persistence/Repository/MetricStatusesRepositoryOptions.cs
+++ b/Common/src/Common.Infrastructure/Persistence/Repository/MetricStatusesRepositoryOptions.cs
@@ -1,4 +1,4 @@
-namespace Enmeshed.Common.Infrastructure.Persistence.Repository;
+namespace Backbone.Common.Infrastructure.Persistence.Repository;
public class MetricStatusesRepositoryOptions
{
diff --git a/Common/src/Common.Infrastructure/Persistence/Repository/PostgresMetricStatusesRepository.cs b/Common/src/Common.Infrastructure/Persistence/Repository/PostgresMetricStatusesRepository.cs
index 3bb355ede6..3196c22d46 100644
--- a/Common/src/Common.Infrastructure/Persistence/Repository/PostgresMetricStatusesRepository.cs
+++ b/Common/src/Common.Infrastructure/Persistence/Repository/PostgresMetricStatusesRepository.cs
@@ -1,10 +1,10 @@
-using Dapper;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Dapper;
using Microsoft.Extensions.Options;
using Npgsql;
-namespace Enmeshed.Common.Infrastructure.Persistence.Repository;
+namespace Backbone.Common.Infrastructure.Persistence.Repository;
public class PostgresMetricStatusesRepository : IMetricStatusesRepository
{
diff --git a/Common/src/Common.Infrastructure/Persistence/Repository/SqlServerMetricStatusesRepository.cs b/Common/src/Common.Infrastructure/Persistence/Repository/SqlServerMetricStatusesRepository.cs
index 9b9ce55d7a..505a46f6ad 100644
--- a/Common/src/Common.Infrastructure/Persistence/Repository/SqlServerMetricStatusesRepository.cs
+++ b/Common/src/Common.Infrastructure/Persistence/Repository/SqlServerMetricStatusesRepository.cs
@@ -1,10 +1,10 @@
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Dapper;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.Data.SqlClient;
using Microsoft.Extensions.Options;
-namespace Enmeshed.Common.Infrastructure.Persistence.Repository;
+namespace Backbone.Common.Infrastructure.Persistence.Repository;
public class SqlServerMetricStatusesRepository : IMetricStatusesRepository
{
diff --git a/ConsumerApi.Tests.Integration/API/BaseApi.cs b/ConsumerApi.Tests.Integration/API/BaseApi.cs
index e2ab82b261..5e0ad57078 100644
--- a/ConsumerApi.Tests.Integration/API/BaseApi.cs
+++ b/ConsumerApi.Tests.Integration/API/BaseApi.cs
@@ -1,12 +1,12 @@
using System.Net;
using System.Net.Http.Headers;
using System.Text.Json;
-using ConsumerApi.Tests.Integration.Models;
-using Enmeshed.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API;
+using Backbone.ConsumerApi.Tests.Integration.Models;
using Newtonsoft.Json;
using JsonSerializer = System.Text.Json.JsonSerializer;
-namespace ConsumerApi.Tests.Integration.API;
+namespace Backbone.ConsumerApi.Tests.Integration.API;
public class BaseApi
{
diff --git a/ConsumerApi.Tests.Integration/API/ChallengesApi.cs b/ConsumerApi.Tests.Integration/API/ChallengesApi.cs
index 1967eaf9ef..082a759c13 100644
--- a/ConsumerApi.Tests.Integration/API/ChallengesApi.cs
+++ b/ConsumerApi.Tests.Integration/API/ChallengesApi.cs
@@ -1,6 +1,6 @@
-using ConsumerApi.Tests.Integration.Models;
+using Backbone.ConsumerApi.Tests.Integration.Models;
-namespace ConsumerApi.Tests.Integration.API;
+namespace Backbone.ConsumerApi.Tests.Integration.API;
public class ChallengesApi : BaseApi
{
diff --git a/ConsumerApi.Tests.Integration/API/TokensApi.cs b/ConsumerApi.Tests.Integration/API/TokensApi.cs
index c664585757..5c18e57f6f 100644
--- a/ConsumerApi.Tests.Integration/API/TokensApi.cs
+++ b/ConsumerApi.Tests.Integration/API/TokensApi.cs
@@ -1,6 +1,6 @@
-using ConsumerApi.Tests.Integration.Models;
+using Backbone.ConsumerApi.Tests.Integration.Models;
-namespace ConsumerApi.Tests.Integration.API;
+namespace Backbone.ConsumerApi.Tests.Integration.API;
public class TokensApi : BaseApi
{
diff --git a/ConsumerApi.Tests.Integration/Configuration/Settings.cs b/ConsumerApi.Tests.Integration/Configuration/Settings.cs
index 548662ec46..8a42c1cc01 100644
--- a/ConsumerApi.Tests.Integration/Configuration/Settings.cs
+++ b/ConsumerApi.Tests.Integration/Configuration/Settings.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace ConsumerApi.Tests.Integration.Configuration;
+namespace Backbone.ConsumerApi.Tests.Integration.Configuration;
public class HttpConfiguration
{
diff --git a/ConsumerApi.Tests.Integration/CustomWebApplicationFactory.cs b/ConsumerApi.Tests.Integration/CustomWebApplicationFactory.cs
index cbedf4ed4d..80822cd67a 100644
--- a/ConsumerApi.Tests.Integration/CustomWebApplicationFactory.cs
+++ b/ConsumerApi.Tests.Integration/CustomWebApplicationFactory.cs
@@ -1,9 +1,9 @@
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.AspNetCore.Mvc.Testing;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
-namespace ConsumerApi.Tests.Integration;
+namespace Backbone.ConsumerApi.Tests.Integration;
public class CustomWebApplicationFactory : WebApplicationFactory where TStartup : class
{
diff --git a/ConsumerApi.Tests.Integration/Extensions/HttpResponseExtensions.cs b/ConsumerApi.Tests.Integration/Extensions/HttpResponseExtensions.cs
index 7cb9d0a342..89cb0f3732 100644
--- a/ConsumerApi.Tests.Integration/Extensions/HttpResponseExtensions.cs
+++ b/ConsumerApi.Tests.Integration/Extensions/HttpResponseExtensions.cs
@@ -1,7 +1,7 @@
-using ConsumerApi.Tests.Integration.Models;
-using ConsumerApi.Tests.Integration.Support;
+using Backbone.ConsumerApi.Tests.Integration.Models;
+using Backbone.ConsumerApi.Tests.Integration.Support;
-namespace ConsumerApi.Tests.Integration.Extensions;
+namespace Backbone.ConsumerApi.Tests.Integration.Extensions;
public static class HttpResponseExtensions
{
diff --git a/ConsumerApi.Tests.Integration/Hooks/Hooks.cs b/ConsumerApi.Tests.Integration/Hooks/Hooks.cs
index 64207337ef..30f86d8e48 100644
--- a/ConsumerApi.Tests.Integration/Hooks/Hooks.cs
+++ b/ConsumerApi.Tests.Integration/Hooks/Hooks.cs
@@ -1,6 +1,6 @@
-using SpecFlowCucumberResultsExporter.Extensions;
+using Backbone.SpecFlowCucumberResultsExporter.Extensions;
-namespace ConsumerApi.Tests.Integration.Hooks;
+namespace Backbone.ConsumerApi.Tests.Integration.Hooks;
[Binding]
public sealed class Hooks
{
diff --git a/ConsumerApi.Tests.Integration/HttpClientFactory.cs b/ConsumerApi.Tests.Integration/HttpClientFactory.cs
index 043d9cb5e5..e4d646c736 100644
--- a/ConsumerApi.Tests.Integration/HttpClientFactory.cs
+++ b/ConsumerApi.Tests.Integration/HttpClientFactory.cs
@@ -1,6 +1,6 @@
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
-namespace ConsumerApi.Tests.Integration;
+namespace Backbone.ConsumerApi.Tests.Integration;
public class HttpClientFactory
{
diff --git a/ConsumerApi.Tests.Integration/Models/AccessTokenRequestException .cs b/ConsumerApi.Tests.Integration/Models/AccessTokenRequestException .cs
index aa754287e2..be690b21c8 100644
--- a/ConsumerApi.Tests.Integration/Models/AccessTokenRequestException .cs
+++ b/ConsumerApi.Tests.Integration/Models/AccessTokenRequestException .cs
@@ -1,6 +1,6 @@
using System.Net;
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class AccessTokenRequestException : Exception
{
diff --git a/ConsumerApi.Tests.Integration/Models/AccessTokenResponse.cs b/ConsumerApi.Tests.Integration/Models/AccessTokenResponse.cs
index ba34c97d25..e32d7b7ae4 100644
--- a/ConsumerApi.Tests.Integration/Models/AccessTokenResponse.cs
+++ b/ConsumerApi.Tests.Integration/Models/AccessTokenResponse.cs
@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class AccessTokenResponse
{
diff --git a/ConsumerApi.Tests.Integration/Models/AuthenticationParameters.cs b/ConsumerApi.Tests.Integration/Models/AuthenticationParameters.cs
index 38b414ff3b..ae3dcb6aac 100644
--- a/ConsumerApi.Tests.Integration/Models/AuthenticationParameters.cs
+++ b/ConsumerApi.Tests.Integration/Models/AuthenticationParameters.cs
@@ -1,4 +1,4 @@
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class AuthenticationParameters
{
diff --git a/ConsumerApi.Tests.Integration/Models/Challenge.cs b/ConsumerApi.Tests.Integration/Models/Challenge.cs
index b9db86fcec..1f4d90eb1a 100644
--- a/ConsumerApi.Tests.Integration/Models/Challenge.cs
+++ b/ConsumerApi.Tests.Integration/Models/Challenge.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class Challenge
{
diff --git a/ConsumerApi.Tests.Integration/Models/CreateTokenRequest.cs b/ConsumerApi.Tests.Integration/Models/CreateTokenRequest.cs
index 6363ba5f68..6d6daa4b6e 100644
--- a/ConsumerApi.Tests.Integration/Models/CreateTokenRequest.cs
+++ b/ConsumerApi.Tests.Integration/Models/CreateTokenRequest.cs
@@ -1,4 +1,4 @@
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class CreateTokenRequest
{
diff --git a/ConsumerApi.Tests.Integration/Models/CreateTokenResponse.cs b/ConsumerApi.Tests.Integration/Models/CreateTokenResponse.cs
index 775bce2a3f..62d5b417ca 100644
--- a/ConsumerApi.Tests.Integration/Models/CreateTokenResponse.cs
+++ b/ConsumerApi.Tests.Integration/Models/CreateTokenResponse.cs
@@ -1,4 +1,4 @@
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class CreateTokenResponse
{
diff --git a/ConsumerApi.Tests.Integration/Models/Error.cs b/ConsumerApi.Tests.Integration/Models/Error.cs
index 78110ef596..2116507662 100644
--- a/ConsumerApi.Tests.Integration/Models/Error.cs
+++ b/ConsumerApi.Tests.Integration/Models/Error.cs
@@ -1,4 +1,4 @@
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class Error
{
diff --git a/ConsumerApi.Tests.Integration/Models/HttpResponse.cs b/ConsumerApi.Tests.Integration/Models/HttpResponse.cs
index f745f925d3..812ee8b6e9 100644
--- a/ConsumerApi.Tests.Integration/Models/HttpResponse.cs
+++ b/ConsumerApi.Tests.Integration/Models/HttpResponse.cs
@@ -1,6 +1,6 @@
using System.Net;
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class HttpResponse
{
diff --git a/ConsumerApi.Tests.Integration/Models/RequestConfiguration.cs b/ConsumerApi.Tests.Integration/Models/RequestConfiguration.cs
index f398b5695c..0db9070c94 100644
--- a/ConsumerApi.Tests.Integration/Models/RequestConfiguration.cs
+++ b/ConsumerApi.Tests.Integration/Models/RequestConfiguration.cs
@@ -1,4 +1,4 @@
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class RequestConfiguration
{
diff --git a/ConsumerApi.Tests.Integration/Models/ResponseContent.cs b/ConsumerApi.Tests.Integration/Models/ResponseContent.cs
index 22cafc4282..9104315974 100644
--- a/ConsumerApi.Tests.Integration/Models/ResponseContent.cs
+++ b/ConsumerApi.Tests.Integration/Models/ResponseContent.cs
@@ -1,6 +1,6 @@
using Newtonsoft.Json;
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class ResponseContent
{
diff --git a/ConsumerApi.Tests.Integration/Models/Token.cs b/ConsumerApi.Tests.Integration/Models/Token.cs
index d31a3fd8ef..c0b5a4f0e3 100644
--- a/ConsumerApi.Tests.Integration/Models/Token.cs
+++ b/ConsumerApi.Tests.Integration/Models/Token.cs
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations;
-namespace ConsumerApi.Tests.Integration.Models;
+namespace Backbone.ConsumerApi.Tests.Integration.Models;
public class Token
{
diff --git a/ConsumerApi.Tests.Integration/StepDefinitions/BaseStepDefinitions.cs b/ConsumerApi.Tests.Integration/StepDefinitions/BaseStepDefinitions.cs
index eb28e2333e..1b67774cf4 100644
--- a/ConsumerApi.Tests.Integration/StepDefinitions/BaseStepDefinitions.cs
+++ b/ConsumerApi.Tests.Integration/StepDefinitions/BaseStepDefinitions.cs
@@ -1,8 +1,8 @@
-using ConsumerApi.Tests.Integration.Configuration;
-using ConsumerApi.Tests.Integration.Models;
+using Backbone.ConsumerApi.Tests.Integration.Configuration;
+using Backbone.ConsumerApi.Tests.Integration.Models;
using Microsoft.Extensions.Options;
-namespace ConsumerApi.Tests.Integration.StepDefinitions;
+namespace Backbone.ConsumerApi.Tests.Integration.StepDefinitions;
[Binding]
public class BaseStepDefinitions
diff --git a/ConsumerApi.Tests.Integration/StepDefinitions/ChallengesApiStepDefinitions.cs b/ConsumerApi.Tests.Integration/StepDefinitions/ChallengesApiStepDefinitions.cs
index 5b11a5c657..805bebb119 100644
--- a/ConsumerApi.Tests.Integration/StepDefinitions/ChallengesApiStepDefinitions.cs
+++ b/ConsumerApi.Tests.Integration/StepDefinitions/ChallengesApiStepDefinitions.cs
@@ -1,11 +1,11 @@
-using ConsumerApi.Tests.Integration.API;
-using ConsumerApi.Tests.Integration.Configuration;
-using ConsumerApi.Tests.Integration.Extensions;
-using ConsumerApi.Tests.Integration.Models;
+using Backbone.ConsumerApi.Tests.Integration.API;
+using Backbone.ConsumerApi.Tests.Integration.Configuration;
+using Backbone.ConsumerApi.Tests.Integration.Extensions;
+using Backbone.ConsumerApi.Tests.Integration.Models;
using Microsoft.Extensions.Options;
using TechTalk.SpecFlow.Assist;
-namespace ConsumerApi.Tests.Integration.StepDefinitions;
+namespace Backbone.ConsumerApi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "POST Challenge")]
diff --git a/ConsumerApi.Tests.Integration/StepDefinitions/TokensApiStepDefinitions.cs b/ConsumerApi.Tests.Integration/StepDefinitions/TokensApiStepDefinitions.cs
index e6aeaf3f5a..05b6e61001 100644
--- a/ConsumerApi.Tests.Integration/StepDefinitions/TokensApiStepDefinitions.cs
+++ b/ConsumerApi.Tests.Integration/StepDefinitions/TokensApiStepDefinitions.cs
@@ -1,13 +1,13 @@
using System.Net;
-using ConsumerApi.Tests.Integration.API;
-using ConsumerApi.Tests.Integration.Configuration;
-using ConsumerApi.Tests.Integration.Extensions;
-using ConsumerApi.Tests.Integration.Models;
+using Backbone.ConsumerApi.Tests.Integration.API;
+using Backbone.ConsumerApi.Tests.Integration.Configuration;
+using Backbone.ConsumerApi.Tests.Integration.Extensions;
+using Backbone.ConsumerApi.Tests.Integration.Models;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using TechTalk.SpecFlow.Assist;
-namespace ConsumerApi.Tests.Integration.StepDefinitions;
+namespace Backbone.ConsumerApi.Tests.Integration.StepDefinitions;
[Binding]
[Scope(Feature = "POST Token")]
diff --git a/ConsumerApi.Tests.Integration/Support/Dependencies.cs b/ConsumerApi.Tests.Integration/Support/Dependencies.cs
index b3c621f6fd..d2214572bf 100644
--- a/ConsumerApi.Tests.Integration/Support/Dependencies.cs
+++ b/ConsumerApi.Tests.Integration/Support/Dependencies.cs
@@ -1,10 +1,10 @@
-using ConsumerApi.Tests.Integration.API;
-using ConsumerApi.Tests.Integration.Configuration;
+using Backbone.ConsumerApi.Tests.Integration.API;
+using Backbone.ConsumerApi.Tests.Integration.Configuration;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using SolidToken.SpecFlow.DependencyInjection;
-namespace ConsumerApi.Tests.Integration.Support;
+namespace Backbone.ConsumerApi.Tests.Integration.Support;
public static class Dependencies
{
diff --git a/ConsumerApi.Tests.Integration/Support/JsonValidators.cs b/ConsumerApi.Tests.Integration/Support/JsonValidators.cs
index a5a84f2ac7..25ac54da17 100644
--- a/ConsumerApi.Tests.Integration/Support/JsonValidators.cs
+++ b/ConsumerApi.Tests.Integration/Support/JsonValidators.cs
@@ -3,7 +3,7 @@
using Newtonsoft.Json.Schema.Generation;
using Newtonsoft.Json.Serialization;
-namespace ConsumerApi.Tests.Integration.Support;
+namespace Backbone.ConsumerApi.Tests.Integration.Support;
public class JsonValidators
{
diff --git a/ConsumerApi/ApplicationInsights/TelemetryInitializers/CloudRoleNameTelemetryInitializer.cs b/ConsumerApi/ApplicationInsights/TelemetryInitializers/CloudRoleNameTelemetryInitializer.cs
index 30fc484d4d..dd21818b2a 100644
--- a/ConsumerApi/ApplicationInsights/TelemetryInitializers/CloudRoleNameTelemetryInitializer.cs
+++ b/ConsumerApi/ApplicationInsights/TelemetryInitializers/CloudRoleNameTelemetryInitializer.cs
@@ -1,7 +1,7 @@
using Microsoft.ApplicationInsights.Channel;
using Microsoft.ApplicationInsights.Extensibility;
-namespace ConsumerApi.ApplicationInsights.TelemetryInitializers;
+namespace Backbone.ConsumerApi.ApplicationInsights.TelemetryInitializers;
public class CloudRoleNameTelemetryInitializer : ITelemetryInitializer
{
diff --git a/ConsumerApi/ApplicationInsights/TelemetryInitializers/UserInformationTelemetryInitializer.cs b/ConsumerApi/ApplicationInsights/TelemetryInitializers/UserInformationTelemetryInitializer.cs
index 89e5504a80..966f3f9f57 100644
--- a/ConsumerApi/ApplicationInsights/TelemetryInitializers/UserInformationTelemetryInitializer.cs
+++ b/ConsumerApi/ApplicationInsights/TelemetryInitializers/UserInformationTelemetryInitializer.cs
@@ -1,9 +1,9 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Microsoft.ApplicationInsights.Channel;
using Microsoft.ApplicationInsights.DataContracts;
using Microsoft.ApplicationInsights.Extensibility;
-namespace ConsumerApi.ApplicationInsights.TelemetryInitializers;
+namespace Backbone.ConsumerApi.ApplicationInsights.TelemetryInitializers;
public class UserInformationTelemetryInitializer : ITelemetryInitializer
{
diff --git a/ConsumerApi/Configuration/BackboneConfiguration.cs b/ConsumerApi/Configuration/BackboneConfiguration.cs
index 02b5538abc..3f7244020a 100644
--- a/ConsumerApi/Configuration/BackboneConfiguration.cs
+++ b/ConsumerApi/Configuration/BackboneConfiguration.cs
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
-using Backbone.Infrastructure.EventBus;
+using Backbone.Backbone.Infrastructure.EventBus;
-namespace ConsumerApi.Configuration;
+namespace Backbone.ConsumerApi.Configuration;
public class BackboneConfiguration
{
diff --git a/ConsumerApi/Controllers/AuthorizationController.cs b/ConsumerApi/Controllers/AuthorizationController.cs
index cd12d349b1..647c5432d1 100644
--- a/ConsumerApi/Controllers/AuthorizationController.cs
+++ b/ConsumerApi/Controllers/AuthorizationController.cs
@@ -1,9 +1,9 @@
using System.Security.Claims;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.ConsumerApi.Mvc;
using Backbone.Modules.Devices.Application;
using Backbone.Modules.Devices.Domain.Entities;
-using ConsumerApi.Mvc;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using MediatR;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Authentication;
@@ -16,7 +16,7 @@
using OpenIddict.Validation.AspNetCore;
using static OpenIddict.Abstractions.OpenIddictConstants;
-namespace ConsumerApi.Controllers;
+namespace Backbone.ConsumerApi.Controllers;
[Authorize(OpenIddictValidationAspNetCoreDefaults.AuthenticationScheme)]
public class AuthorizationController : ApiControllerBase
diff --git a/ConsumerApi/DevicesDbContextSeed.cs b/ConsumerApi/DevicesDbContextSeed.cs
index 032904001f..03bca5ad9b 100644
--- a/ConsumerApi/DevicesDbContextSeed.cs
+++ b/ConsumerApi/DevicesDbContextSeed.cs
@@ -6,7 +6,7 @@
using MediatR;
using Microsoft.EntityFrameworkCore;
-namespace ConsumerApi;
+namespace Backbone.ConsumerApi;
public class DevicesDbContextSeed
{
diff --git a/ConsumerApi/Extensions/IConfigurationBuilderExtensions.cs b/ConsumerApi/Extensions/IConfigurationBuilderExtensions.cs
index 6fdfaabeb7..5079115adb 100644
--- a/ConsumerApi/Extensions/IConfigurationBuilderExtensions.cs
+++ b/ConsumerApi/Extensions/IConfigurationBuilderExtensions.cs
@@ -1,6 +1,6 @@
using Azure.Identity;
-namespace ConsumerApi.Extensions;
+namespace Backbone.ConsumerApi.Extensions;
public static class IConfigurationBuilderExtensions
{
diff --git a/ConsumerApi/Extensions/IConfigurationExtensions.cs b/ConsumerApi/Extensions/IConfigurationExtensions.cs
index 69450fc974..788e02ac7e 100644
--- a/ConsumerApi/Extensions/IConfigurationExtensions.cs
+++ b/ConsumerApi/Extensions/IConfigurationExtensions.cs
@@ -1,6 +1,6 @@
using System.Diagnostics.CodeAnalysis;
-namespace ConsumerApi.Extensions;
+namespace Backbone.ConsumerApi.Extensions;
[ExcludeFromCodeCoverage]
internal static class IConfigurationExtensions
diff --git a/ConsumerApi/Extensions/IServiceCollectionExtensions.cs b/ConsumerApi/Extensions/IServiceCollectionExtensions.cs
index e7a3f4e4f6..d43ad20da7 100644
--- a/ConsumerApi/Extensions/IServiceCollectionExtensions.cs
+++ b/ConsumerApi/Extensions/IServiceCollectionExtensions.cs
@@ -1,16 +1,16 @@
using System.Security.Cryptography.X509Certificates;
using System.Text.Json;
using System.Text.Json.Serialization;
-using Backbone.Infrastructure.UserContext;
+using Backbone.Backbone.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc.ExceptionFilters;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.ConsumerApi.ApplicationInsights.TelemetryInitializers;
+using Backbone.ConsumerApi.Configuration;
using Backbone.Modules.Devices.Application.Devices.Commands.RegisterDevice;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
-using ConsumerApi.ApplicationInsights.TelemetryInitializers;
-using ConsumerApi.Configuration;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc.ExceptionFilters;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using FluentValidation;
using FluentValidation.AspNetCore;
using Microsoft.ApplicationInsights.Channel;
@@ -25,7 +25,7 @@
using Serilog;
using PublicKey = Backbone.Modules.Devices.Application.Devices.DTOs.PublicKey;
-namespace ConsumerApi.Extensions;
+namespace Backbone.ConsumerApi.Extensions;
public static class IServiceCollectionExtensions
{
diff --git a/ConsumerApi/Extensions/ModelStateDictionaryExtensions.cs b/ConsumerApi/Extensions/ModelStateDictionaryExtensions.cs
index 7728aaf266..941c5101ba 100644
--- a/ConsumerApi/Extensions/ModelStateDictionaryExtensions.cs
+++ b/ConsumerApi/Extensions/ModelStateDictionaryExtensions.cs
@@ -1,6 +1,6 @@
using Microsoft.AspNetCore.Mvc.ModelBinding;
-namespace ConsumerApi.Extensions;
+namespace Backbone.ConsumerApi.Extensions;
public static class ModelStateDictionaryExtensions
{
diff --git a/ConsumerApi/Mvc/ApiControllerBase.cs b/ConsumerApi/Mvc/ApiControllerBase.cs
index 6a459fe26d..4119c269c0 100644
--- a/ConsumerApi/Mvc/ApiControllerBase.cs
+++ b/ConsumerApi/Mvc/ApiControllerBase.cs
@@ -1,10 +1,10 @@
using System.Net.Mime;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Mvc;
-namespace ConsumerApi.Mvc;
+namespace Backbone.ConsumerApi.Mvc;
[Produces(MediaTypeNames.Application.Json)]
[Consumes(MediaTypeNames.Application.Json)]
diff --git a/ConsumerApi/Mvc/ControllerAttributes/ProducesErrorAttribute.cs b/ConsumerApi/Mvc/ControllerAttributes/ProducesErrorAttribute.cs
index 24bc2acf4a..5921fe7fe4 100644
--- a/ConsumerApi/Mvc/ControllerAttributes/ProducesErrorAttribute.cs
+++ b/ConsumerApi/Mvc/ControllerAttributes/ProducesErrorAttribute.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API;
using Microsoft.AspNetCore.Mvc;
-namespace ConsumerApi.Mvc.ControllerAttributes;
+namespace Backbone.ConsumerApi.Mvc.ControllerAttributes;
public class ProducesErrorAttribute : ProducesResponseTypeAttribute
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Challenges/ChallengeIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Challenges/ChallengeIdJsonConverter.cs
index 2f4789a309..3ffc6e6ed5 100644
--- a/ConsumerApi/Mvc/JsonConverters/Challenges/ChallengeIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Challenges/ChallengeIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Challenges.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Challenges;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Challenges;
public class ChallengeIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Files/FileIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Files/FileIdJsonConverter.cs
index 98b2efd649..3cf5fb3358 100644
--- a/ConsumerApi/Mvc/JsonConverters/Files/FileIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Files/FileIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Files.Domain.Entities;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Files;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Files;
public class FileIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Messages/FileIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Messages/FileIdJsonConverter.cs
index 7fb4cbb53d..85e4441961 100644
--- a/ConsumerApi/Mvc/JsonConverters/Messages/FileIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Messages/FileIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Messages;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Messages;
public class FileIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Messages/MessageIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Messages/MessageIdJsonConverter.cs
index 3bca830d99..6539855f5f 100644
--- a/ConsumerApi/Mvc/JsonConverters/Messages/MessageIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Messages/MessageIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Messages;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Messages;
public class MessageIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Messages/RelationshipIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Messages/RelationshipIdJsonConverter.cs
index 70f8a9b842..34429f5426 100644
--- a/ConsumerApi/Mvc/JsonConverters/Messages/RelationshipIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Messages/RelationshipIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Messages;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Messages;
public class RelationshipIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipChangeIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipChangeIdJsonConverter.cs
index 6c3d0c3a25..6946d43881 100644
--- a/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipChangeIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipChangeIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Relationships;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Relationships;
public class RelationshipChangeIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipIdJsonConverter.cs
index d5d8e475d7..9006a6553d 100644
--- a/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Relationships;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Relationships;
public class RelationshipIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipTemplateIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipTemplateIdJsonConverter.cs
index 4d0f3da924..8c27d484f1 100644
--- a/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipTemplateIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Relationships/RelationshipTemplateIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Relationships;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Relationships;
public class RelationshipTemplateIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Synchronization/DatawalletIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Synchronization/DatawalletIdJsonConverter.cs
index 6fc010863c..28a01f936b 100644
--- a/ConsumerApi/Mvc/JsonConverters/Synchronization/DatawalletIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Synchronization/DatawalletIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Synchronization;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Synchronization;
public class DatawalletIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Synchronization/DatawalletModificationIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Synchronization/DatawalletModificationIdJsonConverter.cs
index 58f9559d77..f46c74a08a 100644
--- a/ConsumerApi/Mvc/JsonConverters/Synchronization/DatawalletModificationIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Synchronization/DatawalletModificationIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Synchronization;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Synchronization;
public class DatawalletModificationIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Synchronization/ExternalEventIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Synchronization/ExternalEventIdJsonConverter.cs
index df51776050..eddb27d86f 100644
--- a/ConsumerApi/Mvc/JsonConverters/Synchronization/ExternalEventIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Synchronization/ExternalEventIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Synchronization;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Synchronization;
public class ExternalEventIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Synchronization/SyncErrorIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Synchronization/SyncErrorIdJsonConverter.cs
index 1f5942d3b0..e6963bdb70 100644
--- a/ConsumerApi/Mvc/JsonConverters/Synchronization/SyncErrorIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Synchronization/SyncErrorIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Synchronization;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Synchronization;
public class SyncErrorIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Synchronization/SyncRunIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Synchronization/SyncRunIdJsonConverter.cs
index 793f410057..f92a906d50 100644
--- a/ConsumerApi/Mvc/JsonConverters/Synchronization/SyncRunIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Synchronization/SyncRunIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Synchronization;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Synchronization;
public class SyncRunIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/JsonConverters/Tokens/TokenIdJsonConverter.cs b/ConsumerApi/Mvc/JsonConverters/Tokens/TokenIdJsonConverter.cs
index b6b8d690e4..7a6c4169e4 100644
--- a/ConsumerApi/Mvc/JsonConverters/Tokens/TokenIdJsonConverter.cs
+++ b/ConsumerApi/Mvc/JsonConverters/Tokens/TokenIdJsonConverter.cs
@@ -1,9 +1,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Domain;
-namespace ConsumerApi.Mvc.JsonConverters.Tokens;
+namespace Backbone.ConsumerApi.Mvc.JsonConverters.Tokens;
public class TokenIdJsonConverter : JsonConverter
{
diff --git a/ConsumerApi/Mvc/Middleware/RequestResponseTimeMiddleware.cs b/ConsumerApi/Mvc/Middleware/RequestResponseTimeMiddleware.cs
index f416405940..46d80904a3 100644
--- a/ConsumerApi/Mvc/Middleware/RequestResponseTimeMiddleware.cs
+++ b/ConsumerApi/Mvc/Middleware/RequestResponseTimeMiddleware.cs
@@ -1,6 +1,6 @@
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
-namespace ConsumerApi.Mvc.Middleware;
+namespace Backbone.ConsumerApi.Mvc.Middleware;
public class RequestResponseTimeMiddleware
{
diff --git a/ConsumerApi/Mvc/Middleware/ResponseDurationMiddleware.cs b/ConsumerApi/Mvc/Middleware/ResponseDurationMiddleware.cs
index 410b11f697..19448d2fac 100644
--- a/ConsumerApi/Mvc/Middleware/ResponseDurationMiddleware.cs
+++ b/ConsumerApi/Mvc/Middleware/ResponseDurationMiddleware.cs
@@ -1,6 +1,6 @@
using System.Diagnostics;
-namespace ConsumerApi.Mvc.Middleware;
+namespace Backbone.ConsumerApi.Mvc.Middleware;
public class ResponseDurationMiddleware
{
diff --git a/ConsumerApi/Mvc/Middleware/TraceIdMiddleware.cs b/ConsumerApi/Mvc/Middleware/TraceIdMiddleware.cs
index 542dbff0a5..74e9788608 100644
--- a/ConsumerApi/Mvc/Middleware/TraceIdMiddleware.cs
+++ b/ConsumerApi/Mvc/Middleware/TraceIdMiddleware.cs
@@ -1,4 +1,4 @@
-namespace ConsumerApi.Mvc.Middleware;
+namespace Backbone.ConsumerApi.Mvc.Middleware;
public class TraceIdMiddleware
{
diff --git a/ConsumerApi/Mvc/Middleware/UserDataLoggingMiddleware.cs b/ConsumerApi/Mvc/Middleware/UserDataLoggingMiddleware.cs
index 5a175b9e0a..31fbd2b750 100644
--- a/ConsumerApi/Mvc/Middleware/UserDataLoggingMiddleware.cs
+++ b/ConsumerApi/Mvc/Middleware/UserDataLoggingMiddleware.cs
@@ -1,10 +1,10 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Microsoft.AspNetCore;
using Serilog.Context;
using Serilog.Core;
using Serilog.Core.Enrichers;
-namespace ConsumerApi.Mvc.Middleware;
+namespace Backbone.ConsumerApi.Mvc.Middleware;
public class UserDataLoggingMiddleware
{
diff --git a/ConsumerApi/Program.cs b/ConsumerApi/Program.cs
index f876ce0adf..0cd478cfb1 100644
--- a/ConsumerApi/Program.cs
+++ b/ConsumerApi/Program.cs
@@ -1,6 +1,16 @@
using System.Reflection;
using Autofac.Extensions.DependencyInjection;
-using Backbone.Infrastructure.EventBus;
+using Backbone.Backbone.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.QuotaCheck;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.Common.Infrastructure;
+using Backbone.ConsumerApi;
+using Backbone.ConsumerApi.Configuration;
+using Backbone.ConsumerApi.Extensions;
+using Backbone.ConsumerApi.Mvc.Middleware;
using Backbone.Modules.Challenges.ConsumerApi;
using Backbone.Modules.Challenges.Infrastructure.Persistence.Database;
using Backbone.Modules.Devices.ConsumerApi;
@@ -17,17 +27,7 @@
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database;
using Backbone.Modules.Tokens.ConsumerApi;
using Backbone.Modules.Tokens.Infrastructure.Persistence.Database;
-using ConsumerApi;
-using ConsumerApi.Configuration;
-using ConsumerApi.Extensions;
-using ConsumerApi.Mvc.Middleware;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.QuotaCheck;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
-using Enmeshed.Common.Infrastructure;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using MediatR;
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
@@ -206,6 +206,9 @@ static void LoadConfiguration(WebApplicationBuilder webApplicationBuilder, strin
webApplicationBuilder.Configuration.AddAzureAppConfiguration();
}
-public partial class Program
+namespace Backbone.ConsumerApi
{
+ public partial class Program
+ {
+ }
}
diff --git a/ConsumerApi/QuotasDbContextSeed.cs b/ConsumerApi/QuotasDbContextSeed.cs
index 1b673563b6..a43585f5c4 100644
--- a/ConsumerApi/QuotasDbContextSeed.cs
+++ b/ConsumerApi/QuotasDbContextSeed.cs
@@ -4,7 +4,7 @@
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
-namespace ConsumerApi;
+namespace Backbone.ConsumerApi;
public class QuotasDbContextSeed
{
diff --git a/Modules/Challenges/src/Challenges.Application/AutoMapper/AutoMapperProfile.cs b/Modules/Challenges/src/Challenges.Application/AutoMapper/AutoMapperProfile.cs
index f24857b2c5..57a8c88449 100644
--- a/Modules/Challenges/src/Challenges.Application/AutoMapper/AutoMapperProfile.cs
+++ b/Modules/Challenges/src/Challenges.Application/AutoMapper/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
using System.Reflection;
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.AutoMapper;
namespace Backbone.Modules.Challenges.Application.AutoMapper;
diff --git a/Modules/Challenges/src/Challenges.Application/Challenges/Commands/CreateChallenge/Handler.cs b/Modules/Challenges/src/Challenges.Application/Challenges/Commands/CreateChallenge/Handler.cs
index 18d967de25..9fe70ebb82 100644
--- a/Modules/Challenges/src/Challenges.Application/Challenges/Commands/CreateChallenge/Handler.cs
+++ b/Modules/Challenges/src/Challenges.Application/Challenges/Commands/CreateChallenge/Handler.cs
@@ -1,8 +1,8 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Challenges.Application.Challenges.DTOs;
using Backbone.Modules.Challenges.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Challenges.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Challenges.Application.Challenges.Commands.CreateChallenge;
diff --git a/Modules/Challenges/src/Challenges.Application/Challenges/DTOs/ChallengeDTO.cs b/Modules/Challenges/src/Challenges.Application/Challenges/DTOs/ChallengeDTO.cs
index df23fcaf3d..a710d305e4 100644
--- a/Modules/Challenges/src/Challenges.Application/Challenges/DTOs/ChallengeDTO.cs
+++ b/Modules/Challenges/src/Challenges.Application/Challenges/DTOs/ChallengeDTO.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Challenges.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Challenges.Domain.Entities;
using Backbone.Modules.Challenges.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Challenges.Application.Challenges.DTOs;
diff --git a/Modules/Challenges/src/Challenges.Application/Challenges/Queries/GetChallengeById/Handler.cs b/Modules/Challenges/src/Challenges.Application/Challenges/Queries/GetChallengeById/Handler.cs
index cd4a945bf0..79338b1f3d 100644
--- a/Modules/Challenges/src/Challenges.Application/Challenges/Queries/GetChallengeById/Handler.cs
+++ b/Modules/Challenges/src/Challenges.Application/Challenges/Queries/GetChallengeById/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using Backbone.Modules.Challenges.Application.Challenges.DTOs;
using Backbone.Modules.Challenges.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using MediatR;
namespace Backbone.Modules.Challenges.Application.Challenges.Queries.GetChallengeById;
diff --git a/Modules/Challenges/src/Challenges.Application/Extensions/ApplicationServiceCollectionExtensions.cs b/Modules/Challenges/src/Challenges.Application/Extensions/ApplicationServiceCollectionExtensions.cs
index 496f769d34..7f0dfd6f7d 100644
--- a/Modules/Challenges/src/Challenges.Application/Extensions/ApplicationServiceCollectionExtensions.cs
+++ b/Modules/Challenges/src/Challenges.Application/Extensions/ApplicationServiceCollectionExtensions.cs
@@ -1,11 +1,11 @@
-using Backbone.Modules.Challenges.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.MediatR;
+using Backbone.Modules.Challenges.Application.AutoMapper;
using Backbone.Modules.Challenges.Application.Challenges.Commands.CreateChallenge;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.MediatR;
using FluentValidation;
using MediatR;
using Microsoft.Extensions.DependencyInjection;
-using ValidationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ValidationException;
+using ValidationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ValidationException;
namespace Backbone.Modules.Challenges.Application.Extensions;
diff --git a/Modules/Challenges/src/Challenges.Application/Extensions/ChallengeQueryableExtensions.cs b/Modules/Challenges/src/Challenges.Application/Extensions/ChallengeQueryableExtensions.cs
index 7f300b2fb9..2e640849ec 100644
--- a/Modules/Challenges/src/Challenges.Application/Extensions/ChallengeQueryableExtensions.cs
+++ b/Modules/Challenges/src/Challenges.Application/Extensions/ChallengeQueryableExtensions.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Challenges.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Challenges.Domain.Entities;
using Backbone.Modules.Challenges.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Challenges.Application.Extensions;
diff --git a/Modules/Challenges/src/Challenges.ConsumerApi/ChallengesModule.cs b/Modules/Challenges/src/Challenges.ConsumerApi/ChallengesModule.cs
index e3b114d7dc..1f2fc26db7 100644
--- a/Modules/Challenges/src/Challenges.ConsumerApi/ChallengesModule.cs
+++ b/Modules/Challenges/src/Challenges.ConsumerApi/ChallengesModule.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Challenges.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Challenges.Application;
using Backbone.Modules.Challenges.Application.Extensions;
using Backbone.Modules.Challenges.Infrastructure.Persistence;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/Modules/Challenges/src/Challenges.ConsumerApi/Controllers/ChallengesController.cs b/Modules/Challenges/src/Challenges.ConsumerApi/Controllers/ChallengesController.cs
index 0d7ffab685..4de37f542e 100644
--- a/Modules/Challenges/src/Challenges.ConsumerApi/Controllers/ChallengesController.cs
+++ b/Modules/Challenges/src/Challenges.ConsumerApi/Controllers/ChallengesController.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Challenges.Application.Challenges.Commands.CreateChallenge;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.Modules.Challenges.Application.Challenges.Commands.CreateChallenge;
using Backbone.Modules.Challenges.Application.Challenges.DTOs;
using Backbone.Modules.Challenges.Application.Challenges.Queries.GetChallengeById;
using Backbone.Modules.Challenges.Domain.Ids;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
diff --git a/Modules/Challenges/src/Challenges.Domain/Entities/Challenge.cs b/Modules/Challenges/src/Challenges.Domain/Entities/Challenge.cs
index c3d043d4c3..30e332e981 100644
--- a/Modules/Challenges/src/Challenges.Domain/Entities/Challenge.cs
+++ b/Modules/Challenges/src/Challenges.Domain/Entities/Challenge.cs
@@ -1,7 +1,7 @@
using System.Linq.Expressions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Challenges.Domain.Ids;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
namespace Backbone.Modules.Challenges.Domain.Entities;
diff --git a/Modules/Challenges/src/Challenges.Domain/Ids/ChallengeId.cs b/Modules/Challenges/src/Challenges.Domain/Ids/ChallengeId.cs
index 12dbe8928c..48377d743d 100644
--- a/Modules/Challenges/src/Challenges.Domain/Ids/ChallengeId.cs
+++ b/Modules/Challenges/src/Challenges.Domain/Ids/ChallengeId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Challenges.Domain.Ids;
diff --git a/Modules/Challenges/src/Challenges.Infrastructure/CompiledModels/Postgres/ChallengeEntityType.cs b/Modules/Challenges/src/Challenges.Infrastructure/CompiledModels/Postgres/ChallengeEntityType.cs
index bf047a0e37..4dd85fdd3f 100644
--- a/Modules/Challenges/src/Challenges.Infrastructure/CompiledModels/Postgres/ChallengeEntityType.cs
+++ b/Modules/Challenges/src/Challenges.Infrastructure/CompiledModels/Postgres/ChallengeEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Challenges.Domain.Entities;
using Backbone.Modules.Challenges.Domain.Ids;
using Backbone.Modules.Challenges.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Challenges/src/Challenges.Infrastructure/CompiledModels/SqlServer/ChallengeEntityType.cs b/Modules/Challenges/src/Challenges.Infrastructure/CompiledModels/SqlServer/ChallengeEntityType.cs
index 82c8ef8a7b..88295c1f11 100644
--- a/Modules/Challenges/src/Challenges.Infrastructure/CompiledModels/SqlServer/ChallengeEntityType.cs
+++ b/Modules/Challenges/src/Challenges.Infrastructure/CompiledModels/SqlServer/ChallengeEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Challenges.Domain.Entities;
using Backbone.Modules.Challenges.Domain.Ids;
using Backbone.Modules.Challenges.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Challenges/src/Challenges.Infrastructure/Persistence/Database/ChallengesDbContext.cs b/Modules/Challenges/src/Challenges.Infrastructure/Persistence/Database/ChallengesDbContext.cs
index dab2991127..0c16bb1df1 100644
--- a/Modules/Challenges/src/Challenges.Infrastructure/Persistence/Database/ChallengesDbContext.cs
+++ b/Modules/Challenges/src/Challenges.Infrastructure/Persistence/Database/ChallengesDbContext.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Challenges.Domain.Entities;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.Modules.Challenges.Domain.Entities;
using Backbone.Modules.Challenges.Domain.Ids;
using Backbone.Modules.Challenges.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Challenges.Infrastructure.Persistence.Database;
diff --git a/Modules/Challenges/src/Challenges.Jobs.Cleanup/Program.cs b/Modules/Challenges/src/Challenges.Jobs.Cleanup/Program.cs
index d3f5dd9c8b..1bd44487e5 100644
--- a/Modules/Challenges/src/Challenges.Jobs.Cleanup/Program.cs
+++ b/Modules/Challenges/src/Challenges.Jobs.Cleanup/Program.cs
@@ -1,10 +1,10 @@
using System.Reflection;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Challenges.Application.Extensions;
using Backbone.Modules.Challenges.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Challenges.Infrastructure.Persistence.Database;
using Backbone.Modules.Challenges.Infrastructure.Persistence.Database.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Challenges.Jobs.Cleanup;
diff --git a/Modules/Devices/src/Devices.AdminCli/Commands/BaseClasses/AdminCliDbCommand.cs b/Modules/Devices/src/Devices.AdminCli/Commands/BaseClasses/AdminCliDbCommand.cs
index 7a4d4d916c..841c5a1da8 100644
--- a/Modules/Devices/src/Devices.AdminCli/Commands/BaseClasses/AdminCliDbCommand.cs
+++ b/Modules/Devices/src/Devices.AdminCli/Commands/BaseClasses/AdminCliDbCommand.cs
@@ -1,5 +1,5 @@
using System.CommandLine;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Devices.AdminCli.Commands.BaseClasses;
diff --git a/Modules/Devices/src/Devices.AdminCli/Commands/Tiers/ListTiersCommand.cs b/Modules/Devices/src/Devices.AdminCli/Commands/Tiers/ListTiersCommand.cs
index f0d4a69bf6..44fa76135b 100644
--- a/Modules/Devices/src/Devices.AdminCli/Commands/Tiers/ListTiersCommand.cs
+++ b/Modules/Devices/src/Devices.AdminCli/Commands/Tiers/ListTiersCommand.cs
@@ -1,8 +1,8 @@
using System.CommandLine;
using System.Text.Json;
+using Backbone.BuildingBlocks.Application.Pagination;
using Backbone.Modules.Devices.AdminCli.Commands.BaseClasses;
using Backbone.Modules.Devices.Application.Tiers.Queries.ListTiers;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
namespace Backbone.Modules.Devices.AdminCli.Commands.Tiers;
diff --git a/Modules/Devices/src/Devices.AdminCli/ServiceLocator.cs b/Modules/Devices/src/Devices.AdminCli/ServiceLocator.cs
index ea1c3e19cd..17d3a8a583 100644
--- a/Modules/Devices/src/Devices.AdminCli/ServiceLocator.cs
+++ b/Modules/Devices/src/Devices.AdminCli/ServiceLocator.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Devices.Application.Extensions;
+using Backbone.BuildingBlocks.Application.QuotaCheck;
+using Backbone.Modules.Devices.Application.Extensions;
using Backbone.Modules.Devices.Domain.Entities;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
using Backbone.Modules.Devices.Infrastructure.Persistence;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.QuotaCheck;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection;
diff --git a/Modules/Devices/src/Devices.Application/ApplicationErrors.cs b/Modules/Devices/src/Devices.Application/ApplicationErrors.cs
index 695e7907d3..d6ad5b2aca 100644
--- a/Modules/Devices/src/Devices.Application/ApplicationErrors.cs
+++ b/Modules/Devices/src/Devices.Application/ApplicationErrors.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Devices.Application;
diff --git a/Modules/Devices/src/Devices.Application/AutoMapper/AutoMapperProfile.cs b/Modules/Devices/src/Devices.Application/AutoMapper/AutoMapperProfile.cs
index 8196fc00a9..b0351f0e90 100644
--- a/Modules/Devices/src/Devices.Application/AutoMapper/AutoMapperProfile.cs
+++ b/Modules/Devices/src/Devices.Application/AutoMapper/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
using System.Reflection;
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.AutoMapper;
namespace Backbone.Modules.Devices.Application.AutoMapper;
diff --git a/Modules/Devices/src/Devices.Application/ChallengeValidator.cs b/Modules/Devices/src/Devices.Application/ChallengeValidator.cs
index d158511d70..60b64dbecc 100644
--- a/Modules/Devices/src/Devices.Application/ChallengeValidator.cs
+++ b/Modules/Devices/src/Devices.Application/ChallengeValidator.cs
@@ -1,11 +1,11 @@
using System.Text.Json;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Crypto;
+using Backbone.Crypto.Abstractions;
using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.DTOs;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.Crypto;
-using Enmeshed.Crypto.Abstractions;
namespace Backbone.Modules.Devices.Application;
diff --git a/Modules/Devices/src/Devices.Application/ClientIdGenerator.cs b/Modules/Devices/src/Devices.Application/ClientIdGenerator.cs
index 4d548a7555..3fe75c36e9 100644
--- a/Modules/Devices/src/Devices.Application/ClientIdGenerator.cs
+++ b/Modules/Devices/src/Devices.Application/ClientIdGenerator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
namespace Backbone.Modules.Devices.Application;
diff --git a/Modules/Devices/src/Devices.Application/Clients/Commands/ChangeClientSecret/ChangeClientSecretCommandValidator.cs b/Modules/Devices/src/Devices.Application/Clients/Commands/ChangeClientSecret/ChangeClientSecretCommandValidator.cs
index f34bc3a008..68b1faeacd 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Commands/ChangeClientSecret/ChangeClientSecretCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Commands/ChangeClientSecret/ChangeClientSecretCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Clients.Commands.ChangeClientSecret;
diff --git a/Modules/Devices/src/Devices.Application/Clients/Commands/ChangeClientSecret/Handler.cs b/Modules/Devices/src/Devices.Application/Clients/Commands/ChangeClientSecret/Handler.cs
index e1158ddc01..6a4d8dcd9a 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Commands/ChangeClientSecret/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Commands/ChangeClientSecret/Handler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using MediatR;
namespace Backbone.Modules.Devices.Application.Clients.Commands.ChangeClientSecret;
diff --git a/Modules/Devices/src/Devices.Application/Clients/Commands/CreateClient/CreateClientCommandValidator.cs b/Modules/Devices/src/Devices.Application/Clients/Commands/CreateClient/CreateClientCommandValidator.cs
index 85b03cf490..b2350ade86 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Commands/CreateClient/CreateClientCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Commands/CreateClient/CreateClientCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Clients.Commands.CreateClient;
diff --git a/Modules/Devices/src/Devices.Application/Clients/Commands/CreateClient/Handler.cs b/Modules/Devices/src/Devices.Application/Clients/Commands/CreateClient/Handler.cs
index af63e55835..75978c64ef 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Commands/CreateClient/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Commands/CreateClient/Handler.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using MediatR;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.Clients.Commands.CreateClient;
diff --git a/Modules/Devices/src/Devices.Application/Clients/Commands/DeleteClient/DeleteClientCommandValidator.cs b/Modules/Devices/src/Devices.Application/Clients/Commands/DeleteClient/DeleteClientCommandValidator.cs
index 54526e3a73..af0d4d7101 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Commands/DeleteClient/DeleteClientCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Commands/DeleteClient/DeleteClientCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Clients.Commands.DeleteClient;
diff --git a/Modules/Devices/src/Devices.Application/Clients/Commands/UpdateClient/Handler.cs b/Modules/Devices/src/Devices.Application/Clients/Commands/UpdateClient/Handler.cs
index d478d5dac1..d96e6be72d 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Commands/UpdateClient/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Commands/UpdateClient/Handler.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Domain;
using MediatR;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.Clients.Commands.UpdateClient;
public class Handler : IRequestHandler
diff --git a/Modules/Devices/src/Devices.Application/Clients/Commands/UpdateClient/UpdateClientCommandValidator.cs b/Modules/Devices/src/Devices.Application/Clients/Commands/UpdateClient/UpdateClientCommandValidator.cs
index 9551bb6394..f679764aa3 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Commands/UpdateClient/UpdateClientCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Commands/UpdateClient/UpdateClientCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Clients.Commands.UpdateClient;
diff --git a/Modules/Devices/src/Devices.Application/Clients/DTOs/ClientDTO.cs b/Modules/Devices/src/Devices.Application/Clients/DTOs/ClientDTO.cs
index 6459a71b4d..8ab879ecbb 100644
--- a/Modules/Devices/src/Devices.Application/Clients/DTOs/ClientDTO.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/DTOs/ClientDTO.cs
@@ -1,6 +1,6 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
namespace Backbone.Modules.Devices.Application.Clients.DTOs;
diff --git a/Modules/Devices/src/Devices.Application/Clients/Queries/GetClient/Handler.cs b/Modules/Devices/src/Devices.Application/Clients/Queries/GetClient/Handler.cs
index c50babf8be..b0f9aa826f 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Queries/GetClient/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Queries/GetClient/Handler.cs
@@ -1,8 +1,8 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using Backbone.Modules.Devices.Application.Clients.DTOs;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using MediatR;
namespace Backbone.Modules.Devices.Application.Clients.Queries.GetClient;
diff --git a/Modules/Devices/src/Devices.Application/Clients/Queries/ListClients/ListClientsResponse.cs b/Modules/Devices/src/Devices.Application/Clients/Queries/ListClients/ListClientsResponse.cs
index a303bdeee7..71b0ec9343 100644
--- a/Modules/Devices/src/Devices.Application/Clients/Queries/ListClients/ListClientsResponse.cs
+++ b/Modules/Devices/src/Devices.Application/Clients/Queries/ListClients/ListClientsResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Application.Clients.DTOs;
-using Enmeshed.BuildingBlocks.Application.CQRS.BaseClasses;
+using Backbone.BuildingBlocks.Application.CQRS.BaseClasses;
+using Backbone.Modules.Devices.Application.Clients.DTOs;
namespace Backbone.Modules.Devices.Application.Clients.Queries.ListClients;
public class ListClientsResponse : EnumerableResponseBase
diff --git a/Modules/Devices/src/Devices.Application/DTOs/IdentitySummaryDTO.cs b/Modules/Devices/src/Devices.Application/DTOs/IdentitySummaryDTO.cs
index 14c9b84284..5506905d79 100644
--- a/Modules/Devices/src/Devices.Application/DTOs/IdentitySummaryDTO.cs
+++ b/Modules/Devices/src/Devices.Application/DTOs/IdentitySummaryDTO.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Application.DTOs;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/ChangePassword/ChangePasswordCommandValidator.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/ChangePassword/ChangePasswordCommandValidator.cs
index 08c7b5ec1f..f5c48278bc 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/ChangePassword/ChangePasswordCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/ChangePassword/ChangePasswordCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Devices.Commands.ChangePassword;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/ChangePassword/Handler.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/ChangePassword/Handler.cs
index 5bbca64b9b..13d8e5ea64 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/ChangePassword/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/ChangePassword/Handler.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/DeleteDeviceCommand.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/DeleteDeviceCommand.cs
index 1225dcd4db..2c53e38810 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/DeleteDeviceCommand.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/DeleteDeviceCommand.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Devices.DTOs;
using MediatR;
namespace Backbone.Modules.Devices.Application.Devices.Commands.DeleteDevice;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/DeleteDeviceValidator.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/DeleteDeviceValidator.cs
index 834e4ce0da..e384b54a65 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/DeleteDeviceValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/DeleteDeviceValidator.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs.Validators;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Modules.Devices.Application.Devices.DTOs.Validators;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Devices.Commands.DeleteDevice;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/Handler.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/Handler.cs
index 87c7c2e2ec..984bddd696 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/DeleteDevice/Handler.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/Handler.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/Handler.cs
index ca00486294..068d0dab89 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/Handler.cs
@@ -2,11 +2,11 @@
using System.Globalization;
using System.Text.Json;
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/RegisterDeviceCommandValidator.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/RegisterDeviceCommandValidator.cs
index 3a45035216..a1b800e881 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/RegisterDeviceCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/RegisterDeviceCommandValidator.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs.Validators;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Modules.Devices.Application.Devices.DTOs.Validators;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Devices.Commands.RegisterDevice;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/RegisterDeviceResponse.cs b/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/RegisterDeviceResponse.cs
index e2c1964a1a..c3e67a3706 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/RegisterDeviceResponse.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Commands/RegisterDevice/RegisterDeviceResponse.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Application.Devices.Commands.RegisterDevice;
diff --git a/Modules/Devices/src/Devices.Application/Devices/DTOs/DeviceDTO.cs b/Modules/Devices/src/Devices.Application/Devices/DTOs/DeviceDTO.cs
index 7a10e641aa..9b9851ee4c 100644
--- a/Modules/Devices/src/Devices.Application/Devices/DTOs/DeviceDTO.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/DTOs/DeviceDTO.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Application.Devices.DTOs;
diff --git a/Modules/Devices/src/Devices.Application/Devices/DTOs/Validators/SignedChallengeDTOValidator.cs b/Modules/Devices/src/Devices.Application/Devices/DTOs/Validators/SignedChallengeDTOValidator.cs
index ab0834c009..897833dc8c 100644
--- a/Modules/Devices/src/Devices.Application/Devices/DTOs/Validators/SignedChallengeDTOValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/DTOs/Validators/SignedChallengeDTOValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Devices.DTOs.Validators;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Queries/GetActiveDevice/Handler.cs b/Modules/Devices/src/Devices.Application/Devices/Queries/GetActiveDevice/Handler.cs
index c9ad6f53f0..dbd6219f0d 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Queries/GetActiveDevice/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Queries/GetActiveDevice/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Devices.Application.Devices.Queries.GetActiveDevice;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/Handler.cs b/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/Handler.cs
index cf1feba7a1..638bdbc3f7 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/Handler.cs
@@ -1,8 +1,8 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Devices.Application.Devices.Queries.ListDevices;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/ListDevicesQuery.cs b/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/ListDevicesQuery.cs
index 91341bb853..7f1b99768b 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/ListDevicesQuery.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/ListDevicesQuery.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Devices.Application.Devices.Queries.ListDevices;
diff --git a/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/ListDevicesResponse.cs b/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/ListDevicesResponse.cs
index 7015bc6bfe..94c89197b7 100644
--- a/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/ListDevicesResponse.cs
+++ b/Modules/Devices/src/Devices.Application/Devices/Queries/ListDevices/ListDevicesResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Devices.Application.Devices.DTOs;
namespace Backbone.Modules.Devices.Application.Devices.Queries.ListDevices;
diff --git a/Modules/Devices/src/Devices.Application/Extensions/IEventBusExtensions.cs b/Modules/Devices/src/Devices.Application/Extensions/IEventBusExtensions.cs
index 5488a130b2..845ee14ace 100644
--- a/Modules/Devices/src/Devices.Application/Extensions/IEventBusExtensions.cs
+++ b/Modules/Devices/src/Devices.Application/Extensions/IEventBusExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.IntegrationEvents.Incoming.DatawalletModificationCreated;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Devices.Application.IntegrationEvents.Incoming.DatawalletModificationCreated;
using Backbone.Modules.Devices.Application.IntegrationEvents.Incoming.ExternalEventCreated;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Devices.Application.Extensions;
diff --git a/Modules/Devices/src/Devices.Application/Extensions/IServiceCollectionExtensions.cs b/Modules/Devices/src/Devices.Application/Extensions/IServiceCollectionExtensions.cs
index e82a26ef2e..9006781197 100644
--- a/Modules/Devices/src/Devices.Application/Extensions/IServiceCollectionExtensions.cs
+++ b/Modules/Devices/src/Devices.Application/Extensions/IServiceCollectionExtensions.cs
@@ -1,9 +1,9 @@
using System.Reflection;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.MediatR;
using Backbone.Modules.Devices.Application.AutoMapper;
using Backbone.Modules.Devices.Application.Clients.Commands.DeleteClient;
using Backbone.Modules.Devices.Application.Devices.Commands.RegisterDevice;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.MediatR;
using FluentValidation;
using Microsoft.Extensions.DependencyInjection;
diff --git a/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/CreateIdentityCommandValidator.cs b/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/CreateIdentityCommandValidator.cs
index f8738104eb..738f882030 100644
--- a/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/CreateIdentityCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/CreateIdentityCommandValidator.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs.Validators;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Modules.Devices.Application.Devices.DTOs.Validators;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Identities.Commands.CreateIdentity;
diff --git a/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/CreateIdentityResponse.cs b/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/CreateIdentityResponse.cs
index f2c00b888a..7bc16829ec 100644
--- a/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/CreateIdentityResponse.cs
+++ b/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/CreateIdentityResponse.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Application.Identities.Commands.CreateIdentity;
diff --git a/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/Handler.cs b/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/Handler.cs
index 7c26718f4a..017783d69b 100644
--- a/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Identities/Commands/CreateIdentity/Handler.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
diff --git a/Modules/Devices/src/Devices.Application/Identities/Commands/UpdateIdentity/Handler.cs b/Modules/Devices/src/Devices.Application/Identities/Commands/UpdateIdentity/Handler.cs
index 9a0cf01613..2789acebbb 100644
--- a/Modules/Devices/src/Devices.Application/Identities/Commands/UpdateIdentity/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Identities/Commands/UpdateIdentity/Handler.cs
@@ -1,11 +1,11 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using MediatR;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.Identities.Commands.UpdateIdentity;
public class Handler : IRequestHandler
diff --git a/Modules/Devices/src/Devices.Application/Identities/Commands/UpdateIdentity/UpdateIdentityCommandValidator.cs b/Modules/Devices/src/Devices.Application/Identities/Commands/UpdateIdentity/UpdateIdentityCommandValidator.cs
index b69dd3db1b..63798b3300 100644
--- a/Modules/Devices/src/Devices.Application/Identities/Commands/UpdateIdentity/UpdateIdentityCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Identities/Commands/UpdateIdentity/UpdateIdentityCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Identities.Commands.UpdateIdentity;
diff --git a/Modules/Devices/src/Devices.Application/Identities/Queries/GetIdentity/Handler.cs b/Modules/Devices/src/Devices.Application/Identities/Queries/GetIdentity/Handler.cs
index e7f039049f..fcbfc47bfd 100644
--- a/Modules/Devices/src/Devices.Application/Identities/Queries/GetIdentity/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Identities/Queries/GetIdentity/Handler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using MediatR;
namespace Backbone.Modules.Devices.Application.Identities.Queries.GetIdentity;
diff --git a/Modules/Devices/src/Devices.Application/Identities/Queries/ListIdentities/ListIdentitiesQuery.cs b/Modules/Devices/src/Devices.Application/Identities/Queries/ListIdentities/ListIdentitiesQuery.cs
index ec881aae55..a8e9df4a4d 100644
--- a/Modules/Devices/src/Devices.Application/Identities/Queries/ListIdentities/ListIdentitiesQuery.cs
+++ b/Modules/Devices/src/Devices.Application/Identities/Queries/ListIdentities/ListIdentitiesQuery.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
using MediatR;
namespace Backbone.Modules.Devices.Application.Identities.Queries.ListIdentities;
diff --git a/Modules/Devices/src/Devices.Application/Identities/Queries/ListIdentities/ListIdentitiesResponse.cs b/Modules/Devices/src/Devices.Application/Identities/Queries/ListIdentities/ListIdentitiesResponse.cs
index 17c519bd1c..4108b4bfce 100644
--- a/Modules/Devices/src/Devices.Application/Identities/Queries/ListIdentities/ListIdentitiesResponse.cs
+++ b/Modules/Devices/src/Devices.Application/Identities/Queries/ListIdentities/ListIdentitiesResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Application.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Devices.Application.DTOs;
namespace Backbone.Modules.Devices.Application.Identities.Queries.ListIdentities;
public class ListIdentitiesResponse : PagedResponse
diff --git a/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Database/IDevicesDbContext.cs b/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Database/IDevicesDbContext.cs
index e0a436f026..51c298573b 100644
--- a/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Database/IDevicesDbContext.cs
+++ b/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Database/IDevicesDbContext.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
namespace Backbone.Modules.Devices.Application.Infrastructure.Persistence.Database;
diff --git a/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/IIdentitiesRepository.cs b/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/IIdentitiesRepository.cs
index 419a05e9e3..df6ad73815 100644
--- a/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/IIdentitiesRepository.cs
+++ b/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/IIdentitiesRepository.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Entities;
namespace Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
diff --git a/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/IPnsRegistrationRepository.cs b/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/IPnsRegistrationRepository.cs
index ab8a321471..f8b118780f 100644
--- a/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/IPnsRegistrationRepository.cs
+++ b/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/IPnsRegistrationRepository.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
namespace Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
diff --git a/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/ITiersRepository.cs b/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/ITiersRepository.cs
index 3e7b75c26c..1d173732b3 100644
--- a/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/ITiersRepository.cs
+++ b/Modules/Devices/src/Devices.Application/Infrastructure/Persistence/Repository/ITiersRepository.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Devices.Domain.Aggregates.Tier;
namespace Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
diff --git a/Modules/Devices/src/Devices.Application/Infrastructure/PushNotifications/IPushService.cs b/Modules/Devices/src/Devices.Application/Infrastructure/PushNotifications/IPushService.cs
index c078acd41b..6ef70d8a10 100644
--- a/Modules/Devices/src/Devices.Application/Infrastructure/PushNotifications/IPushService.cs
+++ b/Modules/Devices/src/Devices.Application/Infrastructure/PushNotifications/IPushService.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
namespace Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
diff --git a/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/DatawalletModificationCreated/DatawalletModifiedIntegrationEvent.cs b/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/DatawalletModificationCreated/DatawalletModifiedIntegrationEvent.cs
index 783a73454f..ab83847dcd 100644
--- a/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/DatawalletModificationCreated/DatawalletModifiedIntegrationEvent.cs
+++ b/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/DatawalletModificationCreated/DatawalletModifiedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Application.IntegrationEvents.Incoming.DatawalletModificationCreated;
diff --git a/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/DatawalletModificationCreated/DatawalletModifiedIntegrationEventHandler.cs b/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/DatawalletModificationCreated/DatawalletModifiedIntegrationEventHandler.cs
index 7211102657..1cd8b91256 100644
--- a/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/DatawalletModificationCreated/DatawalletModifiedIntegrationEventHandler.cs
+++ b/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/DatawalletModificationCreated/DatawalletModifiedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications.Datawallet;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Devices.Application.IntegrationEvents.Incoming.DatawalletModificationCreated;
diff --git a/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/ExternalEventCreated/ExternalEventCreatedIntegrationEvent.cs b/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/ExternalEventCreated/ExternalEventCreatedIntegrationEvent.cs
index 2289164d39..4821c2d547 100644
--- a/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/ExternalEventCreated/ExternalEventCreatedIntegrationEvent.cs
+++ b/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/ExternalEventCreated/ExternalEventCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Devices.Application.IntegrationEvents.Incoming.ExternalEventCreated;
diff --git a/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/ExternalEventCreated/ExternalEventCreatedIntegrationEventHandler.cs b/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/ExternalEventCreated/ExternalEventCreatedIntegrationEventHandler.cs
index e9e1b6026d..f5c8b57f23 100644
--- a/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/ExternalEventCreated/ExternalEventCreatedIntegrationEventHandler.cs
+++ b/Modules/Devices/src/Devices.Application/IntegrationEvents/Incoming/ExternalEventCreated/ExternalEventCreatedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications.ExternalEvents;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Devices.Application.IntegrationEvents.Incoming.ExternalEventCreated;
diff --git a/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/IdentityCreatedIntegrationEvent.cs b/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/IdentityCreatedIntegrationEvent.cs
index 5ceebc4bc9..fccba59b22 100644
--- a/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/IdentityCreatedIntegrationEvent.cs
+++ b/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/IdentityCreatedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Devices.Domain.Entities;
namespace Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
public class IdentityCreatedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierCreatedIntegrationEvent.cs b/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierCreatedIntegrationEvent.cs
index 6e0c2d147c..a5a84f4c03 100644
--- a/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierCreatedIntegrationEvent.cs
+++ b/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierCreatedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Devices.Domain.Aggregates.Tier;
namespace Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
diff --git a/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierDeletedIntegrationEvent.cs b/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierDeletedIntegrationEvent.cs
index c6208d8aad..f0675d538d 100644
--- a/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierDeletedIntegrationEvent.cs
+++ b/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierDeletedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Devices.Domain.Aggregates.Tier;
namespace Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
diff --git a/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierOfIdentityChangedIntegrationEvent.cs b/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierOfIdentityChangedIntegrationEvent.cs
index 7b88790975..b37dfadb6c 100644
--- a/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierOfIdentityChangedIntegrationEvent.cs
+++ b/Modules/Devices/src/Devices.Application/IntegrationEvents/Outgoing/TierOfIdentityChangedIntegrationEvent.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Domain.Aggregates.Tier;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
public class TierOfIdentityChangedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/DeleteDeviceRegistration/Handler.cs b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/DeleteDeviceRegistration/Handler.cs
index 8a01924129..35ebe8e0e3 100644
--- a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/DeleteDeviceRegistration/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/DeleteDeviceRegistration/Handler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using MediatR;
namespace Backbone.Modules.Devices.Application.PushNotifications.Commands.DeleteDeviceRegistration;
diff --git a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/SendTestNotification/Handler.cs b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/SendTestNotification/Handler.cs
index 7cd9d2757f..3f009b8edd 100644
--- a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/SendTestNotification/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/SendTestNotification/Handler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using MediatR;
namespace Backbone.Modules.Devices.Application.PushNotifications.Commands.SendTestNotification;
diff --git a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/SendTestNotification/Validator.cs b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/SendTestNotification/Validator.cs
index 4a61cd6dfc..256e84b1c5 100644
--- a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/SendTestNotification/Validator.cs
+++ b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/SendTestNotification/Validator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.PushNotifications.Commands.SendTestNotification;
diff --git a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/UpdateDeviceRegistration/Handler.cs b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/UpdateDeviceRegistration/Handler.cs
index 57df3a7424..88c1b59431 100644
--- a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/UpdateDeviceRegistration/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/UpdateDeviceRegistration/Handler.cs
@@ -1,11 +1,11 @@
-using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.PushNotifications.Commands.UpdateDeviceRegistration;
diff --git a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/UpdateDeviceRegistration/UpdateDeviceRegistrationValidator.cs b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/UpdateDeviceRegistration/UpdateDeviceRegistrationValidator.cs
index 6100da1589..fd428230cc 100644
--- a/Modules/Devices/src/Devices.Application/PushNotifications/Commands/UpdateDeviceRegistration/UpdateDeviceRegistrationValidator.cs
+++ b/Modules/Devices/src/Devices.Application/PushNotifications/Commands/UpdateDeviceRegistration/UpdateDeviceRegistrationValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.PushNotifications.Commands.UpdateDeviceRegistration;
diff --git a/Modules/Devices/src/Devices.Application/Tiers/Commands/CreateTier/CreateTierCommandValidator.cs b/Modules/Devices/src/Devices.Application/Tiers/Commands/CreateTier/CreateTierCommandValidator.cs
index 05f7466571..8103caf556 100644
--- a/Modules/Devices/src/Devices.Application/Tiers/Commands/CreateTier/CreateTierCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Tiers/Commands/CreateTier/CreateTierCommandValidator.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Tiers.Commands.CreateTier;
diff --git a/Modules/Devices/src/Devices.Application/Tiers/Commands/CreateTier/Handler.cs b/Modules/Devices/src/Devices.Application/Tiers/Commands/CreateTier/Handler.cs
index d54d7881f5..3856af5df5 100644
--- a/Modules/Devices/src/Devices.Application/Tiers/Commands/CreateTier/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Tiers/Commands/CreateTier/Handler.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using MediatR;
using Microsoft.Extensions.Logging;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.Tiers.Commands.CreateTier;
diff --git a/Modules/Devices/src/Devices.Application/Tiers/Commands/DeleteTier/DeleteTierCommandValidator.cs b/Modules/Devices/src/Devices.Application/Tiers/Commands/DeleteTier/DeleteTierCommandValidator.cs
index b4c0289616..5a6d971e3a 100644
--- a/Modules/Devices/src/Devices.Application/Tiers/Commands/DeleteTier/DeleteTierCommandValidator.cs
+++ b/Modules/Devices/src/Devices.Application/Tiers/Commands/DeleteTier/DeleteTierCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Devices.Application.Tiers.Commands.DeleteTier;
diff --git a/Modules/Devices/src/Devices.Application/Tiers/Commands/DeleteTier/Handler.cs b/Modules/Devices/src/Devices.Application/Tiers/Commands/DeleteTier/Handler.cs
index 2dcc8f284b..c55bcd7bc1 100644
--- a/Modules/Devices/src/Devices.Application/Tiers/Commands/DeleteTier/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Tiers/Commands/DeleteTier/Handler.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Domain;
using MediatR;
namespace Backbone.Modules.Devices.Application.Tiers.Commands.DeleteTier;
diff --git a/Modules/Devices/src/Devices.Application/Tiers/Queries/ListTiers/ListTiersQuery.cs b/Modules/Devices/src/Devices.Application/Tiers/Queries/ListTiers/ListTiersQuery.cs
index 9d671eaf5f..9f6f5e3327 100644
--- a/Modules/Devices/src/Devices.Application/Tiers/Queries/ListTiers/ListTiersQuery.cs
+++ b/Modules/Devices/src/Devices.Application/Tiers/Queries/ListTiers/ListTiersQuery.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
using MediatR;
namespace Backbone.Modules.Devices.Application.Tiers.Queries.ListTiers;
diff --git a/Modules/Devices/src/Devices.Application/Tiers/Queries/ListTiers/ListTiersResponse.cs b/Modules/Devices/src/Devices.Application/Tiers/Queries/ListTiers/ListTiersResponse.cs
index 8bbd5859a4..776e943cab 100644
--- a/Modules/Devices/src/Devices.Application/Tiers/Queries/ListTiers/ListTiersResponse.cs
+++ b/Modules/Devices/src/Devices.Application/Tiers/Queries/ListTiers/ListTiersResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Application.Tiers.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Devices.Application.Tiers.DTOs;
namespace Backbone.Modules.Devices.Application.Tiers.Queries.ListTiers;
public class ListTiersResponse : PagedResponse
diff --git a/Modules/Devices/src/Devices.Application/Users/Commands/SeedTestUsers/Handler.cs b/Modules/Devices/src/Devices.Application/Users/Commands/SeedTestUsers/Handler.cs
index 9529adef6c..79919686ad 100644
--- a/Modules/Devices/src/Devices.Application/Users/Commands/SeedTestUsers/Handler.cs
+++ b/Modules/Devices/src/Devices.Application/Users/Commands/SeedTestUsers/Handler.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Database;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Database;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using MediatR;
using Microsoft.AspNetCore.Identity;
diff --git a/Modules/Devices/src/Devices.ConsumerApi/Controllers/DevicesController.cs b/Modules/Devices/src/Devices.ConsumerApi/Controllers/DevicesController.cs
index d975f87371..f071ae36d6 100644
--- a/Modules/Devices/src/Devices.ConsumerApi/Controllers/DevicesController.cs
+++ b/Modules/Devices/src/Devices.ConsumerApi/Controllers/DevicesController.cs
@@ -1,23 +1,23 @@
-using Backbone.Modules.Devices.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application;
using Backbone.Modules.Devices.Application.Devices.Commands.ChangePassword;
using Backbone.Modules.Devices.Application.Devices.Commands.DeleteDevice;
using Backbone.Modules.Devices.Application.Devices.Commands.RegisterDevice;
using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.Devices.Queries.GetActiveDevice;
using Backbone.Modules.Devices.Application.Devices.Queries.ListDevices;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using OpenIddict.Validation.AspNetCore;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.ConsumerApi.Controllers;
diff --git a/Modules/Devices/src/Devices.ConsumerApi/Controllers/IdentitiesController.cs b/Modules/Devices/src/Devices.ConsumerApi/Controllers/IdentitiesController.cs
index c566d247cd..74fb3e4513 100644
--- a/Modules/Devices/src/Devices.ConsumerApi/Controllers/IdentitiesController.cs
+++ b/Modules/Devices/src/Devices.ConsumerApi/Controllers/IdentitiesController.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Devices.Application.Devices.DTOs;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Devices.Application.Devices.DTOs;
using Backbone.Modules.Devices.Application.Identities.Commands.CreateIdentity;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
diff --git a/Modules/Devices/src/Devices.ConsumerApi/Controllers/PushNotificationsController.cs b/Modules/Devices/src/Devices.ConsumerApi/Controllers/PushNotificationsController.cs
index d7211ffeee..009366b5a9 100644
--- a/Modules/Devices/src/Devices.ConsumerApi/Controllers/PushNotificationsController.cs
+++ b/Modules/Devices/src/Devices.ConsumerApi/Controllers/PushNotificationsController.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Devices.Application.PushNotifications.Commands.DeleteDeviceRegistration;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.Modules.Devices.Application.PushNotifications.Commands.DeleteDeviceRegistration;
using Backbone.Modules.Devices.Application.PushNotifications.Commands.SendTestNotification;
using Backbone.Modules.Devices.Application.PushNotifications.Commands.UpdateDeviceRegistration;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
diff --git a/Modules/Devices/src/Devices.ConsumerApi/DevicesModule.cs b/Modules/Devices/src/Devices.ConsumerApi/DevicesModule.cs
index c2f7ad53aa..fe3c518d81 100644
--- a/Modules/Devices/src/Devices.ConsumerApi/DevicesModule.cs
+++ b/Modules/Devices/src/Devices.ConsumerApi/DevicesModule.cs
@@ -1,14 +1,14 @@
-using Backbone.Modules.Devices.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Crypto.Abstractions;
+using Backbone.Crypto.Implementations;
+using Backbone.Modules.Devices.Application;
using Backbone.Modules.Devices.Application.Extensions;
using Backbone.Modules.Devices.Infrastructure.Persistence;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
using Backbone.Modules.Devices.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.Crypto.Abstractions;
-using Enmeshed.Crypto.Implementations;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/ApnsHandle.cs b/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/ApnsHandle.cs
index 86d16f46a1..1462aba1e9 100644
--- a/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/ApnsHandle.cs
+++ b/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/ApnsHandle.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
+using CSharpFunctionalExtensions;
namespace Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
public record ApnsHandle : PnsHandle
diff --git a/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/FcmHandle.cs b/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/FcmHandle.cs
index 5b07927a08..4592edf20d 100644
--- a/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/FcmHandle.cs
+++ b/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/FcmHandle.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
+using CSharpFunctionalExtensions;
namespace Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
public record FcmHandle : PnsHandle
diff --git a/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/PnsHandle.cs b/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/PnsHandle.cs
index 80b91cfe7b..cfda9d5f57 100644
--- a/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/PnsHandle.cs
+++ b/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/Handles/PnsHandle.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
+using CSharpFunctionalExtensions;
namespace Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
diff --git a/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/PnsRegistration.cs b/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/PnsRegistration.cs
index 673a59ec05..0b92d6ab50 100644
--- a/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/PnsRegistration.cs
+++ b/Modules/Devices/src/Devices.Domain/Aggregates/PushNotifications/PnsRegistration.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
+using Backbone.Tooling;
namespace Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
diff --git a/Modules/Devices/src/Devices.Domain/Aggregates/Tier/Tier.cs b/Modules/Devices/src/Devices.Domain/Aggregates/Tier/Tier.cs
index af7ba18e04..a85fe6d9c8 100644
--- a/Modules/Devices/src/Devices.Domain/Aggregates/Tier/Tier.cs
+++ b/Modules/Devices/src/Devices.Domain/Aggregates/Tier/Tier.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
namespace Backbone.Modules.Devices.Domain.Aggregates.Tier;
diff --git a/Modules/Devices/src/Devices.Domain/Aggregates/Tier/TierId.cs b/Modules/Devices/src/Devices.Domain/Aggregates/Tier/TierId.cs
index 4beee33a5c..6b76647430 100644
--- a/Modules/Devices/src/Devices.Domain/Aggregates/Tier/TierId.cs
+++ b/Modules/Devices/src/Devices.Domain/Aggregates/Tier/TierId.cs
@@ -1,7 +1,7 @@
-using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Records;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Records;
+using CSharpFunctionalExtensions;
namespace Backbone.Modules.Devices.Domain.Aggregates.Tier;
diff --git a/Modules/Devices/src/Devices.Domain/Aggregates/Tier/TierName.cs b/Modules/Devices/src/Devices.Domain/Aggregates/Tier/TierName.cs
index 917279c7f3..0efb5cab41 100644
--- a/Modules/Devices/src/Devices.Domain/Aggregates/Tier/TierName.cs
+++ b/Modules/Devices/src/Devices.Domain/Aggregates/Tier/TierName.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
+using CSharpFunctionalExtensions;
namespace Backbone.Modules.Devices.Domain.Aggregates.Tier;
diff --git a/Modules/Devices/src/Devices.Domain/DomainErrors.cs b/Modules/Devices/src/Devices.Domain/DomainErrors.cs
index fab5d918b0..e7d1c7c657 100644
--- a/Modules/Devices/src/Devices.Domain/DomainErrors.cs
+++ b/Modules/Devices/src/Devices.Domain/DomainErrors.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
namespace Backbone.Modules.Devices.Domain;
diff --git a/Modules/Devices/src/Devices.Domain/Entities/ApplicationUser.cs b/Modules/Devices/src/Devices.Domain/Entities/ApplicationUser.cs
index d71a2b9eaa..ca03b110e8 100644
--- a/Modules/Devices/src/Devices.Domain/Entities/ApplicationUser.cs
+++ b/Modules/Devices/src/Devices.Domain/Entities/ApplicationUser.cs
@@ -1,5 +1,5 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling;
using Microsoft.AspNetCore.Identity;
namespace Backbone.Modules.Devices.Domain.Entities;
diff --git a/Modules/Devices/src/Devices.Domain/Entities/Challenge.cs b/Modules/Devices/src/Devices.Domain/Entities/Challenge.cs
index af3f2d9b9d..3c7b184b03 100644
--- a/Modules/Devices/src/Devices.Domain/Entities/Challenge.cs
+++ b/Modules/Devices/src/Devices.Domain/Entities/Challenge.cs
@@ -1,4 +1,4 @@
-using Enmeshed.Tooling;
+using Backbone.Tooling;
namespace Backbone.Modules.Devices.Domain.Entities;
diff --git a/Modules/Devices/src/Devices.Domain/Entities/Device.cs b/Modules/Devices/src/Devices.Domain/Entities/Device.cs
index 6bf9146ed5..9338b5881a 100644
--- a/Modules/Devices/src/Devices.Domain/Entities/Device.cs
+++ b/Modules/Devices/src/Devices.Domain/Entities/Device.cs
@@ -1,6 +1,6 @@
using System.Linq.Expressions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling;
namespace Backbone.Modules.Devices.Domain.Entities;
diff --git a/Modules/Devices/src/Devices.Domain/Entities/Identity.cs b/Modules/Devices/src/Devices.Domain/Entities/Identity.cs
index ccc2f72dc1..adf03d9364 100644
--- a/Modules/Devices/src/Devices.Domain/Entities/Identity.cs
+++ b/Modules/Devices/src/Devices.Domain/Entities/Identity.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Aggregates.Tier;
+using Backbone.Tooling;
namespace Backbone.Modules.Devices.Domain.Entities;
diff --git a/Modules/Devices/src/Devices.Domain/Entities/OAuthClient.cs b/Modules/Devices/src/Devices.Domain/Entities/OAuthClient.cs
index 45e0308ef8..89034ff4fe 100644
--- a/Modules/Devices/src/Devices.Domain/Entities/OAuthClient.cs
+++ b/Modules/Devices/src/Devices.Domain/Entities/OAuthClient.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.Modules.Devices.Domain.Aggregates.Tier;
namespace Backbone.Modules.Devices.Domain.Entities;
public class OAuthClient
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/ApplicationUserEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/ApplicationUserEntityType.cs
index f96b3da4b4..632e5db6e1 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/ApplicationUserEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/ApplicationUserEntityType.cs
@@ -1,9 +1,9 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/ChallengeEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/ChallengeEntityType.cs
index 4c26bea764..071c3c4fc8 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/ChallengeEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/ChallengeEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreApplicationEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreApplicationEntityType.cs
index 61b4985174..8aba98adaf 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreApplicationEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreApplicationEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
using OpenIddict.EntityFrameworkCore.Models;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreAuthorizationEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreAuthorizationEntityType.cs
index 277c57d6c4..02f0135452 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreAuthorizationEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreAuthorizationEntityType.cs
@@ -2,8 +2,8 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
using OpenIddict.EntityFrameworkCore.Models;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreTokenEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreTokenEntityType.cs
index 0c9fec244d..a2f53390aa 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreTokenEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/CustomOpenIddictEntityFrameworkCoreTokenEntityType.cs
@@ -2,8 +2,8 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
using OpenIddict.EntityFrameworkCore.Models;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/DeviceEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/DeviceEntityType.cs
index ea4419d38b..60c578ca40 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/DeviceEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/DeviceEntityType.cs
@@ -2,9 +2,9 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/IdentityEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/IdentityEntityType.cs
index de27bf0da1..f0b501d712 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/IdentityEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/IdentityEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/PnsRegistrationEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/PnsRegistrationEntityType.cs
index 433a3eacb9..ba5208260b 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/PnsRegistrationEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/Postgres/PnsRegistrationEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/ApplicationUserEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/ApplicationUserEntityType.cs
index 18d17c9049..1b99030161 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/ApplicationUserEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/ApplicationUserEntityType.cs
@@ -1,9 +1,9 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/ChallengeEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/ChallengeEntityType.cs
index ae60e60f96..1b8a05b6df 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/ChallengeEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/ChallengeEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreApplicationEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreApplicationEntityType.cs
index a142bc7c83..a71c8e07d6 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreApplicationEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreApplicationEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
using OpenIddict.EntityFrameworkCore.Models;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreAuthorizationEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreAuthorizationEntityType.cs
index 430c1d5127..27adb8687f 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreAuthorizationEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreAuthorizationEntityType.cs
@@ -2,8 +2,8 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
using OpenIddict.EntityFrameworkCore.Models;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreTokenEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreTokenEntityType.cs
index e6ba8236d7..569b24f3f9 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreTokenEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/CustomOpenIddictEntityFrameworkCoreTokenEntityType.cs
@@ -2,8 +2,8 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
using OpenIddict.EntityFrameworkCore.Models;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/DeviceEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/DeviceEntityType.cs
index 6a878b688c..94e8acd072 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/DeviceEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/DeviceEntityType.cs
@@ -2,9 +2,9 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/IdentityEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/IdentityEntityType.cs
index e5dddc7655..96f00d92b1 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/IdentityEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/IdentityEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/PnsRegistrationEntityType.cs b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/PnsRegistrationEntityType.cs
index 1e65c85c88..fc25876087 100644
--- a/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/PnsRegistrationEntityType.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/CompiledModels/SqlServer/PnsRegistrationEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Devices/src/Devices.Infrastructure/InfrastructureErrors.cs b/Modules/Devices/src/Devices.Infrastructure/InfrastructureErrors.cs
index b50118d148..5a3d109189 100644
--- a/Modules/Devices/src/Devices.Infrastructure/InfrastructureErrors.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/InfrastructureErrors.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
+using Backbone.BuildingBlocks.Infrastructure.Exceptions;
namespace Backbone.Modules.Devices.Infrastructure;
public static class InfrastructureErrors
diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/DevicesDbContext.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/DevicesDbContext.cs
index 84f2c46e72..4789915b70 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/DevicesDbContext.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/DevicesDbContext.cs
@@ -1,4 +1,7 @@
using System.Data;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Database;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
@@ -6,10 +9,7 @@
using Backbone.Modules.Devices.Domain.Entities;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.EntityConfigurations;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Storage;
diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/EntityConfigurations/UserEntityTypeConfiguration.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/EntityConfigurations/UserEntityTypeConfiguration.cs
index 7610ee9cb1..5fa172ae0c 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/EntityConfigurations/UserEntityTypeConfiguration.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/EntityConfigurations/UserEntityTypeConfiguration.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/QueryableExtensions/DeviceQueryableExtensions.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/QueryableExtensions/DeviceQueryableExtensions.cs
index e3f32e65de..8bfc99ec5c 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/QueryableExtensions/DeviceQueryableExtensions.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/QueryableExtensions/DeviceQueryableExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Entities;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Devices.Infrastructure.Persistence.Database.QueryableExtensions;
diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/QueryableExtensions/IdentityQueryableExtensions.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/QueryableExtensions/IdentityQueryableExtensions.cs
index ddf1d10159..ca2150e60c 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/QueryableExtensions/IdentityQueryableExtensions.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/Persistence/Database/QueryableExtensions/IdentityQueryableExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Entities;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Devices.Infrastructure.Persistence.Database.QueryableExtensions;
diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/IdentitiesRepository.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/IdentitiesRepository.cs
index ad34e48df0..af348ead88 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/IdentitiesRepository.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/IdentitiesRepository.cs
@@ -1,13 +1,13 @@
-using Backbone.Modules.Devices.Application;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/OAuthClientsRepository.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/OAuthClientsRepository.cs
index 758e9773f6..a08e0cccd9 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/OAuthClientsRepository.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/OAuthClientsRepository.cs
@@ -1,10 +1,10 @@
using System.Text;
using System.Text.Encodings.Web;
using System.Text.Json;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using OpenIddict.Core;
using static OpenIddict.Abstractions.OpenIddictConstants;
diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/PnsRegistrationRepository.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/PnsRegistrationRepository.cs
index 6ff241e77a..eb8ea5e40c 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/PnsRegistrationRepository.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/PnsRegistrationRepository.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Infrastructure.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Devices.Infrastructure.Persistence.Repository;
diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/TiersRepository.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/TiersRepository.cs
index cc9f46ee07..95019f5569 100644
--- a/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/TiersRepository.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/Persistence/Repository/TiersRepository.cs
@@ -1,12 +1,12 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Infrastructure.OpenIddict;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database;
using Backbone.Modules.Devices.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using Microsoft.EntityFrameworkCore;
using OpenIddict.Core;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/AzureNotificationHub/AzureNotificationHubPushService.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/AzureNotificationHub/AzureNotificationHubPushService.cs
index 63defcb695..1b653623b5 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/AzureNotificationHub/AzureNotificationHubPushService.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/AzureNotificationHub/AzureNotificationHubPushService.cs
@@ -1,10 +1,10 @@
using System.Reflection;
using System.Text.Encodings.Web;
using System.Text.Json;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.Azure.NotificationHubs;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/AzureNotificationHub/NotificationBuilder.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/AzureNotificationHub/NotificationBuilder.cs
index 6c8dac0a19..991a0fd782 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/AzureNotificationHub/NotificationBuilder.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/AzureNotificationHub/NotificationBuilder.cs
@@ -1,6 +1,6 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.Azure.NotificationHubs;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.AzureNotificationHub;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/ApnsMessageBuilder.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/ApnsMessageBuilder.cs
index d3b437efb7..1347bcf707 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/ApnsMessageBuilder.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/ApnsMessageBuilder.cs
@@ -1,7 +1,7 @@
using System.Net;
using System.Text.Json;
using System.Text.Json.Serialization;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.ApplePushNotificationService;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/ApplePushNotificationServiceConnector.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/ApplePushNotificationServiceConnector.cs
index c6160fe263..6ed0a41a93 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/ApplePushNotificationServiceConnector.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/ApplePushNotificationServiceConnector.cs
@@ -1,11 +1,11 @@
using System.Reflection;
using System.Text.Json;
+using Backbone.BuildingBlocks.Infrastructure.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.Responses;
-using Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/Jwt.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/Jwt.cs
index 30da2e6e52..6116f3b2f9 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/Jwt.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/Jwt.cs
@@ -1,4 +1,4 @@
-using Enmeshed.Tooling;
+using Backbone.Tooling;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.ApplePushNotificationService;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/JwtGenerator.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/JwtGenerator.cs
index f68ab54d5f..933e3e9527 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/JwtGenerator.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/ApplePushNotificationService/JwtGenerator.cs
@@ -1,5 +1,5 @@
using System.Security.Cryptography;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using JWT.Algorithms;
using JWT.Builder;
using Org.BouncyCastle.Crypto.Parameters;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/DirectPnsCommunicationOptions.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/DirectPnsCommunicationOptions.cs
index b7a29f87b7..06d7bdaa5a 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/DirectPnsCommunicationOptions.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/DirectPnsCommunicationOptions.cs
@@ -1,5 +1,5 @@
using System.ComponentModel.DataAnnotations;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/DirectPushService.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/DirectPushService.cs
index b0b66dee81..530a300235 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/DirectPushService.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/DirectPushService.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Infrastructure.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.Responses;
-using Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/FirebaseCloudMessaging/FirebaseCloudMessagingConnector.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/FirebaseCloudMessaging/FirebaseCloudMessagingConnector.cs
index 6cf75808c7..40b3a90f04 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/FirebaseCloudMessaging/FirebaseCloudMessagingConnector.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/FirebaseCloudMessaging/FirebaseCloudMessagingConnector.cs
@@ -1,11 +1,11 @@
using System.Collections.Immutable;
using System.Reflection;
using System.Text.Json;
+using Backbone.BuildingBlocks.Infrastructure.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.Responses;
-using Enmeshed.BuildingBlocks.Infrastructure.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using FirebaseAdmin.Messaging;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/IPnsConnector.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/IPnsConnector.cs
index d4463c75cd..cd9e48b678 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/IPnsConnector.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/IPnsConnector.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.Responses;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/Responses/SendResult.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/Responses/SendResult.cs
index bf754b22e4..ecd74243ee 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/Responses/SendResult.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/Responses/SendResult.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.Responses;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/Responses/SendResults.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/Responses/SendResults.cs
index 4585277ac7..fc6b0eb0ca 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/Responses/SendResults.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/DirectPush/Responses/SendResults.cs
@@ -1,5 +1,5 @@
using System.Collections.Concurrent;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.Responses;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/Dummy/DummyPushService.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/Dummy/DummyPushService.cs
index 6e30ccb209..c967659258 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/Dummy/DummyPushService.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/Dummy/DummyPushService.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications.Dummy;
diff --git a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationContent.cs b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationContent.cs
index 884df00faa..9727382ee6 100644
--- a/Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationContent.cs
+++ b/Modules/Devices/src/Devices.Infrastructure/PushNotifications/NotificationContent.cs
@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling;
namespace Backbone.Modules.Devices.Infrastructure.PushNotifications;
diff --git a/Modules/Devices/test/Devices.Application.Tests/ExceptionAssertionsExtensions.cs b/Modules/Devices/test/Devices.Application.Tests/ExceptionAssertionsExtensions.cs
index 104b3d6956..b62064690a 100644
--- a/Modules/Devices/test/Devices.Application.Tests/ExceptionAssertionsExtensions.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/ExceptionAssertionsExtensions.cs
@@ -2,7 +2,7 @@
using FluentAssertions.Execution;
using FluentAssertions.Primitives;
using FluentAssertions.Specialized;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.Tests;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Extensions/ExceptionAssertionsExtensions.cs b/Modules/Devices/test/Devices.Application.Tests/Extensions/ExceptionAssertionsExtensions.cs
index 9bcd5a7fc7..daade3f73b 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Extensions/ExceptionAssertionsExtensions.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Extensions/ExceptionAssertionsExtensions.cs
@@ -1,6 +1,6 @@
using FluentAssertions;
using FluentAssertions.Specialized;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.Tests.Extensions;
public static class ExceptionAssertionsExtensions
diff --git a/Modules/Devices/test/Devices.Application.Tests/TestDataGenerator.cs b/Modules/Devices/test/Devices.Application.Tests/TestDataGenerator.cs
index dfa12e9ec0..0ef117d9a6 100644
--- a/Modules/Devices/test/Devices.Application.Tests/TestDataGenerator.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/TestDataGenerator.cs
@@ -1,6 +1,6 @@
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Application.Tests;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Clients/Commands/ChangeClientSecret/HandlerTests.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Clients/Commands/ChangeClientSecret/HandlerTests.cs
index 19c9b2eb2f..7cc3a510f9 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Clients/Commands/ChangeClientSecret/HandlerTests.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Clients/Commands/ChangeClientSecret/HandlerTests.cs
@@ -2,7 +2,7 @@
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FakeItEasy;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Clients/Commands/UpdateClient/HandlerTests.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Clients/Commands/UpdateClient/HandlerTests.cs
index 38b2226ab5..08ace7d99f 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Clients/Commands/UpdateClient/HandlerTests.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Clients/Commands/UpdateClient/HandlerTests.cs
@@ -1,15 +1,15 @@
-using Backbone.Modules.Devices.Application.Clients.Commands.UpdateClient;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Devices.Application.Clients.Commands.UpdateClient;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.Tests.Extensions;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FakeItEasy;
using FluentAssertions;
using Xunit;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.Tests.Tests.Clients.Commands.UpdateClient;
public class HandlerTests
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Commands/UpdateIdentity/HandlerTests.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Commands/UpdateIdentity/HandlerTests.cs
index 08c4f9e591..38f3235c2c 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Commands/UpdateIdentity/HandlerTests.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Commands/UpdateIdentity/HandlerTests.cs
@@ -1,13 +1,13 @@
-using Backbone.Modules.Devices.Application.Identities.Commands.UpdateIdentity;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Identities.Commands.UpdateIdentity;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.UnitTestTools.Extensions;
using FakeItEasy;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/GetIdentity/FindByAddressStubRepository.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/GetIdentity/FindByAddressStubRepository.cs
index 279893ec12..054cdb6e15 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/GetIdentity/FindByAddressStubRepository.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/GetIdentity/FindByAddressStubRepository.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Application.Tests.Tests.Identities.Queries.GetIdentity;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/GetIdentity/HandlerTests.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/GetIdentity/HandlerTests.cs
index 1b2db43c18..57bc59ceb0 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/GetIdentity/HandlerTests.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/GetIdentity/HandlerTests.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Devices.Application.Identities.Queries.GetIdentity;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Identities.Queries.GetIdentity;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.UnitTestTools.Extensions;
using FakeItEasy;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/ListIdentities/FindAllStubRepository.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/ListIdentities/FindAllStubRepository.cs
index 2c8309f3b3..ea0ed0d90f 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/ListIdentities/FindAllStubRepository.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/ListIdentities/FindAllStubRepository.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Devices.Application.Tests.Tests.Identities.Queries.ListIdentities;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/ListIdentities/HandlerTests.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/ListIdentities/HandlerTests.cs
index 2986a5b16a..1ee513c0f7 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/ListIdentities/HandlerTests.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Identities/Queries/ListIdentities/HandlerTests.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Devices.Application.Identities.Queries.ListIdentities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Devices.Application.Identities.Queries.ListIdentities;
using Backbone.Modules.Devices.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using FluentAssertions;
using FluentAssertions.Execution;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Commands/CreateTier/HandlerTests.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Commands/CreateTier/HandlerTests.cs
index 8db2b8cf7d..b269a6b1b0 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Commands/CreateTier/HandlerTests.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Commands/CreateTier/HandlerTests.cs
@@ -1,13 +1,13 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.Tests.Extensions;
using Backbone.Modules.Devices.Application.Tiers.Commands.CreateTier;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.Logging;
using Xunit;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Devices.Application.Tests.Tests.Tiers.Commands.CreateTier;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Commands/DeleteTier/HandlerTests.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Commands/DeleteTier/HandlerTests.cs
index ba44b2216a..be924f13a5 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Commands/DeleteTier/HandlerTests.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Commands/DeleteTier/HandlerTests.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Devices.Application.Tiers.Commands.DeleteTier;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Domain;
using FakeItEasy;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Queries/ListTiers/FindAllStubRepository.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Queries/ListTiers/FindAllStubRepository.cs
index 1fe389fb48..56b800fe39 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Queries/ListTiers/FindAllStubRepository.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Queries/ListTiers/FindAllStubRepository.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
namespace Backbone.Modules.Devices.Application.Tests.Tests.Tiers.Queries.ListTiers;
public class FindAllStubRepository : ITiersRepository
diff --git a/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Queries/ListTiers/HandlerTests.cs b/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Queries/ListTiers/HandlerTests.cs
index 6378bc4d8a..a82eee83a6 100644
--- a/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Queries/ListTiers/HandlerTests.cs
+++ b/Modules/Devices/test/Devices.Application.Tests/Tests/Tiers/Queries/ListTiers/HandlerTests.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Devices.Application.Tiers.Queries.ListTiers;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Devices.Application.Tiers.Queries.ListTiers;
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using FluentAssertions;
using FluentAssertions.Execution;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Domain.Tests/OAuthClient/OAuthClientTests.cs b/Modules/Devices/test/Devices.Domain.Tests/OAuthClient/OAuthClientTests.cs
index 88409b08c1..5f36eb304c 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/OAuthClient/OAuthClientTests.cs
+++ b/Modules/Devices/test/Devices.Domain.Tests/OAuthClient/OAuthClientTests.cs
@@ -1,5 +1,5 @@
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Domain.Tests/PnsHandleTests.cs b/Modules/Devices/test/Devices.Domain.Tests/PnsHandleTests.cs
index 96a2c7815d..b4d599dcff 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/PnsHandleTests.cs
+++ b/Modules/Devices/test/Devices.Domain.Tests/PnsHandleTests.cs
@@ -3,7 +3,7 @@
using FluentAssertions;
using Xunit;
-namespace Devices.Domain.Tests;
+namespace Backbone.Modules.Devices.Domain.Tests;
public class PnsHandleTests
{
[Fact]
diff --git a/Modules/Devices/test/Devices.Domain.Tests/TestDataGenerator.cs b/Modules/Devices/test/Devices.Domain.Tests/TestDataGenerator.cs
index a7957c62ae..02cbdbf1f9 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/TestDataGenerator.cs
+++ b/Modules/Devices/test/Devices.Domain.Tests/TestDataGenerator.cs
@@ -1,4 +1,4 @@
-namespace Devices.Domain.Tests;
+namespace Backbone.Modules.Devices.Domain.Tests;
public static class TestDataGenerator
{
public static string GenerateString(int resultLength, char[]? chars = null)
diff --git a/Modules/Devices/test/Devices.Domain.Tests/Tiers/TierIdTests.cs b/Modules/Devices/test/Devices.Domain.Tests/Tiers/TierIdTests.cs
index 0bcff7c24d..1e30641f87 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/Tiers/TierIdTests.cs
+++ b/Modules/Devices/test/Devices.Domain.Tests/Tiers/TierIdTests.cs
@@ -1,5 +1,4 @@
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Devices.Domain.Tests;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Domain.Tests/Tiers/TierNameTests.cs b/Modules/Devices/test/Devices.Domain.Tests/Tiers/TierNameTests.cs
index fe727d26b4..28a7d82265 100644
--- a/Modules/Devices/test/Devices.Domain.Tests/Tiers/TierNameTests.cs
+++ b/Modules/Devices/test/Devices.Domain.Tests/Tiers/TierNameTests.cs
@@ -1,5 +1,4 @@
using Backbone.Modules.Devices.Domain.Aggregates.Tier;
-using Devices.Domain.Tests;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/AzureNotificationHub/ApnsNotificationBuilderTests.cs b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/AzureNotificationHub/ApnsNotificationBuilderTests.cs
index 7c9f57229d..15eb5ca2b3 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/AzureNotificationHub/ApnsNotificationBuilderTests.cs
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/AzureNotificationHub/ApnsNotificationBuilderTests.cs
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text.Json;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.AzureNotificationHub;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FluentAssertions;
using Microsoft.Azure.NotificationHubs;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/AzureNotificationHub/FcmNotificationBuilderTests.cs b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/AzureNotificationHub/FcmNotificationBuilderTests.cs
index f7008deb52..385ac5a29a 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/AzureNotificationHub/FcmNotificationBuilderTests.cs
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/AzureNotificationHub/FcmNotificationBuilderTests.cs
@@ -1,9 +1,9 @@
using System;
using System.Text.Json;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.AzureNotificationHub;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FluentAssertions;
using Microsoft.Azure.NotificationHubs;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/ApnsMessageBuilderTests.cs b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/ApnsMessageBuilderTests.cs
index 8fa2820ef3..3c772a6899 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/ApnsMessageBuilderTests.cs
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/ApnsMessageBuilderTests.cs
@@ -2,10 +2,10 @@
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.ApplePushNotificationService;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/ApplePushNotificationServiceConnectorTests.cs b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/ApplePushNotificationServiceConnectorTests.cs
index f4b4c6fc57..a79268f0b0 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/ApplePushNotificationServiceConnectorTests.cs
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/ApplePushNotificationServiceConnectorTests.cs
@@ -3,12 +3,12 @@
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications;
using Backbone.Modules.Devices.Domain.Aggregates.PushNotifications.Handles;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.ApplePushNotificationService;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/FcmMessageBuilderTests.cs b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/FcmMessageBuilderTests.cs
index 6e52dbe453..26513ac2b5 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/FcmMessageBuilderTests.cs
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/FcmMessageBuilderTests.cs
@@ -1,9 +1,9 @@
using System;
using System.Text.Json;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Devices.Infrastructure.PushNotifications;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.FirebaseCloudMessaging;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/JwtGeneratorTests.cs b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/JwtGeneratorTests.cs
index c93f04c15d..e6d72f2713 100644
--- a/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/JwtGeneratorTests.cs
+++ b/Modules/Devices/test/Devices.Infrastructure.Tests/Tests/DirectPush/JwtGeneratorTests.cs
@@ -3,7 +3,7 @@
using System.Linq;
using System.Threading.Tasks;
using Backbone.Modules.Devices.Infrastructure.PushNotifications.DirectPush.ApplePushNotificationService;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Files/src/Files.Application/AutoMapper/AutoMapperProfile.cs b/Modules/Files/src/Files.Application/AutoMapper/AutoMapperProfile.cs
index ad37321b25..411d573d14 100644
--- a/Modules/Files/src/Files.Application/AutoMapper/AutoMapperProfile.cs
+++ b/Modules/Files/src/Files.Application/AutoMapper/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
using System.Reflection;
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.AutoMapper;
namespace Backbone.Modules.Files.Application.AutoMapper;
diff --git a/Modules/Files/src/Files.Application/Extensions/IServiceCollectionExtensions.cs b/Modules/Files/src/Files.Application/Extensions/IServiceCollectionExtensions.cs
index 39a72ed91d..5807513969 100644
--- a/Modules/Files/src/Files.Application/Extensions/IServiceCollectionExtensions.cs
+++ b/Modules/Files/src/Files.Application/Extensions/IServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Files.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.MediatR;
+using Backbone.Modules.Files.Application.AutoMapper;
using Backbone.Modules.Files.Application.Files.Commands.CreateFile;
-using Enmeshed.BuildingBlocks.Application.MediatR;
using FluentValidation;
using Microsoft.Extensions.DependencyInjection;
diff --git a/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileCommand.cs b/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileCommand.cs
index 62704ba28c..1b5ee6e3c4 100644
--- a/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileCommand.cs
+++ b/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileCommand.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Attributes;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Attributes;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Files.Application.Files.Commands.CreateFile;
diff --git a/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileCommandValidator.cs b/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileCommandValidator.cs
index 26a12c3c26..2d54071dee 100644
--- a/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileCommandValidator.cs
+++ b/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileCommandValidator.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Tooling;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Files.Application.Files.Commands.CreateFile;
diff --git a/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileResponse.cs b/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileResponse.cs
index 5e5da5dab7..c30091cdab 100644
--- a/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileResponse.cs
+++ b/Modules/Files/src/Files.Application/Files/Commands/CreateFile/CreateFileResponse.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Files.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using File = Backbone.Modules.Files.Domain.Entities.File;
namespace Backbone.Modules.Files.Application.Files.Commands.CreateFile;
diff --git a/Modules/Files/src/Files.Application/Files/Commands/CreateFile/Handler.cs b/Modules/Files/src/Files.Application/Files/Commands/CreateFile/Handler.cs
index 3bcd0a72a1..0676122430 100644
--- a/Modules/Files/src/Files.Application/Files/Commands/CreateFile/Handler.cs
+++ b/Modules/Files/src/Files.Application/Files/Commands/CreateFile/Handler.cs
@@ -1,8 +1,8 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Files.Application.IntegrationEvents.Out;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
using File = Backbone.Modules.Files.Domain.Entities.File;
diff --git a/Modules/Files/src/Files.Application/Files/DTOs/FileMetadataDTO.cs b/Modules/Files/src/Files.Application/Files/DTOs/FileMetadataDTO.cs
index 06538f8de9..f4c4784ddf 100644
--- a/Modules/Files/src/Files.Application/Files/DTOs/FileMetadataDTO.cs
+++ b/Modules/Files/src/Files.Application/Files/DTOs/FileMetadataDTO.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Files.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using File = Backbone.Modules.Files.Domain.Entities.File;
namespace Backbone.Modules.Files.Application.Files.DTOs;
diff --git a/Modules/Files/src/Files.Application/Files/Queries/GetFileContent/Handler.cs b/Modules/Files/src/Files.Application/Files/Queries/GetFileContent/Handler.cs
index 63663c9ffb..c0b7562910 100644
--- a/Modules/Files/src/Files.Application/Files/Queries/GetFileContent/Handler.cs
+++ b/Modules/Files/src/Files.Application/Files/Queries/GetFileContent/Handler.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
using MediatR;
namespace Backbone.Modules.Files.Application.Files.Queries.GetFileContent;
diff --git a/Modules/Files/src/Files.Application/Files/Queries/GetFileMetadata/Handler.cs b/Modules/Files/src/Files.Application/Files/Queries/GetFileMetadata/Handler.cs
index cb0273d450..62623f833c 100644
--- a/Modules/Files/src/Files.Application/Files/Queries/GetFileMetadata/Handler.cs
+++ b/Modules/Files/src/Files.Application/Files/Queries/GetFileMetadata/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using Backbone.Modules.Files.Application.Files.DTOs;
using Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using MediatR;
namespace Backbone.Modules.Files.Application.Files.Queries.GetFileMetadata;
diff --git a/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/Handler.cs b/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/Handler.cs
index 761f3bbbdd..7456ba8241 100644
--- a/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/Handler.cs
+++ b/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Files.Application.Files.DTOs;
using Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Files.Application.Files.Queries.ListFileMetadata;
diff --git a/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/ListFileMetadataQuery.cs b/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/ListFileMetadataQuery.cs
index 704b26b52d..6c4938595a 100644
--- a/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/ListFileMetadataQuery.cs
+++ b/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/ListFileMetadataQuery.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Files.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Files.Domain.Entities;
using MediatR;
namespace Backbone.Modules.Files.Application.Files.Queries.ListFileMetadata;
diff --git a/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/ListFileMetadataResponse.cs b/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/ListFileMetadataResponse.cs
index d86f4d4fbe..b654122de6 100644
--- a/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/ListFileMetadataResponse.cs
+++ b/Modules/Files/src/Files.Application/Files/Queries/ListFileMetadata/ListFileMetadataResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Files.Application.Files.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Files.Application.Files.DTOs;
namespace Backbone.Modules.Files.Application.Files.Queries.ListFileMetadata;
diff --git a/Modules/Files/src/Files.Application/Infrastructure/Persistence/IFilesDbContext.cs b/Modules/Files/src/Files.Application/Infrastructure/Persistence/IFilesDbContext.cs
index bfa0258440..c3d6e91759 100644
--- a/Modules/Files/src/Files.Application/Infrastructure/Persistence/IFilesDbContext.cs
+++ b/Modules/Files/src/Files.Application/Infrastructure/Persistence/IFilesDbContext.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
namespace Backbone.Modules.Files.Application.Infrastructure.Persistence;
diff --git a/Modules/Files/src/Files.Application/Infrastructure/Persistence/Repository/IFilesRepository.cs b/Modules/Files/src/Files.Application/Infrastructure/Persistence/Repository/IFilesRepository.cs
index 05b5f73303..7507e0fc1a 100644
--- a/Modules/Files/src/Files.Application/Infrastructure/Persistence/Repository/IFilesRepository.cs
+++ b/Modules/Files/src/Files.Application/Infrastructure/Persistence/Repository/IFilesRepository.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Files.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Files.Domain.Entities;
using File = Backbone.Modules.Files.Domain.Entities.File;
namespace Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
diff --git a/Modules/Files/src/Files.Application/IntegrationEvents/Out/FileUploadedIntegrationEvent.cs b/Modules/Files/src/Files.Application/IntegrationEvents/Out/FileUploadedIntegrationEvent.cs
index e94ef5fae1..0315dbb72d 100644
--- a/Modules/Files/src/Files.Application/IntegrationEvents/Out/FileUploadedIntegrationEvent.cs
+++ b/Modules/Files/src/Files.Application/IntegrationEvents/Out/FileUploadedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
using File = Backbone.Modules.Files.Domain.Entities.File;
namespace Backbone.Modules.Files.Application.IntegrationEvents.Out;
diff --git a/Modules/Files/src/Files.ConsumerApi/Controllers/FilesController.cs b/Modules/Files/src/Files.ConsumerApi/Controllers/FilesController.cs
index 5db1671f77..2eebd184c0 100644
--- a/Modules/Files/src/Files.ConsumerApi/Controllers/FilesController.cs
+++ b/Modules/Files/src/Files.ConsumerApi/Controllers/FilesController.cs
@@ -1,4 +1,9 @@
using System.Net.Mime;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
using Backbone.Modules.Files.Application;
using Backbone.Modules.Files.Application.Files.Commands.CreateFile;
using Backbone.Modules.Files.Application.Files.DTOs;
@@ -7,18 +12,13 @@
using Backbone.Modules.Files.Application.Files.Queries.ListFileMetadata;
using Backbone.Modules.Files.ConsumerApi.DTOs;
using Backbone.Modules.Files.Domain.Entities;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using NeoSmart.Utils;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Files.ConsumerApi.Controllers;
diff --git a/Modules/Files/src/Files.ConsumerApi/DTOs/CreateFileDTO.cs b/Modules/Files/src/Files.ConsumerApi/DTOs/CreateFileDTO.cs
index 0d159fe3ea..a837d5ec0b 100644
--- a/Modules/Files/src/Files.ConsumerApi/DTOs/CreateFileDTO.cs
+++ b/Modules/Files/src/Files.ConsumerApi/DTOs/CreateFileDTO.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Microsoft.AspNetCore.Http;
namespace Backbone.Modules.Files.ConsumerApi.DTOs;
diff --git a/Modules/Files/src/Files.ConsumerApi/DTOs/Validators/CreateFileDTOValidator.cs b/Modules/Files/src/Files.ConsumerApi/DTOs/Validators/CreateFileDTOValidator.cs
index 78fc06b9a7..ce083607b5 100644
--- a/Modules/Files/src/Files.ConsumerApi/DTOs/Validators/CreateFileDTOValidator.cs
+++ b/Modules/Files/src/Files.ConsumerApi/DTOs/Validators/CreateFileDTOValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Files.ConsumerApi.DTOs.Validators;
diff --git a/Modules/Files/src/Files.ConsumerApi/FilesModule.cs b/Modules/Files/src/Files.ConsumerApi/FilesModule.cs
index e81aaa6442..639a345efc 100644
--- a/Modules/Files/src/Files.ConsumerApi/FilesModule.cs
+++ b/Modules/Files/src/Files.ConsumerApi/FilesModule.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Files.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Files.Application;
using Backbone.Modules.Files.Application.Extensions;
using Backbone.Modules.Files.Infrastructure.Persistence;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/Modules/Files/src/Files.Domain/Entities/File.cs b/Modules/Files/src/Files.Domain/Entities/File.cs
index 8c3a037222..d1becab3cd 100644
--- a/Modules/Files/src/Files.Domain/Entities/File.cs
+++ b/Modules/Files/src/Files.Domain/Entities/File.cs
@@ -1,6 +1,6 @@
using System.Linq.Expressions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling;
namespace Backbone.Modules.Files.Domain.Entities;
diff --git a/Modules/Files/src/Files.Domain/Entities/FileId.cs b/Modules/Files/src/Files.Domain/Entities/FileId.cs
index c9c02ae83f..0ebaa45fe2 100644
--- a/Modules/Files/src/Files.Domain/Entities/FileId.cs
+++ b/Modules/Files/src/Files.Domain/Entities/FileId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Files.Domain.Entities;
diff --git a/Modules/Files/src/Files.Infrastructure/CompiledModels/Postgres/FileEntityType.cs b/Modules/Files/src/Files.Infrastructure/CompiledModels/Postgres/FileEntityType.cs
index fb764ed75e..4d2d4fa89a 100644
--- a/Modules/Files/src/Files.Infrastructure/CompiledModels/Postgres/FileEntityType.cs
+++ b/Modules/Files/src/Files.Infrastructure/CompiledModels/Postgres/FileEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Files.Domain.Entities;
using Backbone.Modules.Files.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
using File = Backbone.Modules.Files.Domain.Entities.File;
diff --git a/Modules/Files/src/Files.Infrastructure/CompiledModels/SqlServer/FileEntityType.cs b/Modules/Files/src/Files.Infrastructure/CompiledModels/SqlServer/FileEntityType.cs
index 8b6e93c052..a2c239eb3b 100644
--- a/Modules/Files/src/Files.Infrastructure/CompiledModels/SqlServer/FileEntityType.cs
+++ b/Modules/Files/src/Files.Infrastructure/CompiledModels/SqlServer/FileEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Files.Domain.Entities;
using Backbone.Modules.Files.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
using File = Backbone.Modules.Files.Domain.Entities.File;
diff --git a/Modules/Files/src/Files.Infrastructure/Persistence/Database/FilesDbContext.cs b/Modules/Files/src/Files.Infrastructure/Persistence/Database/FilesDbContext.cs
index 8c8980382a..d45bd1875c 100644
--- a/Modules/Files/src/Files.Infrastructure/Persistence/Database/FilesDbContext.cs
+++ b/Modules/Files/src/Files.Infrastructure/Persistence/Database/FilesDbContext.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Files.Application.Infrastructure.Persistence;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.Modules.Files.Application.Infrastructure.Persistence;
using Backbone.Modules.Files.Domain.Entities;
using Backbone.Modules.Files.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
using File = Backbone.Modules.Files.Domain.Entities.File;
diff --git a/Modules/Files/src/Files.Infrastructure/Persistence/Database/QueryableExtensions/FileQueryableExtensions.cs b/Modules/Files/src/Files.Infrastructure/Persistence/Database/QueryableExtensions/FileQueryableExtensions.cs
index b563ee089a..775f261f0a 100644
--- a/Modules/Files/src/Files.Infrastructure/Persistence/Database/QueryableExtensions/FileQueryableExtensions.cs
+++ b/Modules/Files/src/Files.Infrastructure/Persistence/Database/QueryableExtensions/FileQueryableExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Files.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Files.Domain.Entities;
using File = Backbone.Modules.Files.Domain.Entities.File;
namespace Backbone.Modules.Files.Infrastructure.Persistence.Database.QueryableExtensions;
diff --git a/Modules/Files/src/Files.Infrastructure/Persistence/Database/Repository/FilesRepository.cs b/Modules/Files/src/Files.Infrastructure/Persistence/Database/Repository/FilesRepository.cs
index 93c4c4f165..abb6ab6a9d 100644
--- a/Modules/Files/src/Files.Infrastructure/Persistence/Database/Repository/FilesRepository.cs
+++ b/Modules/Files/src/Files.Infrastructure/Persistence/Database/Repository/FilesRepository.cs
@@ -1,12 +1,12 @@
-using Backbone.Modules.Files.Application.Infrastructure.Persistence;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Files.Application.Infrastructure.Persistence;
using Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Files.Domain.Entities;
using Backbone.Modules.Files.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
using File = Backbone.Modules.Files.Domain.Entities.File;
diff --git a/Modules/Files/src/Files.Infrastructure/Persistence/IServiceCollectionExtensions.cs b/Modules/Files/src/Files.Infrastructure/Persistence/IServiceCollectionExtensions.cs
index 14d60dda68..d47f5dbb6d 100644
--- a/Modules/Files/src/Files.Infrastructure/Persistence/IServiceCollectionExtensions.cs
+++ b/Modules/Files/src/Files.Infrastructure/Persistence/IServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Files.Application.Infrastructure.Persistence;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Files.Application.Infrastructure.Persistence;
using Backbone.Modules.Files.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Files.Infrastructure.Persistence.Database;
using Backbone.Modules.Files.Infrastructure.Persistence.Database.Repository;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
using Microsoft.Extensions.DependencyInjection;
namespace Backbone.Modules.Files.Infrastructure.Persistence;
diff --git a/Modules/Files/src/Files.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs b/Modules/Files/src/Files.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
index 288d8f76cc..b83e2e322f 100644
--- a/Modules/Files/src/Files.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
+++ b/Modules/Files/src/Files.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Files.Application.Infrastructure.Persistence;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Files.Application.Infrastructure.Persistence;
using Backbone.Modules.Files.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
using File = Backbone.Modules.Files.Domain.Entities.File;
diff --git a/Modules/Files/src/Files.Jobs.SanityCheck/Program.cs b/Modules/Files/src/Files.Jobs.SanityCheck/Program.cs
index 32eac48ef1..26df24ac46 100644
--- a/Modules/Files/src/Files.Jobs.SanityCheck/Program.cs
+++ b/Modules/Files/src/Files.Jobs.SanityCheck/Program.cs
@@ -3,7 +3,7 @@
using Backbone.Modules.Files.Jobs.SanityCheck.Extensions;
using Backbone.Modules.Files.Jobs.SanityCheck.Infrastructure.DataSource;
using Backbone.Modules.Files.Jobs.SanityCheck.Infrastructure.Reporter;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Files.Jobs.SanityCheck;
diff --git a/Modules/Files/test/Files.Application.Tests/TestData.cs b/Modules/Files/test/Files.Application.Tests/TestData.cs
index 37e5c1470f..662d5415e2 100644
--- a/Modules/Files/test/Files.Application.Tests/TestData.cs
+++ b/Modules/Files/test/Files.Application.Tests/TestData.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Files.Application.Tests;
diff --git a/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs b/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
index 51334ea980..49907c2013 100644
--- a/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
+++ b/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Files.Domain.Entities;
using Backbone.Modules.Files.Jobs.SanityCheck.Infrastructure.DataSource;
-namespace Files.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+namespace Backbone.Modules.Files.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
public class FakeDataSource : IDataSource
{
diff --git a/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs b/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
index 7fe243acdb..54c3205914 100644
--- a/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
+++ b/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Files.Domain.Entities;
using Backbone.Modules.Files.Jobs.SanityCheck.Infrastructure.Reporter;
-namespace Files.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
+namespace Backbone.Modules.Files.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
public class TestReporter : IReporter
{
diff --git a/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs b/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
index c575c3906f..36a8b43182 100644
--- a/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
+++ b/Modules/Files/test/Files.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
@@ -1,10 +1,10 @@
using Backbone.Modules.Files.Domain.Entities;
-using Files.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
-using Files.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
+using Backbone.Modules.Files.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+using Backbone.Modules.Files.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using FluentAssertions;
using Xunit;
-namespace Files.Jobs.SanityCheck.Tests.Tests;
+namespace Backbone.Modules.Files.Jobs.SanityCheck.Tests.Tests;
public class SanityCheckTests
{
diff --git a/Modules/Messages/src/Messages.Application/ApplicationErrors.cs b/Modules/Messages/src/Messages.Application/ApplicationErrors.cs
index 3a994e079a..8af8f43956 100644
--- a/Modules/Messages/src/Messages.Application/ApplicationErrors.cs
+++ b/Modules/Messages/src/Messages.Application/ApplicationErrors.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
namespace Backbone.Modules.Messages.Application;
diff --git a/Modules/Messages/src/Messages.Application/AutoMapper/AutoMapperProfile.cs b/Modules/Messages/src/Messages.Application/AutoMapper/AutoMapperProfile.cs
index a2da947a2a..8ea2fe6b38 100644
--- a/Modules/Messages/src/Messages.Application/AutoMapper/AutoMapperProfile.cs
+++ b/Modules/Messages/src/Messages.Application/AutoMapper/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
using System.Reflection;
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.AutoMapper;
namespace Backbone.Modules.Messages.Application.AutoMapper;
diff --git a/Modules/Messages/src/Messages.Application/Extensions/IServiceCollectionExtensions.cs b/Modules/Messages/src/Messages.Application/Extensions/IServiceCollectionExtensions.cs
index d9f751fa32..58e111733b 100644
--- a/Modules/Messages/src/Messages.Application/Extensions/IServiceCollectionExtensions.cs
+++ b/Modules/Messages/src/Messages.Application/Extensions/IServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Messages.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.MediatR;
+using Backbone.Modules.Messages.Application.AutoMapper;
using Backbone.Modules.Messages.Application.Messages.Commands.SendMessage;
-using Enmeshed.BuildingBlocks.Application.MediatR;
using FluentValidation;
using Microsoft.Extensions.DependencyInjection;
diff --git a/Modules/Messages/src/Messages.Application/Extensions/RecipientInformationIReadOnlyExtensions.cs b/Modules/Messages/src/Messages.Application/Extensions/RecipientInformationIReadOnlyExtensions.cs
index a553394957..55a3b01b28 100644
--- a/Modules/Messages/src/Messages.Application/Extensions/RecipientInformationIReadOnlyExtensions.cs
+++ b/Modules/Messages/src/Messages.Application/Extensions/RecipientInformationIReadOnlyExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Messages.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Entities;
namespace Backbone.Modules.Messages.Application.Extensions;
diff --git a/Modules/Messages/src/Messages.Application/Infrastructure/EventBus/IFilesEventBus.cs b/Modules/Messages/src/Messages.Application/Infrastructure/EventBus/IFilesEventBus.cs
index 71b48428e2..7e99ab338e 100644
--- a/Modules/Messages/src/Messages.Application/Infrastructure/EventBus/IFilesEventBus.cs
+++ b/Modules/Messages/src/Messages.Application/Infrastructure/EventBus/IFilesEventBus.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Messages.Application.Infrastructure.EventBus;
diff --git a/Modules/Messages/src/Messages.Application/Infrastructure/Persistence/Repository/IMessagesRepository.cs b/Modules/Messages/src/Messages.Application/Infrastructure/Persistence/Repository/IMessagesRepository.cs
index fd9125cb87..fb98f01e3e 100644
--- a/Modules/Messages/src/Messages.Application/Infrastructure/Persistence/Repository/IMessagesRepository.cs
+++ b/Modules/Messages/src/Messages.Application/Infrastructure/Persistence/Repository/IMessagesRepository.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Messages.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
public interface IMessagesRepository
diff --git a/Modules/Messages/src/Messages.Application/Infrastructure/Persistence/Repository/IRelationshipsRepository.cs b/Modules/Messages/src/Messages.Application/Infrastructure/Persistence/Repository/IRelationshipsRepository.cs
index 27808e5642..56a398c6ef 100644
--- a/Modules/Messages/src/Messages.Application/Infrastructure/Persistence/Repository/IRelationshipsRepository.cs
+++ b/Modules/Messages/src/Messages.Application/Infrastructure/Persistence/Repository/IRelationshipsRepository.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Ids;
namespace Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
diff --git a/Modules/Messages/src/Messages.Application/IntegrationEvents/Outgoing/MessageCreatedIntegrationEvent.cs b/Modules/Messages/src/Messages.Application/IntegrationEvents/Outgoing/MessageCreatedIntegrationEvent.cs
index 19f66ef1c3..2416c41c12 100644
--- a/Modules/Messages/src/Messages.Application/IntegrationEvents/Outgoing/MessageCreatedIntegrationEvent.cs
+++ b/Modules/Messages/src/Messages.Application/IntegrationEvents/Outgoing/MessageCreatedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Messages.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Messages.Domain.Entities;
namespace Backbone.Modules.Messages.Application.IntegrationEvents.Outgoing;
diff --git a/Modules/Messages/src/Messages.Application/IntegrationEvents/Outgoing/MessageDeliveredIntegrationEvent.cs b/Modules/Messages/src/Messages.Application/IntegrationEvents/Outgoing/MessageDeliveredIntegrationEvent.cs
index 3bd3139fde..59b14cb4f1 100644
--- a/Modules/Messages/src/Messages.Application/IntegrationEvents/Outgoing/MessageDeliveredIntegrationEvent.cs
+++ b/Modules/Messages/src/Messages.Application/IntegrationEvents/Outgoing/MessageDeliveredIntegrationEvent.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Messages.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Entities;
namespace Backbone.Modules.Messages.Application.IntegrationEvents.Outgoing;
diff --git a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/Handler.cs b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/Handler.cs
index 944c1a9545..b2df7dd23f 100644
--- a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/Handler.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/Handler.cs
@@ -1,11 +1,11 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Messages.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
diff --git a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageCommand.cs b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageCommand.cs
index 21e37a3f8c..bd08dc731f 100644
--- a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageCommand.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageCommand.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Attributes;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Attributes;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Messages.Application.Messages.Commands.SendMessage;
diff --git a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageCommandValidator.cs b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageCommandValidator.cs
index 99686e6592..2a9b1e0d01 100644
--- a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageCommandValidator.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageCommandValidator.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Modules.Messages.Domain.Ids;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Messages.Application.Messages.Commands.SendMessage;
diff --git a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageResponse.cs b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageResponse.cs
index 6dfcb87e56..c36405a973 100644
--- a/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageResponse.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/Commands/SendMessage/SendMessageResponse.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Messages.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
namespace Backbone.Modules.Messages.Application.Messages.Commands.SendMessage;
diff --git a/Modules/Messages/src/Messages.Application/Messages/DTOs/AttachmentDTO.cs b/Modules/Messages/src/Messages.Application/Messages/DTOs/AttachmentDTO.cs
index 4f6f24a2ed..ba7cb6e2d7 100644
--- a/Modules/Messages/src/Messages.Application/Messages/DTOs/AttachmentDTO.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/DTOs/AttachmentDTO.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Messages.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.Modules.Messages.Domain.Entities;
namespace Backbone.Modules.Messages.Application.Messages.DTOs;
diff --git a/Modules/Messages/src/Messages.Application/Messages/DTOs/MessageDTO.cs b/Modules/Messages/src/Messages.Application/Messages/DTOs/MessageDTO.cs
index ff377e2bf0..9420f8bfce 100644
--- a/Modules/Messages/src/Messages.Application/Messages/DTOs/MessageDTO.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/DTOs/MessageDTO.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Messages.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Messages.Application.Messages.DTOs;
diff --git a/Modules/Messages/src/Messages.Application/Messages/DTOs/RecipientInformationDTO.cs b/Modules/Messages/src/Messages.Application/Messages/DTOs/RecipientInformationDTO.cs
index 02ab119257..89e99ef195 100644
--- a/Modules/Messages/src/Messages.Application/Messages/DTOs/RecipientInformationDTO.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/DTOs/RecipientInformationDTO.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Messages.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Entities;
namespace Backbone.Modules.Messages.Application.Messages.DTOs;
diff --git a/Modules/Messages/src/Messages.Application/Messages/Queries/GetMessage/Handler.cs b/Modules/Messages/src/Messages.Application/Messages/Queries/GetMessage/Handler.cs
index 9ea440f33d..6a7a83ced1 100644
--- a/Modules/Messages/src/Messages.Application/Messages/Queries/GetMessage/Handler.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/Queries/GetMessage/Handler.cs
@@ -1,8 +1,8 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Messages.Application.Extensions;
using Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Messages.Application.Messages.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Messages.Application.Messages.Queries.GetMessage;
diff --git a/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/Handler.cs b/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/Handler.cs
index 710c591df5..cbc6e85ec2 100644
--- a/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/Handler.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/Handler.cs
@@ -1,8 +1,8 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Messages.Application.Extensions;
using Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Messages.Application.Messages.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Messages.Application.Messages.Queries.ListMessages;
diff --git a/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/ListMessagesQuery.cs b/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/ListMessagesQuery.cs
index c2d539f4c1..d7623dc1eb 100644
--- a/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/ListMessagesQuery.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/ListMessagesQuery.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Messages.Domain.Ids;
using MediatR;
namespace Backbone.Modules.Messages.Application.Messages.Queries.ListMessages;
diff --git a/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/ListMessagesResponse.cs b/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/ListMessagesResponse.cs
index 144b72d46c..8d3d3e4fc2 100644
--- a/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/ListMessagesResponse.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/Queries/ListMessages/ListMessagesResponse.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Messages.Application.Messages.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Application.Messages.DTOs;
namespace Backbone.Modules.Messages.Application.Messages.Queries.ListMessages;
diff --git a/Modules/Messages/src/Messages.Application/Messages/RequestHandlerBase.cs b/Modules/Messages/src/Messages.Application/Messages/RequestHandlerBase.cs
index 3605926eb5..c51de57bf2 100644
--- a/Modules/Messages/src/Messages.Application/Messages/RequestHandlerBase.cs
+++ b/Modules/Messages/src/Messages.Application/Messages/RequestHandlerBase.cs
@@ -1,7 +1,7 @@
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Messages.Application.Messages;
diff --git a/Modules/Messages/src/Messages.ConsumerApi/Controllers/MessagesController.cs b/Modules/Messages/src/Messages.ConsumerApi/Controllers/MessagesController.cs
index c01a50a2d1..cfa3d82120 100644
--- a/Modules/Messages/src/Messages.ConsumerApi/Controllers/MessagesController.cs
+++ b/Modules/Messages/src/Messages.ConsumerApi/Controllers/MessagesController.cs
@@ -1,20 +1,20 @@
-using Backbone.Modules.Messages.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Messages.Application;
using Backbone.Modules.Messages.Application.Messages.Commands.SendMessage;
using Backbone.Modules.Messages.Application.Messages.DTOs;
using Backbone.Modules.Messages.Application.Messages.Queries.GetMessage;
using Backbone.Modules.Messages.Application.Messages.Queries.ListMessages;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Messages.ConsumerApi.Controllers;
diff --git a/Modules/Messages/src/Messages.ConsumerApi/MessagesModule.cs b/Modules/Messages/src/Messages.ConsumerApi/MessagesModule.cs
index bfd8157caa..1ab9de3803 100644
--- a/Modules/Messages/src/Messages.ConsumerApi/MessagesModule.cs
+++ b/Modules/Messages/src/Messages.ConsumerApi/MessagesModule.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Messages.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Messages.Application;
using Backbone.Modules.Messages.Application.Extensions;
using Backbone.Modules.Messages.Infrastructure.Persistence;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/Modules/Messages/src/Messages.Domain/Entities/Message.cs b/Modules/Messages/src/Messages.Domain/Entities/Message.cs
index 48de7fbfdb..66e85add04 100644
--- a/Modules/Messages/src/Messages.Domain/Entities/Message.cs
+++ b/Modules/Messages/src/Messages.Domain/Entities/Message.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Ids;
+using Backbone.Tooling;
namespace Backbone.Modules.Messages.Domain.Entities;
diff --git a/Modules/Messages/src/Messages.Domain/Entities/RecipientInformation.cs b/Modules/Messages/src/Messages.Domain/Entities/RecipientInformation.cs
index fc6c57420a..cfec2d657d 100644
--- a/Modules/Messages/src/Messages.Domain/Entities/RecipientInformation.cs
+++ b/Modules/Messages/src/Messages.Domain/Entities/RecipientInformation.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Ids;
+using Backbone.Tooling;
namespace Backbone.Modules.Messages.Domain.Entities;
diff --git a/Modules/Messages/src/Messages.Domain/Entities/Relationship.cs b/Modules/Messages/src/Messages.Domain/Entities/Relationship.cs
index e3dca2e2dc..2b1c1382e4 100644
--- a/Modules/Messages/src/Messages.Domain/Entities/Relationship.cs
+++ b/Modules/Messages/src/Messages.Domain/Entities/Relationship.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Ids;
namespace Backbone.Modules.Messages.Domain.Entities;
diff --git a/Modules/Messages/src/Messages.Domain/Ids/FileId.cs b/Modules/Messages/src/Messages.Domain/Ids/FileId.cs
index 498879225d..d58bb4f3c5 100644
--- a/Modules/Messages/src/Messages.Domain/Ids/FileId.cs
+++ b/Modules/Messages/src/Messages.Domain/Ids/FileId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Messages.Domain.Ids;
diff --git a/Modules/Messages/src/Messages.Domain/Ids/MessageId.cs b/Modules/Messages/src/Messages.Domain/Ids/MessageId.cs
index 0c4a2991c9..dc5162e022 100644
--- a/Modules/Messages/src/Messages.Domain/Ids/MessageId.cs
+++ b/Modules/Messages/src/Messages.Domain/Ids/MessageId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Messages.Domain.Ids;
diff --git a/Modules/Messages/src/Messages.Domain/Ids/RelationshipId.cs b/Modules/Messages/src/Messages.Domain/Ids/RelationshipId.cs
index dcfeb1f674..10bdd694bd 100644
--- a/Modules/Messages/src/Messages.Domain/Ids/RelationshipId.cs
+++ b/Modules/Messages/src/Messages.Domain/Ids/RelationshipId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Messages.Domain.Ids;
diff --git a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/MessageEntityType.cs b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/MessageEntityType.cs
index 044bd70104..171a432f08 100644
--- a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/MessageEntityType.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/MessageEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/RecipientInformationEntityType.cs b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/RecipientInformationEntityType.cs
index 7559631089..4403677b64 100644
--- a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/RecipientInformationEntityType.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/RecipientInformationEntityType.cs
@@ -2,11 +2,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
index 6bec1c1b46..ff6df58163 100644
--- a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/MessageEntityType.cs b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/MessageEntityType.cs
index d0e3152316..146d747742 100644
--- a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/MessageEntityType.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/MessageEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/RecipientInformationEntityType.cs b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/RecipientInformationEntityType.cs
index b8e1f254aa..7e0d2b2a09 100644
--- a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/RecipientInformationEntityType.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/RecipientInformationEntityType.cs
@@ -2,11 +2,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
index 3b54246c09..6a76a40027 100644
--- a/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Messages/src/Messages.Infrastructure/EventBus/MessagesEventBusRabbitMQ.cs b/Modules/Messages/src/Messages.Infrastructure/EventBus/MessagesEventBusRabbitMQ.cs
index d139c1344b..26f0f261d8 100644
--- a/Modules/Messages/src/Messages.Infrastructure/EventBus/MessagesEventBusRabbitMQ.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/EventBus/MessagesEventBusRabbitMQ.cs
@@ -1,7 +1,7 @@
using Autofac;
+using Backbone.BuildingBlocks.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
using Backbone.Modules.Messages.Application.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Infrastructure.EventBus.RabbitMQ;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Messages.Infrastructure.EventBus;
diff --git a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/MessagesDbContext.cs b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/MessagesDbContext.cs
index df088f9686..6a50726d71 100644
--- a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/MessagesDbContext.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/MessagesDbContext.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Messages.Domain.Entities;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Messages.Infrastructure.Persistence.Database;
diff --git a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/QueryableExtensions/MessagesQueryableExtensions.cs b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/QueryableExtensions/MessagesQueryableExtensions.cs
index 00f5971370..ec1c22c457 100644
--- a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/QueryableExtensions/MessagesQueryableExtensions.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/QueryableExtensions/MessagesQueryableExtensions.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Messages.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Messages.Infrastructure.Persistence.Database.QueryableExtensions;
diff --git a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/QueryableExtensions/RelationshipsQueryableExtensions.cs b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/QueryableExtensions/RelationshipsQueryableExtensions.cs
index 905efe238d..d2e1358230 100644
--- a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/QueryableExtensions/RelationshipsQueryableExtensions.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/QueryableExtensions/RelationshipsQueryableExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Messages.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Entities;
namespace Backbone.Modules.Messages.Infrastructure.Persistence.Database.QueryableExtensions;
diff --git a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/Repository/MessagesRepository.cs b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/Repository/MessagesRepository.cs
index e25ef0d1fe..a3b73e5ea5 100644
--- a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/Repository/MessagesRepository.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/Repository/MessagesRepository.cs
@@ -1,13 +1,13 @@
-using Backbone.Modules.Messages.Application.Infrastructure.Persistence;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Application.Infrastructure.Persistence;
using Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/Repository/RelationshipsRepository.cs b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/Repository/RelationshipsRepository.cs
index 81de2b70b7..585bffefe0 100644
--- a/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/Repository/RelationshipsRepository.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/Persistence/Database/Repository/RelationshipsRepository.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Messages.Infrastructure.Persistence.Database.Repository;
diff --git a/Modules/Messages/src/Messages.Infrastructure/Persistence/IServiceCollectionExtensions.cs b/Modules/Messages/src/Messages.Infrastructure/Persistence/IServiceCollectionExtensions.cs
index dd86e0d47f..13c1f79284 100644
--- a/Modules/Messages/src/Messages.Infrastructure/Persistence/IServiceCollectionExtensions.cs
+++ b/Modules/Messages/src/Messages.Infrastructure/Persistence/IServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Messages.Application.Infrastructure.Persistence;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Messages.Application.Infrastructure.Persistence;
using Backbone.Modules.Messages.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database.Repository;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
using Microsoft.Extensions.DependencyInjection;
namespace Backbone.Modules.Messages.Infrastructure.Persistence;
diff --git a/Modules/Messages/src/Messages.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs b/Modules/Messages/src/Messages.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
index 08a2dd0e2c..78e56b9992 100644
--- a/Modules/Messages/src/Messages.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
+++ b/Modules/Messages/src/Messages.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Messages.Application.Infrastructure.Persistence;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Messages.Application.Infrastructure.Persistence;
using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Messages/src/Messages.Jobs.SanityCheck/Program.cs b/Modules/Messages/src/Messages.Jobs.SanityCheck/Program.cs
index 96dec06921..ea560b0724 100644
--- a/Modules/Messages/src/Messages.Jobs.SanityCheck/Program.cs
+++ b/Modules/Messages/src/Messages.Jobs.SanityCheck/Program.cs
@@ -3,7 +3,7 @@
using Backbone.Modules.Messages.Jobs.SanityCheck.Extensions;
using Backbone.Modules.Messages.Jobs.SanityCheck.Infrastructure.DataSource;
using Backbone.Modules.Messages.Jobs.SanityCheck.Infrastructure.Reporter;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Messages.Jobs.SanityCheck;
diff --git a/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs b/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
index b0897ad39d..55c2fe7463 100644
--- a/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
+++ b/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Jobs.SanityCheck.Infrastructure.DataSource;
-namespace Messages.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+namespace Backbone.Modules.Messages.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
public class FakeDataSource : IDataSource
{
diff --git a/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs b/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
index 2adbea917f..d7bbd0cfd9 100644
--- a/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
+++ b/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Messages.Domain.Ids;
using Backbone.Modules.Messages.Jobs.SanityCheck.Infrastructure.Reporter;
-namespace Messages.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
+namespace Backbone.Modules.Messages.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
public class TestReporter : IReporter
{
diff --git a/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs b/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
index 6451ee1e00..751520c60d 100644
--- a/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
+++ b/Modules/Messages/test/Messages.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
@@ -1,10 +1,10 @@
using Backbone.Modules.Messages.Domain.Ids;
+using Backbone.Modules.Messages.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+using Backbone.Modules.Messages.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using FluentAssertions;
-using Messages.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
-using Messages.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using Xunit;
-namespace Messages.Jobs.SanityCheck.Tests.Tests;
+namespace Backbone.Modules.Messages.Jobs.SanityCheck.Tests.Tests;
public class SanityCheckTests
{
diff --git a/Modules/Quotas/src/Quotas.Application/AutoMapper/AutoMapperProfile.cs b/Modules/Quotas/src/Quotas.Application/AutoMapper/AutoMapperProfile.cs
index b0abb3f043..4fcea0de0a 100644
--- a/Modules/Quotas/src/Quotas.Application/AutoMapper/AutoMapperProfile.cs
+++ b/Modules/Quotas/src/Quotas.Application/AutoMapper/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
using System.Reflection;
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.AutoMapper;
namespace Backbone.Modules.Quotas.Application.AutoMapper;
diff --git a/Modules/Quotas/src/Quotas.Application/DTOs/MetricDTO.cs b/Modules/Quotas/src/Quotas.Application/DTOs/MetricDTO.cs
index 4a86962657..756ee68589 100644
--- a/Modules/Quotas/src/Quotas.Application/DTOs/MetricDTO.cs
+++ b/Modules/Quotas/src/Quotas.Application/DTOs/MetricDTO.cs
@@ -1,6 +1,6 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
namespace Backbone.Modules.Quotas.Application.DTOs;
diff --git a/Modules/Quotas/src/Quotas.Application/Extensions/IEventBusExtensions.cs b/Modules/Quotas/src/Quotas.Application/Extensions/IEventBusExtensions.cs
index 49baebd60c..fd49d3e361 100644
--- a/Modules/Quotas/src/Quotas.Application/Extensions/IEventBusExtensions.cs
+++ b/Modules/Quotas/src/Quotas.Application/Extensions/IEventBusExtensions.cs
@@ -1,4 +1,5 @@
-using Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.FileUploaded;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.FileUploaded;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.IdentityCreated;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.MessageCreated;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.QuotaCreatedForTier;
@@ -11,7 +12,6 @@
using Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TierQuotaDefinitionDeleted;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TokenCreated;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Quotas.Application.Extensions;
diff --git a/Modules/Quotas/src/Quotas.Application/Extensions/IServiceCollectionExtensions.cs b/Modules/Quotas/src/Quotas.Application/Extensions/IServiceCollectionExtensions.cs
index 748432b48a..1da1349abc 100644
--- a/Modules/Quotas/src/Quotas.Application/Extensions/IServiceCollectionExtensions.cs
+++ b/Modules/Quotas/src/Quotas.Application/Extensions/IServiceCollectionExtensions.cs
@@ -1,10 +1,10 @@
using System.Reflection;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.MediatR;
using Backbone.Modules.Quotas.Application.AutoMapper;
using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Application.Tiers.Commands.CreateQuotaForTier;
using Backbone.Modules.Quotas.Domain;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.MediatR;
using Microsoft.Extensions.DependencyInjection;
namespace Backbone.Modules.Quotas.Application.Extensions;
diff --git a/Modules/Quotas/src/Quotas.Application/Identities/Queries/GetIdentity/Handler.cs b/Modules/Quotas/src/Quotas.Application/Identities/Queries/GetIdentity/Handler.cs
index 3c19ba1481..62b98dee11 100644
--- a/Modules/Quotas/src/Quotas.Application/Identities/Queries/GetIdentity/Handler.cs
+++ b/Modules/Quotas/src/Quotas.Application/Identities/Queries/GetIdentity/Handler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using MediatR;
namespace Backbone.Modules.Quotas.Application.Identities.Queries.GetIdentity;
diff --git a/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/IMessagesRepository.cs b/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/IMessagesRepository.cs
index 2ff4b66a16..fe38d14bb1 100644
--- a/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/IMessagesRepository.cs
+++ b/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/IMessagesRepository.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
public interface IMessagesRepository
diff --git a/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs b/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs
index 8e87081706..0e792fbc95 100644
--- a/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs
+++ b/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
public interface IRelationshipTemplatesRepository
diff --git a/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs b/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs
index 7c67aee729..ff9f51882d 100644
--- a/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs
+++ b/Modules/Quotas/src/Quotas.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
public interface ITokensRepository
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/FileUploaded/FileUploadedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/FileUploaded/FileUploadedIntegrationEvent.cs
index 5cf9dfa98d..2fb635dffe 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/FileUploaded/FileUploadedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/FileUploaded/FileUploadedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.FileUploaded;
public class FileUploadedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/FileUploaded/FileUploadedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/FileUploaded/FileUploadedIntegrationEventHandler.cs
index 4ff15af486..d3fa052e0a 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/FileUploaded/FileUploadedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/FileUploaded/FileUploadedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Metrics;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.FileUploaded;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/IdentityCreated/IdentityCreatedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/IdentityCreated/IdentityCreatedIntegrationEvent.cs
index 8dd7a37b8f..2330723a6b 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/IdentityCreated/IdentityCreatedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/IdentityCreated/IdentityCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.IdentityCreated;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/IdentityCreated/IdentityCreatedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/IdentityCreated/IdentityCreatedIntegrationEventHandler.cs
index 4f4a4f6e9e..5d96679a48 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/IdentityCreated/IdentityCreatedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/IdentityCreated/IdentityCreatedIntegrationEventHandler.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
using Backbone.Modules.Quotas.Domain.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.IdentityCreated;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEvent.cs
index d79f1f8ad8..3f02b5d88c 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.MessageCreated;
public class MessageCreatedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEventHandler.cs
index 85246bc20b..48e136a1a4 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Metrics;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.MessageCreated;
public class MessageCreatedIntegrationEventHandler : IIntegrationEventHandler
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/QuotaCreatedForTier/QuotaCreatedForTierIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/QuotaCreatedForTier/QuotaCreatedForTierIntegrationEventHandler.cs
index 8799129a2b..649383580d 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/QuotaCreatedForTier/QuotaCreatedForTierIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/QuotaCreatedForTier/QuotaCreatedForTierIntegrationEventHandler.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.QuotaCreatedForTier;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEvent.cs
index d597b72ad3..982a673fa6 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.RelationshipChangeCompleted;
public class RelationshipChangeCompletedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEventHandler.cs
index e4c5e8f681..fbc4171057 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Metrics;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.RelationshipChangeCompleted;
public class RelationshipChangeCompletedIntegrationEventHandler : IIntegrationEventHandler
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEvent.cs
index 09ab086cc4..c04bceeefa 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.RelationshipChangeCreated;
public class RelationshipChangeCreatedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEventHandler.cs
index 570b4f131a..28d3833f56 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Metrics;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.RelationshipChangeCreated;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipTemplateCreated/RelationshipTemplateCreatedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipTemplateCreated/RelationshipTemplateCreatedIntegrationEvent.cs
index d102baa549..3a6b405dd8 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipTemplateCreated/RelationshipTemplateCreatedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipTemplateCreated/RelationshipTemplateCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.RelationshipTemplateCreated;
public class RelationshipTemplateCreatedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipTemplateCreated/RelationshipTemplateCreatedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipTemplateCreated/RelationshipTemplateCreatedIntegrationEventHandler.cs
index d8e5fbd604..4363be518b 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipTemplateCreated/RelationshipTemplateCreatedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/RelationshipTemplateCreated/RelationshipTemplateCreatedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Metrics;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.RelationshipTemplateCreated;
public class RelationshipTemplateCreatedIntegrationEventHandler : IIntegrationEventHandler
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierCreated/TierCreatedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierCreated/TierCreatedIntegrationEvent.cs
index 749377b76b..170e9b4a15 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierCreated/TierCreatedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierCreated/TierCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TierCreated;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierCreated/TierCreatedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierCreated/TierCreatedIntegrationEventHandler.cs
index 2f8a9b4283..4c97f9ba90 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierCreated/TierCreatedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierCreated/TierCreatedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TierCreated;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierDeleted/TierDeletedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierDeleted/TierDeletedIntegrationEvent.cs
index aec8638236..7c539b2ad3 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierDeleted/TierDeletedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierDeleted/TierDeletedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TierDeleted;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierDeleted/TierDeletedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierDeleted/TierDeletedIntegrationEventHandler.cs
index b529a62818..688e8890c3 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierDeleted/TierDeletedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierDeleted/TierDeletedIntegrationEventHandler.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TierDeleted;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierOfIdentityChanged/TierOfIdentityChangedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierOfIdentityChanged/TierOfIdentityChangedIntegrationEvent.cs
index 4ee4d94af6..124068cfd7 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierOfIdentityChanged/TierOfIdentityChangedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierOfIdentityChanged/TierOfIdentityChangedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TierOfIdentityChanged;
public class TierOfIdentityChangedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierOfIdentityChanged/TierOfIdentityChangedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierOfIdentityChanged/TierOfIdentityChangedIntegrationEventHandler.cs
index 92455bc215..b81f55b196 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierOfIdentityChanged/TierOfIdentityChangedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierOfIdentityChanged/TierOfIdentityChangedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TierOfIdentityChanged;
public class TierOfIdentityChangedIntegrationEventHandler : IIntegrationEventHandler
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierQuotaDefinitionDeleted/TierQuotaDefinitionDeletedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierQuotaDefinitionDeleted/TierQuotaDefinitionDeletedIntegrationEventHandler.cs
index b46065bee5..fa8a7ca8c4 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierQuotaDefinitionDeleted/TierQuotaDefinitionDeletedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TierQuotaDefinitionDeleted/TierQuotaDefinitionDeletedIntegrationEventHandler.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TierQuotaDefinitionDeleted;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TokenCreated/TokenCreatedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TokenCreated/TokenCreatedIntegrationEvent.cs
index ed13ddc45c..b628f14511 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TokenCreated/TokenCreatedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TokenCreated/TokenCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TokenCreated;
public class TokenCreatedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TokenCreated/TokenCreatedIntegrationEventHandler.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TokenCreated/TokenCreatedIntegrationEventHandler.cs
index c8151d72a4..f412d01372 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TokenCreated/TokenCreatedIntegrationEventHandler.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Incoming/TokenCreated/TokenCreatedIntegrationEventHandler.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Metrics;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Incoming.TokenCreated;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Outgoing/QuotaCreatedForTierIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Outgoing/QuotaCreatedForTierIntegrationEvent.cs
index da474642ee..67ba530677 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Outgoing/QuotaCreatedForTierIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Outgoing/QuotaCreatedForTierIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
diff --git a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Outgoing/TierQuotaDefinitionDeletedIntegrationEvent.cs b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Outgoing/TierQuotaDefinitionDeletedIntegrationEvent.cs
index 0e5084aa20..2a77f8f059 100644
--- a/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Outgoing/TierQuotaDefinitionDeletedIntegrationEvent.cs
+++ b/Modules/Quotas/src/Quotas.Application/IntegrationEvents/Outgoing/TierQuotaDefinitionDeletedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
public class TierQuotaDefinitionDeletedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Quotas/src/Quotas.Application/Metrics/MetricStatusesService.cs b/Modules/Quotas/src/Quotas.Application/Metrics/MetricStatusesService.cs
index f7b3120aaa..986467ecba 100644
--- a/Modules/Quotas/src/Quotas.Application/Metrics/MetricStatusesService.cs
+++ b/Modules/Quotas/src/Quotas.Application/Metrics/MetricStatusesService.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Metrics;
-using Enmeshed.BuildingBlocks.Domain;
using MetricKey = Backbone.Modules.Quotas.Domain.Aggregates.Metrics.MetricKey;
namespace Backbone.Modules.Quotas.Application.Metrics;
diff --git a/Modules/Quotas/src/Quotas.Application/Metrics/Queries/ListMetrics/ListMetricsResponse.cs b/Modules/Quotas/src/Quotas.Application/Metrics/Queries/ListMetrics/ListMetricsResponse.cs
index df2f9a6bbd..cf315ec358 100644
--- a/Modules/Quotas/src/Quotas.Application/Metrics/Queries/ListMetrics/ListMetricsResponse.cs
+++ b/Modules/Quotas/src/Quotas.Application/Metrics/Queries/ListMetrics/ListMetricsResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Quotas.Application.DTOs;
-using Enmeshed.BuildingBlocks.Application.CQRS.BaseClasses;
+using Backbone.BuildingBlocks.Application.CQRS.BaseClasses;
+using Backbone.Modules.Quotas.Application.DTOs;
namespace Backbone.Modules.Quotas.Application.Metrics.Queries.ListMetrics;
public class ListMetricsResponse : EnumerableResponseBase
diff --git a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForIdentity/CreateQuotaForIdentityCommandValidator.cs b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForIdentity/CreateQuotaForIdentityCommandValidator.cs
index e27376da28..36674a2596 100644
--- a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForIdentity/CreateQuotaForIdentityCommandValidator.cs
+++ b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForIdentity/CreateQuotaForIdentityCommandValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Quotas.Application.Tiers.Commands.CreateQuotaForIdentity;
diff --git a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForIdentity/Handler.cs b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForIdentity/Handler.cs
index 3110450878..be4a7db083 100644
--- a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForIdentity/Handler.cs
+++ b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForIdentity/Handler.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Quotas.Application.DTOs;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Application.DTOs;
using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Domain;
using MediatR;
using Microsoft.Extensions.Logging;
using MetricKey = Backbone.Modules.Quotas.Domain.Aggregates.Metrics.MetricKey;
diff --git a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForTier/CreateQuotaForTierCommandValidator.cs b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForTier/CreateQuotaForTierCommandValidator.cs
index 5b88e4b8f4..81d90f698f 100644
--- a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForTier/CreateQuotaForTierCommandValidator.cs
+++ b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForTier/CreateQuotaForTierCommandValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Quotas.Application.Tiers.Commands.CreateQuotaForTier;
diff --git a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForTier/Handler.cs b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForTier/Handler.cs
index b31592f4ee..f158ed7413 100644
--- a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForTier/Handler.cs
+++ b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/CreateQuotaForTier/Handler.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Quotas.Application.DTOs;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Application.DTOs;
using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Domain;
using MediatR;
using Microsoft.Extensions.Logging;
using MetricKey = Backbone.Modules.Quotas.Domain.Aggregates.Metrics.MetricKey;
diff --git a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteQuotaForIdentity/DeleteQuotaForIdentityCommandValidator.cs b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteQuotaForIdentity/DeleteQuotaForIdentityCommandValidator.cs
index 08c1d8c9e3..000cc5baf3 100644
--- a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteQuotaForIdentity/DeleteQuotaForIdentityCommandValidator.cs
+++ b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteQuotaForIdentity/DeleteQuotaForIdentityCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Quotas.Application.Tiers.Commands.DeleteQuotaForIdentity;
diff --git a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteQuotaForIdentity/Handler.cs b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteQuotaForIdentity/Handler.cs
index fb55c104bd..edb413512e 100644
--- a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteQuotaForIdentity/Handler.cs
+++ b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteQuotaForIdentity/Handler.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Domain;
using MediatR;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteTierQuotaDefinition/DeleteTierQuotaDefinitionCommandValidator.cs b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteTierQuotaDefinition/DeleteTierQuotaDefinitionCommandValidator.cs
index ca5d4179f4..ffbf273efc 100644
--- a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteTierQuotaDefinition/DeleteTierQuotaDefinitionCommandValidator.cs
+++ b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteTierQuotaDefinition/DeleteTierQuotaDefinitionCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Quotas.Application.Tiers.Commands.DeleteTierQuotaDefinition;
diff --git a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteTierQuotaDefinition/Handler.cs b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteTierQuotaDefinition/Handler.cs
index f8d86b39a7..ddb63e5018 100644
--- a/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteTierQuotaDefinition/Handler.cs
+++ b/Modules/Quotas/src/Quotas.Application/Tiers/Commands/DeleteTierQuotaDefinition/Handler.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Domain;
using MediatR;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Quotas/src/Quotas.ConsumerApi/QuotasModule.cs b/Modules/Quotas/src/Quotas.ConsumerApi/QuotasModule.cs
index 257dbed381..9771576f74 100644
--- a/Modules/Quotas/src/Quotas.ConsumerApi/QuotasModule.cs
+++ b/Modules/Quotas/src/Quotas.ConsumerApi/QuotasModule.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Quotas.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Quotas.Application;
using Backbone.Modules.Quotas.Application.Extensions;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/Identity.cs b/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/Identity.cs
index e18ed05448..4573432994 100644
--- a/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/Identity.cs
+++ b/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/Identity.cs
@@ -1,8 +1,8 @@
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
using Backbone.Modules.Quotas.Domain.Metrics;
using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
using MetricKey = Backbone.Modules.Quotas.Domain.Aggregates.Metrics.MetricKey;
namespace Backbone.Modules.Quotas.Domain.Aggregates.Identities;
diff --git a/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/QuotaId.cs b/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/QuotaId.cs
index 84b09b4778..ce5f4ad614 100644
--- a/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/QuotaId.cs
+++ b/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/QuotaId.cs
@@ -1,7 +1,7 @@
-using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Records;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Records;
+using CSharpFunctionalExtensions;
namespace Backbone.Modules.Quotas.Domain.Aggregates.Identities;
diff --git a/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/QuotaPeriod.cs b/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/QuotaPeriod.cs
index 898c556aad..da62266e14 100644
--- a/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/QuotaPeriod.cs
+++ b/Modules/Quotas/src/Quotas.Domain/Aggregates/Identities/QuotaPeriod.cs
@@ -1,5 +1,5 @@
-using Enmeshed.Tooling;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Quotas.Domain.Aggregates.Identities;
diff --git a/Modules/Quotas/src/Quotas.Domain/Aggregates/Metrics/MetricKey.cs b/Modules/Quotas/src/Quotas.Domain/Aggregates/Metrics/MetricKey.cs
index 90da15ca2c..df4f2baf06 100644
--- a/Modules/Quotas/src/Quotas.Domain/Aggregates/Metrics/MetricKey.cs
+++ b/Modules/Quotas/src/Quotas.Domain/Aggregates/Metrics/MetricKey.cs
@@ -1,5 +1,5 @@
-using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
+using CSharpFunctionalExtensions;
namespace Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
diff --git a/Modules/Quotas/src/Quotas.Domain/Aggregates/Tiers/Tier.cs b/Modules/Quotas/src/Quotas.Domain/Aggregates/Tiers/Tier.cs
index 1288a9256e..a3f4f2423a 100644
--- a/Modules/Quotas/src/Quotas.Domain/Aggregates/Tiers/Tier.cs
+++ b/Modules/Quotas/src/Quotas.Domain/Aggregates/Tiers/Tier.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain.Errors;
namespace Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
diff --git a/Modules/Quotas/src/Quotas.Domain/Aggregates/Tiers/TierQuotaDefinitionId.cs b/Modules/Quotas/src/Quotas.Domain/Aggregates/Tiers/TierQuotaDefinitionId.cs
index 6dbd01f94f..827d2def52 100644
--- a/Modules/Quotas/src/Quotas.Domain/Aggregates/Tiers/TierQuotaDefinitionId.cs
+++ b/Modules/Quotas/src/Quotas.Domain/Aggregates/Tiers/TierQuotaDefinitionId.cs
@@ -1,7 +1,7 @@
-using CSharpFunctionalExtensions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Records;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Records;
+using CSharpFunctionalExtensions;
namespace Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
diff --git a/Modules/Quotas/src/Quotas.Domain/DomainErrors.cs b/Modules/Quotas/src/Quotas.Domain/DomainErrors.cs
index 0de33d199c..cff49f1c41 100644
--- a/Modules/Quotas/src/Quotas.Domain/DomainErrors.cs
+++ b/Modules/Quotas/src/Quotas.Domain/DomainErrors.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
namespace Backbone.Modules.Quotas.Domain;
public static class DomainErrors
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/FileMetadataEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/FileMetadataEntityType.cs
index 45079b6c9f..f80cc75136 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/FileMetadataEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/FileMetadataEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.FileMetadata;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/MessageEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/MessageEntityType.cs
index 207e002ba1..ad86349f7b 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/MessageEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/MessageEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.Messages;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
index e8676067be..cb56c64460 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.Relationships;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/RelationshipTemplateEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/RelationshipTemplateEntityType.cs
index 2163165bb8..e94e9f1816 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/RelationshipTemplateEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/RelationshipTemplateEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.Relationships;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/TokenEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/TokenEntityType.cs
index ece88b8cbc..857502f0e9 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/TokenEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/Postgres/TokenEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.Tokens;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/FileMetadataEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/FileMetadataEntityType.cs
index a2faff9bc2..7ca2fa88c1 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/FileMetadataEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/FileMetadataEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.FileMetadata;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/MessageEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/MessageEntityType.cs
index ad103f4f65..c64962d050 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/MessageEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/MessageEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.Messages;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
index 732d0d15e3..9e7f9e597e 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.Relationships;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateEntityType.cs
index 5d1eb6b5f6..92de231284 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.Relationships;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/TokenEntityType.cs b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/TokenEntityType.cs
index 0dddf6d3a3..ce2017ae4e 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/TokenEntityType.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/CompiledModels/SqlServer/TokenEntityType.cs
@@ -1,8 +1,8 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.Tokens;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/EntityConfigurations/IdentityEntityTypeConfiguration.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/EntityConfigurations/IdentityEntityTypeConfiguration.cs
index 124f646e8f..dd7162e91e 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/EntityConfigurations/IdentityEntityTypeConfiguration.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/EntityConfigurations/IdentityEntityTypeConfiguration.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QueryableExtensions/TierQuotaDefinitionsQueryableExtensions.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QueryableExtensions/TierQuotaDefinitionsQueryableExtensions.cs
index 497e90abc3..66ff7d7672 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QueryableExtensions/TierQuotaDefinitionsQueryableExtensions.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QueryableExtensions/TierQuotaDefinitionsQueryableExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Database.QueryableExtensions;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QueryableExtensions/TiersQueryableExtensions.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QueryableExtensions/TiersQueryableExtensions.cs
index 06f321184c..634ba87250 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QueryableExtensions/TiersQueryableExtensions.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QueryableExtensions/TiersQueryableExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Database.QueryableExtensions;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QuotasDbContext.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QuotasDbContext.cs
index 4c026c1d1b..aa0a508eeb 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QuotasDbContext.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Database/QuotasDbContext.cs
@@ -1,3 +1,5 @@
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Quotas.Domain.Aggregates.FileMetadata;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Messages;
@@ -6,8 +8,6 @@
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
using Backbone.Modules.Quotas.Domain.Aggregates.Tokens;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/IdentitiesRepository.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/IdentitiesRepository.cs
index b62b0247af..0c806839a1 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/IdentitiesRepository.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/IdentitiesRepository.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.BuildingBlocks.Application.Extensions;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Repository;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/MessagesRepository.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/MessagesRepository.cs
index caedf1fc0a..1d22949f4f 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/MessagesRepository.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/MessagesRepository.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Messages;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Repository;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/MetricsRepository.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/MetricsRepository.cs
index 3f62ed5303..54689d8fe2 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/MetricsRepository.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/MetricsRepository.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Repository;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/RelationshipTemplatesRepository.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/RelationshipTemplatesRepository.cs
index 3338e60c4b..1dbcf32419 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/RelationshipTemplatesRepository.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/RelationshipTemplatesRepository.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Relationships;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Repository;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TiersRepository .cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TiersRepository .cs
index 84d8afbf0d..3d49c6c7e8 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TiersRepository .cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TiersRepository .cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.BuildingBlocks.Application.Extensions;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Repository;
diff --git a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TokensRepository.cs b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TokensRepository.cs
index 8f4260100a..746683570e 100644
--- a/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TokensRepository.cs
+++ b/Modules/Quotas/src/Quotas.Infrastructure/Persistence/Repository/TokensRepository.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Domain.Aggregates.Tokens;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database.QueryableExtensions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Quotas.Infrastructure.Persistence.Repository;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Extensions/ExceptionAssertionsExtensions.cs b/Modules/Quotas/test/Quotas.Application.Tests/Extensions/ExceptionAssertionsExtensions.cs
index 4ba9e8ca97..c89ea200b0 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Extensions/ExceptionAssertionsExtensions.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Extensions/ExceptionAssertionsExtensions.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain;
using FluentAssertions;
using FluentAssertions.Specialized;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/MetricStatusesStubRepository.cs b/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/MetricStatusesStubRepository.cs
index a445f0ed36..2bed69885b 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/MetricStatusesStubRepository.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/MetricStatusesStubRepository.cs
@@ -1,6 +1,6 @@
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.Common.Infrastructure.Persistence.Repository;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Common.Infrastructure.Persistence.Repository;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Quotas.Application.Tests.TestDoubles;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/UserContextStub.cs b/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/UserContextStub.cs
index 30e96f15ec..7bf11cacb6 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/UserContextStub.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/TestDoubles/UserContextStub.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Quotas.Application.Tests.TestDoubles;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Identities/GetIdentity/HandlerTests.cs b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Identities/GetIdentity/HandlerTests.cs
index ca091e8ff7..247d2f341b 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Identities/GetIdentity/HandlerTests.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Identities/GetIdentity/HandlerTests.cs
@@ -1,11 +1,11 @@
-using Backbone.Modules.Quotas.Application.Identities.Queries.GetIdentity;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Quotas.Application.Identities.Queries.GetIdentity;
using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.Tests.TestDoubles;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.UnitTestTools.Extensions;
using FakeItEasy;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Tests/QuotaCheck/QuotaCheckerImplTests.cs b/Modules/Quotas/test/Quotas.Application.Tests/Tests/QuotaCheck/QuotaCheckerImplTests.cs
index be387179af..69a71c093b 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Tests/QuotaCheck/QuotaCheckerImplTests.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Tests/QuotaCheck/QuotaCheckerImplTests.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Quotas.Application.Tests.TestDoubles;
-using Enmeshed.BuildingBlocks.Application.QuotaCheck;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.Tooling;
+using Backbone.BuildingBlocks.Application.QuotaCheck;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Application.Tests.TestDoubles;
+using Backbone.Tooling;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/CreateQuotaForIdentity/HandlerTests.cs b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/CreateQuotaForIdentity/HandlerTests.cs
index 163015c72f..4e1aa63576 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/CreateQuotaForIdentity/HandlerTests.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/CreateQuotaForIdentity/HandlerTests.cs
@@ -1,14 +1,14 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.Metrics;
using Backbone.Modules.Quotas.Application.Tests.TestDoubles;
using Backbone.Modules.Quotas.Application.Tiers.Commands.CreateQuotaForIdentity;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.UnitTestTools.Extensions;
using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/CreateQuotaForTier/HandlerTests.cs b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/CreateQuotaForTier/HandlerTests.cs
index 7f329b5885..64a3677146 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/CreateQuotaForTier/HandlerTests.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/CreateQuotaForTier/HandlerTests.cs
@@ -1,12 +1,12 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Quotas.Application.Tests.TestDoubles;
using Backbone.Modules.Quotas.Application.Tiers.Commands.CreateQuotaForTier;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
using FakeItEasy;
using FluentAssertions;
using FluentAssertions.Execution;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/DeleteIndividualQuota/HandlerTests.cs b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/DeleteIndividualQuota/HandlerTests.cs
index c588f63010..6f87102be3 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/DeleteIndividualQuota/HandlerTests.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/DeleteIndividualQuota/HandlerTests.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.Tiers.Commands.DeleteQuotaForIdentity;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.UnitTestTools.Extensions;
using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.Logging;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/DeleteTierQuotaDefinition/HandlerTests.cs b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/DeleteTierQuotaDefinition/HandlerTests.cs
index 64c207fa8b..1ee6f59029 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/DeleteTierQuotaDefinition/HandlerTests.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Quotas/DeleteTierQuotaDefinition/HandlerTests.cs
@@ -1,13 +1,13 @@
-using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Quotas.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Quotas.Application.Tests.Extensions;
using Backbone.Modules.Quotas.Application.Tiers.Commands.DeleteTierQuotaDefinition;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-using Enmeshed.BuildingBlocks.Domain;
using FakeItEasy;
using FluentAssertions;
using FluentAssertions.Execution;
diff --git a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Repositories/MessagesRepositoryTests.cs b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Repositories/MessagesRepositoryTests.cs
index c024e78b65..1e24e3bfad 100644
--- a/Modules/Quotas/test/Quotas.Application.Tests/Tests/Repositories/MessagesRepositoryTests.cs
+++ b/Modules/Quotas/test/Quotas.Application.Tests/Tests/Repositories/MessagesRepositoryTests.cs
@@ -1,12 +1,12 @@
-using Backbone.Modules.Messages.Domain.Entities;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Messages.Domain.Entities;
using Backbone.Modules.Messages.Infrastructure.Persistence.Database;
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Database;
using Backbone.Modules.Quotas.Infrastructure.Persistence.Repository;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
-using Enmeshed.UnitTestTools.Data;
-using Enmeshed.UnitTestTools.TestDoubles.Fakes;
+using Backbone.Tooling;
+using Backbone.UnitTestTools.Data;
+using Backbone.UnitTestTools.TestDoubles.Fakes;
using FluentAssertions;
using FluentAssertions.Execution;
using Xunit;
diff --git a/Modules/Quotas/test/Quotas.Domain.Tests/ExhaustionDateAssertions.cs b/Modules/Quotas/test/Quotas.Domain.Tests/ExhaustionDateAssertions.cs
index d0ec30628f..e7414544db 100644
--- a/Modules/Quotas/test/Quotas.Domain.Tests/ExhaustionDateAssertions.cs
+++ b/Modules/Quotas/test/Quotas.Domain.Tests/ExhaustionDateAssertions.cs
@@ -1,5 +1,5 @@
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using FluentAssertions;
using FluentAssertions.Execution;
using FluentAssertions.Numeric;
diff --git a/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Identities/IdentityTests.cs b/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Identities/IdentityTests.cs
index 11bb1af144..9c514c06cd 100644
--- a/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Identities/IdentityTests.cs
+++ b/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Identities/IdentityTests.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
using Backbone.Modules.Quotas.Domain.Metrics;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.Tooling;
-using Enmeshed.UnitTestTools.Data;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.Tooling;
+using Backbone.UnitTestTools.Data;
+using Backbone.UnitTestTools.Extensions;
using FluentAssertions;
using Xunit;
using MetricKey = Backbone.Modules.Quotas.Domain.Aggregates.Metrics.MetricKey;
diff --git a/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Identities/QuotaPeriodTests.cs b/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Identities/QuotaPeriodTests.cs
index 8f0ac1f4d8..ad4f180a36 100644
--- a/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Identities/QuotaPeriodTests.cs
+++ b/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Identities/QuotaPeriodTests.cs
@@ -1,6 +1,6 @@
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
-using Enmeshed.Tooling;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.Tooling;
+using Backbone.UnitTestTools.Extensions;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Tiers/TierTests.cs b/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Tiers/TierTests.cs
index fce9fd39e2..cabb0f7356 100644
--- a/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Tiers/TierTests.cs
+++ b/Modules/Quotas/test/Quotas.Domain.Tests/Tests/Tiers/TierTests.cs
@@ -1,6 +1,6 @@
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.UnitTestTools.Extensions;
+using Backbone.UnitTestTools.Extensions;
using FluentAssertions;
using Xunit;
using MetricKey = Backbone.Modules.Quotas.Domain.Aggregates.Metrics.MetricKey;
diff --git a/Modules/Quotas/test/Quotas.Domain.Tests/TierQuotaTests.cs b/Modules/Quotas/test/Quotas.Domain.Tests/TierQuotaTests.cs
index e1b22130b2..f62deef3ff 100644
--- a/Modules/Quotas/test/Quotas.Domain.Tests/TierQuotaTests.cs
+++ b/Modules/Quotas/test/Quotas.Domain.Tests/TierQuotaTests.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Quotas.Domain.Aggregates.Identities;
using Backbone.Modules.Quotas.Domain.Aggregates.Metrics;
using Backbone.Modules.Quotas.Domain.Aggregates.Tiers;
-using Enmeshed.UnitTestTools.Data;
+using Backbone.UnitTestTools.Data;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Relationships/src/Relationships.Application/ApplicationErrors.cs b/Modules/Relationships/src/Relationships.Application/ApplicationErrors.cs
index b9c27de741..e6a0b5a34b 100644
--- a/Modules/Relationships/src/Relationships.Application/ApplicationErrors.cs
+++ b/Modules/Relationships/src/Relationships.Application/ApplicationErrors.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
namespace Backbone.Modules.Relationships.Application;
diff --git a/Modules/Relationships/src/Relationships.Application/AutoMapper/AutoMapperProfile.cs b/Modules/Relationships/src/Relationships.Application/AutoMapper/AutoMapperProfile.cs
index 6a4da70d1c..e5242ea17b 100644
--- a/Modules/Relationships/src/Relationships.Application/AutoMapper/AutoMapperProfile.cs
+++ b/Modules/Relationships/src/Relationships.Application/AutoMapper/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
using System.Reflection;
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.AutoMapper;
namespace Backbone.Modules.Relationships.Application.AutoMapper;
diff --git a/Modules/Relationships/src/Relationships.Application/Extensions/ChangeHistoryExtensions.cs b/Modules/Relationships/src/Relationships.Application/Extensions/ChangeHistoryExtensions.cs
index 09d61c80c6..5e687a37e1 100644
--- a/Modules/Relationships/src/Relationships.Application/Extensions/ChangeHistoryExtensions.cs
+++ b/Modules/Relationships/src/Relationships.Application/Extensions/ChangeHistoryExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Relationships.Domain.Entities;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Relationships.Application.Extensions;
diff --git a/Modules/Relationships/src/Relationships.Application/Extensions/IServiceCollectionExtensions.cs b/Modules/Relationships/src/Relationships.Application/Extensions/IServiceCollectionExtensions.cs
index 434681358b..1cc467bbc3 100644
--- a/Modules/Relationships/src/Relationships.Application/Extensions/IServiceCollectionExtensions.cs
+++ b/Modules/Relationships/src/Relationships.Application/Extensions/IServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.MediatR;
+using Backbone.Modules.Relationships.Application.AutoMapper;
using Backbone.Modules.Relationships.Application.RelationshipTemplates.Commands.CreateRelationshipTemplate;
-using Enmeshed.BuildingBlocks.Application.MediatR;
using FluentValidation;
using Microsoft.Extensions.DependencyInjection;
diff --git a/Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs b/Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs
index 890cd60a42..d2ecf86cb6 100644
--- a/Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs
+++ b/Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipTemplatesRepository.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
public interface IRelationshipTemplatesRepository
diff --git a/Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipsRepository.cs b/Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipsRepository.cs
index 1e816fa147..192734d6d1 100644
--- a/Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipsRepository.cs
+++ b/Modules/Relationships/src/Relationships.Application/Infrastructure/Persistence/Repository/IRelationshipsRepository.cs
@@ -1,9 +1,9 @@
-using Backbone.Modules.Relationships.Common;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Common;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
public interface IRelationshipsRepository
diff --git a/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipChangeCompletedIntegrationEvent.cs b/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipChangeCompletedIntegrationEvent.cs
index dc26fd8f15..14fa3d3d57 100644
--- a/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipChangeCompletedIntegrationEvent.cs
+++ b/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipChangeCompletedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Relationships.Domain.Entities;
namespace Backbone.Modules.Relationships.Application.IntegrationEvents;
diff --git a/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipChangeCreatedIntegrationEvent.cs b/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipChangeCreatedIntegrationEvent.cs
index 9e01c83586..931465a87e 100644
--- a/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipChangeCreatedIntegrationEvent.cs
+++ b/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipChangeCreatedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Relationships.Domain.Entities;
namespace Backbone.Modules.Relationships.Application.IntegrationEvents;
public class RelationshipChangeCreatedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipTemplateCreatedIntegrationEvent.cs b/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipTemplateCreatedIntegrationEvent.cs
index e4bce62e7f..0da061968b 100644
--- a/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipTemplateCreatedIntegrationEvent.cs
+++ b/Modules/Relationships/src/Relationships.Application/IntegrationEvents/RelationshipTemplateCreatedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Relationships.Domain.Entities;
namespace Backbone.Modules.Relationships.Application.IntegrationEvents;
public class RelationshipTemplateCreatedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateCommand.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateCommand.cs
index be43cfa14d..dfd092e771 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateCommand.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateCommand.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.BuildingBlocks.Application.Attributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.BuildingBlocks.Application.Attributes;
+using Backbone.Modules.Relationships.Domain.Entities;
using MediatR;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Commands.CreateRelationshipTemplate;
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateCommandValidator.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateCommandValidator.cs
index 4e26580180..30ffdfcb26 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateCommandValidator.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateCommandValidator.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Tooling;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Commands.CreateRelationshipTemplate;
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateResponse.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateResponse.cs
index 80ebc75b9c..9e506cbc0e 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateResponse.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/CreateRelationshipTemplateResponse.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Commands.CreateRelationshipTemplate;
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/Handler.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/Handler.cs
index 3fdc4d5adf..253b2ef020 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Commands/CreateRelationshipTemplate/Handler.cs
@@ -1,9 +1,9 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.IntegrationEvents;
using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Commands.CreateRelationshipTemplate;
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/GetRelationshipTemplate/Handler.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/GetRelationshipTemplate/Handler.cs
index a38bd04d7c..9c070d8dfd 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/GetRelationshipTemplate/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/GetRelationshipTemplate/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.GetRelationshipTemplate;
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/Handler.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/Handler.cs
index 89a33630ab..fd4531c7dc 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.ListRelationshipTemplates;
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesQuery.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesQuery.cs
index cfe15b6e48..16a8e6e6e8 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesQuery.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesQuery.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Relationships.Domain.Ids;
using MediatR;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.ListRelationshipTemplates;
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesResponse.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesResponse.cs
index eba2b4026d..3b5aec56a7 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesResponse.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Relationships.Application.Relationships.DTOs;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.ListRelationshipTemplates;
diff --git a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesValidator.cs b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesValidator.cs
index 974cd5447c..f3b5505f43 100644
--- a/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesValidator.cs
+++ b/Modules/Relationships/src/Relationships.Application/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.ListRelationshipTemplates;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/AcceptRelationshipChangeRequest/AcceptRelationshipChangeRequestCommandValidator.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/AcceptRelationshipChangeRequest/AcceptRelationshipChangeRequestCommandValidator.cs
index 0190ad9e05..c79878133b 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/AcceptRelationshipChangeRequest/AcceptRelationshipChangeRequestCommandValidator.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/AcceptRelationshipChangeRequest/AcceptRelationshipChangeRequestCommandValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.AcceptRelationshipChangeRequest;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/AcceptRelationshipChangeRequest/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/AcceptRelationshipChangeRequest/Handler.cs
index 084e36ba54..877edaf01e 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/AcceptRelationshipChangeRequest/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/AcceptRelationshipChangeRequest/Handler.cs
@@ -1,9 +1,9 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.IntegrationEvents;
using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.AcceptRelationshipChangeRequest;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/CreateRelationshipCommand.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/CreateRelationshipCommand.cs
index 1148916cc5..2a3f992e2e 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/CreateRelationshipCommand.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/CreateRelationshipCommand.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Attributes;
+using Backbone.BuildingBlocks.Application.Attributes;
+using Backbone.Modules.Relationships.Domain.Ids;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.CreateRelationship;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/CreateRelationshipRequestValidator.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/CreateRelationshipRequestValidator.cs
index 46d024c4ac..8688d24661 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/CreateRelationshipRequestValidator.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/CreateRelationshipRequestValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.CreateRelationship;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/Handler.cs
index 2c7aa66e33..5e7abb76ba 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/CreateRelationship/Handler.cs
@@ -1,10 +1,10 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.IntegrationEvents;
using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.CreateRelationship;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RejectRelationshipChangeRequest/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RejectRelationshipChangeRequest/Handler.cs
index 655df12ecd..e332b75c16 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RejectRelationshipChangeRequest/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RejectRelationshipChangeRequest/Handler.cs
@@ -1,9 +1,9 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.IntegrationEvents;
using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.RejectRelationshipChangeRequest;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RejectRelationshipChangeRequest/RejectRelationshipChangeRequestCommandValidator.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RejectRelationshipChangeRequest/RejectRelationshipChangeRequestCommandValidator.cs
index 0bdf57903b..475ef1bbef 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RejectRelationshipChangeRequest/RejectRelationshipChangeRequestCommandValidator.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RejectRelationshipChangeRequest/RejectRelationshipChangeRequestCommandValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.RejectRelationshipChangeRequest;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RevokeRelationshipChangeRequest/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RevokeRelationshipChangeRequest/Handler.cs
index cda200f487..69dd909044 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RevokeRelationshipChangeRequest/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RevokeRelationshipChangeRequest/Handler.cs
@@ -1,9 +1,9 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.IntegrationEvents;
using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.RevokeRelationshipChangeRequest;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RevokeRelationshipChangeRequest/RevokeRelationshipChangeRequestCommandValidator.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RevokeRelationshipChangeRequest/RevokeRelationshipChangeRequestCommandValidator.cs
index 52ed8ec65d..43e5216ee4 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RevokeRelationshipChangeRequest/RevokeRelationshipChangeRequestCommandValidator.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Commands/RevokeRelationshipChangeRequest/RevokeRelationshipChangeRequestCommandValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Relationships.Application.Relationships.Commands.RevokeRelationshipChangeRequest;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipChangeDTO.cs b/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipChangeDTO.cs
index 3286d83d60..fa3f1987c7 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipChangeDTO.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipChangeDTO.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Application.Relationships.DTOs;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipDTO.cs b/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipDTO.cs
index 0e993bfce3..223498ba6f 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipDTO.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipDTO.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Application.Relationships.DTOs;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipMetadataDTO.cs b/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipMetadataDTO.cs
index de42c9c748..8b2af13981 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipMetadataDTO.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipMetadataDTO.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Application.Relationships.DTOs;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipTemplateDTO.cs b/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipTemplateDTO.cs
index 0264b8c29d..74cfa1d9b9 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipTemplateDTO.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/DTOs/RelationshipTemplateDTO.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Application.Relationships.DTOs;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/GetChange/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/GetChange/Handler.cs
index b68ebef6b8..d3a1140631 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/GetChange/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/GetChange/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.GetChange;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/GetRelationship/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/GetRelationship/Handler.cs
index 7c0215f165..aaf2fdd843 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/GetRelationship/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/GetRelationship/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.GetRelationship;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/Handler.cs
index 45167138d4..e213704736 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.ListChanges;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesQuery.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesQuery.cs
index 97f0570863..b5dcba8863 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesQuery.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesQuery.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Common;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Common;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.ListChanges;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesQueryValidator.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesQueryValidator.cs
index 7f306a184d..3bbe123529 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesQueryValidator.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesQueryValidator.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Common;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Relationships.Common;
using Backbone.Modules.Relationships.Common.FluentValidation;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
using FluentValidation;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.ListChanges;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesResponse.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesResponse.cs
index 647e2c4cb2..b19eedfd72 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesResponse.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListChanges/ListChangesResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Relationships.Application.Relationships.DTOs;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.ListChanges;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/Handler.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/Handler.cs
index 87b5453319..b230942066 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/Handler.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/Handler.cs
@@ -1,7 +1,7 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.ListRelationships;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsQuery.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsQuery.cs
index 5c0b93c4eb..d510a7d547 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsQuery.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsQuery.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Relationships.Domain.Ids;
using MediatR;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.ListRelationships;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsResponse.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsResponse.cs
index 76f10b837b..040375ed36 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsResponse.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Relationships.Application.Relationships.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Relationships.Application.Relationships.DTOs;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.ListRelationships;
diff --git a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsValidator.cs b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsValidator.cs
index 882af24429..fc1961f41b 100644
--- a/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsValidator.cs
+++ b/Modules/Relationships/src/Relationships.Application/Relationships/Queries/ListRelationships/ListRelationshipsValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Relationships.Application.Relationships.Queries.ListRelationships;
diff --git a/Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipTemplatesController.cs b/Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipTemplatesController.cs
index 3896365626..23fd5dcc7b 100644
--- a/Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipTemplatesController.cs
+++ b/Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipTemplatesController.cs
@@ -1,20 +1,20 @@
-using Backbone.Modules.Relationships.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Relationships.Application;
using Backbone.Modules.Relationships.Application.Relationships.DTOs;
using Backbone.Modules.Relationships.Application.RelationshipTemplates.Commands.CreateRelationshipTemplate;
using Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.GetRelationshipTemplate;
using Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.ListRelationshipTemplates;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Relationships.ConsumerApi.Controllers;
diff --git a/Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipsController.cs b/Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipsController.cs
index 32291a4234..927dae985b 100644
--- a/Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipsController.cs
+++ b/Modules/Relationships/src/Relationships.ConsumerApi/Controllers/RelationshipsController.cs
@@ -1,4 +1,10 @@
-using Backbone.Modules.Relationships.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Application;
using Backbone.Modules.Relationships.Application.Relationships.Commands.AcceptRelationshipChangeRequest;
using Backbone.Modules.Relationships.Application.Relationships.Commands.CreateRelationship;
using Backbone.Modules.Relationships.Application.Relationships.Commands.RejectRelationshipChangeRequest;
@@ -11,18 +17,12 @@
using Backbone.Modules.Relationships.Common;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Relationships.ConsumerApi.Controllers;
diff --git a/Modules/Relationships/src/Relationships.ConsumerApi/RelationshipsModule.cs b/Modules/Relationships/src/Relationships.ConsumerApi/RelationshipsModule.cs
index 4120dc16af..875a642f4e 100644
--- a/Modules/Relationships/src/Relationships.ConsumerApi/RelationshipsModule.cs
+++ b/Modules/Relationships/src/Relationships.ConsumerApi/RelationshipsModule.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Relationships.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Relationships.Application;
using Backbone.Modules.Relationships.Application.Extensions;
using Backbone.Modules.Relationships.Infrastructure.Persistence;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/Modules/Relationships/src/Relationships.Domain/Entities/Relationship.cs b/Modules/Relationships/src/Relationships.Domain/Entities/Relationship.cs
index 18a06a3938..859c05a00b 100644
--- a/Modules/Relationships/src/Relationships.Domain/Entities/Relationship.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Entities/Relationship.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Domain.Errors;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Errors;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
namespace Backbone.Modules.Relationships.Domain.Entities;
diff --git a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipChange.cs b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipChange.cs
index 3335ccf3a5..ef5ef418cb 100644
--- a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipChange.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipChange.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Domain.Errors;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Errors;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
namespace Backbone.Modules.Relationships.Domain.Entities;
diff --git a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipChangeLog.cs b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipChangeLog.cs
index 8375e29866..4a92db77cd 100644
--- a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipChangeLog.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipChangeLog.cs
@@ -1,7 +1,7 @@
using System.Collections;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
namespace Backbone.Modules.Relationships.Domain.Entities;
diff --git a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipCreationChange.cs b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipCreationChange.cs
index cc3d01b60e..6d5206eb62 100644
--- a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipCreationChange.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipCreationChange.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Domain.Errors;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Errors;
namespace Backbone.Modules.Relationships.Domain.Entities;
diff --git a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTemplate.cs b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTemplate.cs
index 602e3fa02d..352cbcedbd 100644
--- a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTemplate.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTemplate.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Domain.Errors;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Errors;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
namespace Backbone.Modules.Relationships.Domain.Entities;
diff --git a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTemplateAllocation.cs b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTemplateAllocation.cs
index bea0d00770..b4cff981e4 100644
--- a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTemplateAllocation.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTemplateAllocation.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Ids;
+using Backbone.Tooling;
namespace Backbone.Modules.Relationships.Domain.Entities;
diff --git a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTerminationChange.cs b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTerminationChange.cs
index 0f82a5f8f9..ee4ac1e487 100644
--- a/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTerminationChange.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Entities/RelationshipTerminationChange.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Domain.Entities;
diff --git a/Modules/Relationships/src/Relationships.Domain/Errors/DomainErrors.cs b/Modules/Relationships/src/Relationships.Domain/Errors/DomainErrors.cs
index 80f63323e0..797eddee83 100644
--- a/Modules/Relationships/src/Relationships.Domain/Errors/DomainErrors.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Errors/DomainErrors.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Domain.Errors;
namespace Backbone.Modules.Relationships.Domain.Errors;
diff --git a/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipChangeId.cs b/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipChangeId.cs
index 9460c0f059..df1c959e41 100644
--- a/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipChangeId.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipChangeId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Relationships.Domain.Ids;
diff --git a/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipId.cs b/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipId.cs
index b59432f3f4..f299d89c4c 100644
--- a/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipId.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Relationships.Domain.Ids;
diff --git a/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipTemplateId.cs b/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipTemplateId.cs
index b7193d0983..bd336a3064 100644
--- a/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipTemplateId.cs
+++ b/Modules/Relationships/src/Relationships.Domain/Ids/RelationshipTemplateId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Relationships.Domain.Ids;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeEntityType.cs
index c9835c4dcd..8e3d538fe6 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.ValueGeneration;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeRequestEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeRequestEntityType.cs
index cd19814667..bf03482a6a 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeRequestEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeRequestEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeResponseEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeResponseEntityType.cs
index 4cb7881716..0174e07021 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeResponseEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipChangeResponseEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
index 3ddf1b8669..ef9d8f6461 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipEntityType.cs
@@ -2,11 +2,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipTemplateAllocationEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipTemplateAllocationEntityType.cs
index 4a1b1c00fe..637700bce6 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipTemplateAllocationEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipTemplateAllocationEntityType.cs
@@ -2,11 +2,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipTemplateEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipTemplateEntityType.cs
index ae5ff4b734..fd497fb192 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipTemplateEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/Postgres/RelationshipTemplateEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeEntityType.cs
index 9603070e8d..b38a92733a 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.ValueGeneration;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeRequestEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeRequestEntityType.cs
index 27507c53b4..5b4c56add6 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeRequestEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeRequestEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeResponseEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeResponseEntityType.cs
index 453501f146..5cdcd23ec9 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeResponseEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipChangeResponseEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
index ee53941570..8e7aa47529 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipEntityType.cs
@@ -2,11 +2,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateAllocationEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateAllocationEntityType.cs
index a84d671bba..9ca61781c4 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateAllocationEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateAllocationEntityType.cs
@@ -2,11 +2,11 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateEntityType.cs b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateEntityType.cs
index 3a5da20ad8..92589c5551 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateEntityType.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/CompiledModels/SqlServer/RelationshipTemplateEntityType.cs
@@ -1,11 +1,11 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipChangeQueryableExtensions.cs b/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipChangeQueryableExtensions.cs
index 9499378f2e..963b26dad3 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipChangeQueryableExtensions.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipChangeQueryableExtensions.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Relationships.Common;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Common;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Infrastructure.Extensions;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipQueryableExtensions.cs b/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipQueryableExtensions.cs
index 0606bf2ee3..0bd903b5df 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipQueryableExtensions.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipQueryableExtensions.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Common;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Common;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Relationships.Infrastructure.Extensions;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipTemplateQueryableExtensions.cs b/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipTemplateQueryableExtensions.cs
index eae00fc41b..ab44367a43 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipTemplateQueryableExtensions.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/Extensions/RelationshipTemplateQueryableExtensions.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Relationships.Infrastructure.Extensions;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/RelationshipsDbContext.cs b/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/RelationshipsDbContext.cs
index 6f98ba2707..2d40e1a255 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/RelationshipsDbContext.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/RelationshipsDbContext.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Relationships.Infrastructure.Persistence.Database;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipTemplatesRepository.cs b/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipTemplatesRepository.cs
index 8b3fd48b35..ecc80baa26 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipTemplatesRepository.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipTemplatesRepository.cs
@@ -1,13 +1,13 @@
-using Backbone.Modules.Relationships.Application.Infrastructure;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Application.Infrastructure;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipsRepository.cs b/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipsRepository.cs
index a7f0ec5ada..82a5ca63bf 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipsRepository.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/Persistence/Database/Repository/RelationshipsRepository.cs
@@ -1,16 +1,16 @@
-using Backbone.Modules.Relationships.Application;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Application;
using Backbone.Modules.Relationships.Application.Infrastructure;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Common;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
diff --git a/Modules/Relationships/src/Relationships.Infrastructure/Persistence/IServiceCollectionExtensions.cs b/Modules/Relationships/src/Relationships.Infrastructure/Persistence/IServiceCollectionExtensions.cs
index 3b79642f8b..03e692b17f 100644
--- a/Modules/Relationships/src/Relationships.Infrastructure/Persistence/IServiceCollectionExtensions.cs
+++ b/Modules/Relationships/src/Relationships.Infrastructure/Persistence/IServiceCollectionExtensions.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Application.Infrastructure;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Relationships.Application.Infrastructure;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database.Repository;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
using Microsoft.Extensions.DependencyInjection;
namespace Backbone.Modules.Relationships.Infrastructure.Persistence;
diff --git a/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipChange/Infrastructure/DataSource/DataSource.cs b/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipChange/Infrastructure/DataSource/DataSource.cs
index 3e6eae4366..3710c7c356 100644
--- a/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipChange/Infrastructure/DataSource/DataSource.cs
+++ b/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipChange/Infrastructure/DataSource/DataSource.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Relationships.Application.Infrastructure;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Relationships.Application.Infrastructure;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipChange/Program.cs b/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipChange/Program.cs
index bd87a8854f..6be501597a 100644
--- a/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipChange/Program.cs
+++ b/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipChange/Program.cs
@@ -3,7 +3,7 @@
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipChange.Extensions;
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipChange.Infrastructure.DataSource;
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipChange.Infrastructure.Reporter;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipChange;
public class Program
diff --git a/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipTemplate/Infrastructure/DataSource/DataSource.cs b/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipTemplate/Infrastructure/DataSource/DataSource.cs
index b85ad35a9d..4df9ec29e3 100644
--- a/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipTemplate/Infrastructure/DataSource/DataSource.cs
+++ b/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipTemplate/Infrastructure/DataSource/DataSource.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Relationships.Application.Infrastructure;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Relationships.Application.Infrastructure;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipTemplate/Program.cs b/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipTemplate/Program.cs
index 94b7fb948c..ded4322abc 100644
--- a/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipTemplate/Program.cs
+++ b/Modules/Relationships/src/Relationships.Jobs.SanityCheck.RelationshipTemplate/Program.cs
@@ -3,7 +3,7 @@
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipTemplate.Extensions;
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipTemplate.Infrastructure.DataSource;
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipTemplate.Infrastructure.Reporter;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipTemplate;
diff --git a/Modules/Relationships/test/Relationships.Application.Tests/Extensions/RelationshipTemplateQueryableExtensionsTests.cs b/Modules/Relationships/test/Relationships.Application.Tests/Extensions/RelationshipTemplateQueryableExtensionsTests.cs
index f9cb5334e5..4ded9d5e14 100644
--- a/Modules/Relationships/test/Relationships.Application.Tests/Extensions/RelationshipTemplateQueryableExtensionsTests.cs
+++ b/Modules/Relationships/test/Relationships.Application.Tests/Extensions/RelationshipTemplateQueryableExtensionsTests.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Relationships.Domain.Entities;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Infrastructure.Extensions;
using Backbone.Modules.Relationships.Infrastructure.Persistence.Database;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.UnitTestTools.TestDoubles.Fakes;
+using Backbone.UnitTestTools.TestDoubles.Fakes;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Relationships/test/Relationships.Application.Tests/TestDataGenerator.cs b/Modules/Relationships/test/Relationships.Application.Tests/TestDataGenerator.cs
index 411edd711d..de94afd10a 100644
--- a/Modules/Relationships/test/Relationships.Application.Tests/TestDataGenerator.cs
+++ b/Modules/Relationships/test/Relationships.Application.Tests/TestDataGenerator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Relationships.Application.Tests;
diff --git a/Modules/Relationships/test/Relationships.Application.Tests/Tests/RelationshipTemplates/Commands/CreateRelationshipTemplate/HandlerTests.cs b/Modules/Relationships/test/Relationships.Application.Tests/Tests/RelationshipTemplates/Commands/CreateRelationshipTemplate/HandlerTests.cs
index 9272e5b0d1..3ac43f56de 100644
--- a/Modules/Relationships/test/Relationships.Application.Tests/Tests/RelationshipTemplates/Commands/CreateRelationshipTemplate/HandlerTests.cs
+++ b/Modules/Relationships/test/Relationships.Application.Tests/Tests/RelationshipTemplates/Commands/CreateRelationshipTemplate/HandlerTests.cs
@@ -1,11 +1,11 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Relationships.Application.IntegrationEvents;
using Backbone.Modules.Relationships.Application.RelationshipTemplates.Commands.CreateRelationshipTemplate;
using Backbone.Modules.Relationships.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using FakeItEasy;
using FluentAssertions.Execution;
using Xunit;
diff --git a/Modules/Relationships/test/Relationships.Application.Tests/Tests/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesValidatorTests.cs b/Modules/Relationships/test/Relationships.Application.Tests/Tests/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesValidatorTests.cs
index ce5fc9aedb..ecb2593f61 100644
--- a/Modules/Relationships/test/Relationships.Application.Tests/Tests/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesValidatorTests.cs
+++ b/Modules/Relationships/test/Relationships.Application.Tests/Tests/RelationshipTemplates/Queries/ListRelationshipTemplates/ListRelationshipTemplatesValidatorTests.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.ListRelationshipTemplates;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Relationships.Application.RelationshipTemplates.Queries.ListRelationshipTemplates;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using FluentAssertions;
using FluentValidation.TestHelper;
using Xunit;
diff --git a/Modules/Relationships/test/Relationships.Application.Tests/Tests/Relationships/Queries/ListRelationshipsValidatorTests.cs b/Modules/Relationships/test/Relationships.Application.Tests/Tests/Relationships/Queries/ListRelationshipsValidatorTests.cs
index bd2c7e5d9b..90eba23f3d 100644
--- a/Modules/Relationships/test/Relationships.Application.Tests/Tests/Relationships/Queries/ListRelationshipsValidatorTests.cs
+++ b/Modules/Relationships/test/Relationships.Application.Tests/Tests/Relationships/Queries/ListRelationshipsValidatorTests.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Relationships.Application.Relationships.Queries.ListRelationships;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Relationships.Application.Relationships.Queries.ListRelationships;
using Backbone.Modules.Relationships.Domain.Ids;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using FluentAssertions;
using FluentValidation.TestHelper;
using Xunit;
diff --git a/Modules/Relationships/test/Relationships.Domain.Tests/Extensions/ExceptionAssertionsExtensions.cs b/Modules/Relationships/test/Relationships.Domain.Tests/Extensions/ExceptionAssertionsExtensions.cs
index 971b32c367..7cdd503209 100644
--- a/Modules/Relationships/test/Relationships.Domain.Tests/Extensions/ExceptionAssertionsExtensions.cs
+++ b/Modules/Relationships/test/Relationships.Domain.Tests/Extensions/ExceptionAssertionsExtensions.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
using FluentAssertions;
using FluentAssertions.Specialized;
diff --git a/Modules/Relationships/test/Relationships.Domain.Tests/Tests/RelationshipTests.cs b/Modules/Relationships/test/Relationships.Domain.Tests/Tests/RelationshipTests.cs
index d996347cfd..580ba6fe3a 100644
--- a/Modules/Relationships/test/Relationships.Domain.Tests/Tests/RelationshipTests.cs
+++ b/Modules/Relationships/test/Relationships.Domain.Tests/Tests/RelationshipTests.cs
@@ -1,11 +1,11 @@
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.Errors;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Relationships.Domain.Entities;
using Backbone.Modules.Relationships.Domain.Errors;
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Domain.Tests.Extensions;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.Errors;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSourceRelationshipChange.cs b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSourceRelationshipChange.cs
index 47c546d8ea..59c859087c 100644
--- a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSourceRelationshipChange.cs
+++ b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSourceRelationshipChange.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipChange.Infrastructure.DataSource;
-namespace Relationships.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+namespace Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
public class FakeDataSourceRelationshipChange : IDataSource
{
diff --git a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSourceRelationshipTemplate.cs b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSourceRelationshipTemplate.cs
index 000e6b69b1..20420f9f61 100644
--- a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSourceRelationshipTemplate.cs
+++ b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSourceRelationshipTemplate.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipTemplate.Infrastructure.DataSource;
-namespace Relationships.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+namespace Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
public class FakeDataSourceRelationshipTemplate : IDataSource
{
diff --git a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporterRelationshipChange.cs b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporterRelationshipChange.cs
index 178162f7e3..ae77ba3f09 100644
--- a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporterRelationshipChange.cs
+++ b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporterRelationshipChange.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipChange.Infrastructure.Reporter;
-namespace Relationships.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
+namespace Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
public class TestReporterRelationshipChange : IReporter
{
diff --git a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporterRelationshipTemplate.cs b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporterRelationshipTemplate.cs
index 17e01515c6..f5c44dc6d3 100644
--- a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporterRelationshipTemplate.cs
+++ b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporterRelationshipTemplate.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Relationships.Domain.Ids;
using Backbone.Modules.Relationships.Jobs.SanityCheck.RelationshipTemplate.Infrastructure.Reporter;
-namespace Relationships.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
+namespace Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
public class TestReporterRelationshipTemplate : IReporter
{
diff --git a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Tests/SanityCheckTestsRelationshipChange.cs b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Tests/SanityCheckTestsRelationshipChange.cs
index d62c294753..c168e4b83f 100644
--- a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Tests/SanityCheckTestsRelationshipChange.cs
+++ b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Tests/SanityCheckTestsRelationshipChange.cs
@@ -1,10 +1,10 @@
using Backbone.Modules.Relationships.Domain.Ids;
+using Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+using Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using FluentAssertions;
-using Relationships.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
-using Relationships.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using Xunit;
-namespace Relationships.Jobs.SanityCheck.Tests.Tests;
+namespace Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Tests;
public class SanityCheckTestsRelationshipChange
{
diff --git a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Tests/SanityCheckTestsRelationshipTemplate.cs b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Tests/SanityCheckTestsRelationshipTemplate.cs
index 75f656c133..0e0ce3e2db 100644
--- a/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Tests/SanityCheckTestsRelationshipTemplate.cs
+++ b/Modules/Relationships/test/Relationships.Jobs.SanityCheck.Tests/Tests/SanityCheckTestsRelationshipTemplate.cs
@@ -1,10 +1,10 @@
using Backbone.Modules.Relationships.Domain.Ids;
+using Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+using Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using FluentAssertions;
-using Relationships.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
-using Relationships.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using Xunit;
-namespace Relationships.Jobs.SanityCheck.Tests.Tests;
+namespace Backbone.Modules.Relationships.Jobs.SanityCheck.Tests.Tests;
public class SanityCheckTestsRelationshipTemplate
{
diff --git a/Modules/Synchronization/src/Synchronization.Application/ApplicationErrors.cs b/Modules/Synchronization/src/Synchronization.Application/ApplicationErrors.cs
index 298c784d51..8cbe851d7c 100644
--- a/Modules/Synchronization/src/Synchronization.Application/ApplicationErrors.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/ApplicationErrors.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.Modules.Synchronization.Domain.Entities.Sync;
namespace Backbone.Modules.Synchronization.Application;
diff --git a/Modules/Synchronization/src/Synchronization.Application/AutoMapper/AutoMapperProfile.cs b/Modules/Synchronization/src/Synchronization.Application/AutoMapper/AutoMapperProfile.cs
index d8667ba04b..8e55036c21 100644
--- a/Modules/Synchronization/src/Synchronization.Application/AutoMapper/AutoMapperProfile.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/AutoMapper/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
using System.Reflection;
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.AutoMapper;
namespace Backbone.Modules.Synchronization.Application.AutoMapper;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/Handler.cs
index cfc6dd7a99..0d960254cf 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/Handler.cs
@@ -1,15 +1,15 @@
using System.Text.Json;
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/PushDatawalletModificationsCommandValidator.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/PushDatawalletModificationsCommandValidator.cs
index 698ad6adec..d4eaa92dad 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/PushDatawalletModificationsCommandValidator.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/PushDatawalletModificationsCommandValidator.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using FluentValidation;
namespace Backbone.Modules.Synchronization.Application.Datawallets.Commands.PushDatawalletModifications;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/PushDatawalletModificationsResponse.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/PushDatawalletModificationsResponse.cs
index 65083939cb..c50ce62bfd 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/PushDatawalletModificationsResponse.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Commands/PushDatawalletModifications/PushDatawalletModificationsResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.Modules.Synchronization.Domain.Entities;
namespace Backbone.Modules.Synchronization.Application.Datawallets.Commands.PushDatawalletModifications;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/CreatedDatawalletModificationDTO.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/CreatedDatawalletModificationDTO.cs
index 121d274ca2..ab4e64ee6c 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/CreatedDatawalletModificationDTO.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/CreatedDatawalletModificationDTO.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.Modules.Synchronization.Domain.Entities;
namespace Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/DatawalletDTO.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/DatawalletDTO.cs
index 3523148e4d..920a7997e6 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/DatawalletDTO.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/DatawalletDTO.cs
@@ -1,6 +1,6 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
namespace Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/DatawalletModificationDTO.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/DatawalletModificationDTO.cs
index da588ec970..97019b75ce 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/DatawalletModificationDTO.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/DatawalletModificationDTO.cs
@@ -1,8 +1,8 @@
using AutoMapper;
using AutoMapper.Extensions.EnumMapping;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/PushDatawalletModificationItem.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/PushDatawalletModificationItem.cs
index fa3f38f5a1..c09525c7cf 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/PushDatawalletModificationItem.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/DTOs/PushDatawalletModificationItem.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
using FluentValidation;
namespace Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetDatawallet/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetDatawallet/Handler.cs
index 1ff1a1679c..9abb688b92 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetDatawallet/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetDatawallet/Handler.cs
@@ -1,10 +1,10 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Synchronization.Application.Datawallets.Queries.GetDatawallet;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/GetModificationsQuery.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/GetModificationsQuery.cs
index 5609464361..f15aac4352 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/GetModificationsQuery.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/GetModificationsQuery.cs
@@ -1,5 +1,5 @@
using System.Text.Json.Serialization;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
using MediatR;
namespace Backbone.Modules.Synchronization.Application.Datawallets.Queries.GetModifications;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/GetModificationsResponse.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/GetModificationsResponse.cs
index a40c818d7c..243e7a8aee 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/GetModificationsResponse.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/GetModificationsResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
namespace Backbone.Modules.Synchronization.Application.Datawallets.Queries.GetModifications;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/Handler.cs
index bc4bab7dd5..ee1ea27ec7 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Datawallets/Queries/GetModifications/Handler.cs
@@ -1,13 +1,13 @@
using System.Text.Json;
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using MediatR;
using Microsoft.Extensions.Options;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Extensions/DatawalletModificationsQueryableExtensions.cs b/Modules/Synchronization/src/Synchronization.Application/Extensions/DatawalletModificationsQueryableExtensions.cs
index bea41b2c78..1958874aa8 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Extensions/DatawalletModificationsQueryableExtensions.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Extensions/DatawalletModificationsQueryableExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Domain.Entities;
namespace Backbone.Modules.Synchronization.Application.Extensions;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Extensions/DatawalletQueryableExtensions.cs b/Modules/Synchronization/src/Synchronization.Application/Extensions/DatawalletQueryableExtensions.cs
index 419d04ac27..0bf13bebef 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Extensions/DatawalletQueryableExtensions.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Extensions/DatawalletQueryableExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Domain.Entities;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Synchronization.Application.Extensions;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Extensions/ExternalEventsQueryableExtensions.cs b/Modules/Synchronization/src/Synchronization.Application/Extensions/ExternalEventsQueryableExtensions.cs
index 0ecef1498f..9cbaaf7630 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Extensions/ExternalEventsQueryableExtensions.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Extensions/ExternalEventsQueryableExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Domain.Entities.Sync;
namespace Backbone.Modules.Synchronization.Application.Extensions;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Extensions/IEventBusExtensions.cs b/Modules/Synchronization/src/Synchronization.Application/Extensions/IEventBusExtensions.cs
index a83554efa6..b8e5d892b5 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Extensions/IEventBusExtensions.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Extensions/IEventBusExtensions.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.MessageCreated;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.MessageCreated;
using Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.RelationshipChangeCompleted;
using Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.RelationshipChangeCreated;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
namespace Backbone.Modules.Synchronization.Application.Extensions;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Extensions/IServiceCollectionExtensions.cs b/Modules/Synchronization/src/Synchronization.Application/Extensions/IServiceCollectionExtensions.cs
index e04129021f..2b0f6b134d 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Extensions/IServiceCollectionExtensions.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Extensions/IServiceCollectionExtensions.cs
@@ -1,13 +1,13 @@
using System.Reflection;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.MediatR;
using Backbone.Modules.Synchronization.Application.AutoMapper;
using Backbone.Modules.Synchronization.Application.Datawallets.Commands.PushDatawalletModifications;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.MediatR;
using FluentValidation;
using MediatR;
using Microsoft.Extensions.DependencyInjection;
-using ValidationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ValidationException;
+using ValidationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ValidationException;
namespace Backbone.Modules.Synchronization.Application.Extensions;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Extensions/SyncRunsQueryableExtensions.cs b/Modules/Synchronization/src/Synchronization.Application/Extensions/SyncRunsQueryableExtensions.cs
index 929b1be7ed..58f868c25b 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Extensions/SyncRunsQueryableExtensions.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Extensions/SyncRunsQueryableExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Domain.Entities.Sync;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Synchronization.Application.Extensions;
diff --git a/Modules/Synchronization/src/Synchronization.Application/Infrastructure/ISynchronizationDbContext.cs b/Modules/Synchronization/src/Synchronization.Application/Infrastructure/ISynchronizationDbContext.cs
index 40758f3480..4c957fd6a1 100644
--- a/Modules/Synchronization/src/Synchronization.Application/Infrastructure/ISynchronizationDbContext.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/Infrastructure/ISynchronizationDbContext.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Synchronization.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Synchronization.Application.Infrastructure;
diff --git a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEvent.cs b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEvent.cs
index 18f950c033..d6f3932b0c 100644
--- a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEvent.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.MessageCreated;
diff --git a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEventHandler.cs b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEventHandler.cs
index 2c42a247cb..e885e047d5 100644
--- a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEventHandler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/MessageCreated/MessageCreatedIntegrationEventHandler.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Synchronization.Application.Infrastructure;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.MessageCreated;
diff --git a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEvent.cs b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEvent.cs
index 362c5b16ea..2abd796da8 100644
--- a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEvent.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.RelationshipChangeCompleted;
diff --git a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEventHandler.cs b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEventHandler.cs
index ba4ad29737..6e88a4a741 100644
--- a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEventHandler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCompleted/RelationshipChangeCompletedIntegrationEventHandler.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Synchronization.Application.Infrastructure;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.RelationshipChangeCompleted;
diff --git a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEvent.cs b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEvent.cs
index 4d3c69c7dd..3f1d4eb710 100644
--- a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEvent.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEvent.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
namespace Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.RelationshipChangeCreated;
diff --git a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEventHandler.cs b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEventHandler.cs
index 22b9c9c33a..fd6a1b1839 100644
--- a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEventHandler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Incoming/RelationshipChangeCreated/RelationshipChangeCreatedIntegrationEventHandler.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Synchronization.Application.Infrastructure;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
using Microsoft.Extensions.Logging;
namespace Backbone.Modules.Synchronization.Application.IntegrationEvents.Incoming.RelationshipChangeCreated;
diff --git a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Outgoing/DatawalletModifiedIntegrationEvent.cs b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Outgoing/DatawalletModifiedIntegrationEvent.cs
index 27b0ea3f40..1499eda8db 100644
--- a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Outgoing/DatawalletModifiedIntegrationEvent.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Outgoing/DatawalletModifiedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Synchronization.Application.IntegrationEvents.Outgoing;
diff --git a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Outgoing/ExternalEventCreatedIntegrationEvent.cs b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Outgoing/ExternalEventCreatedIntegrationEvent.cs
index 846c9f91ae..fabf95c6fe 100644
--- a/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Outgoing/ExternalEventCreatedIntegrationEvent.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/IntegrationEvents/Outgoing/ExternalEventCreatedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Synchronization.Domain.Entities.Sync;
namespace Backbone.Modules.Synchronization.Application.IntegrationEvents.Outgoing;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeDatawalletVersionUpgradeSyncRunCommandValidator.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeDatawalletVersionUpgradeSyncRunCommandValidator.cs
index 1c47ac9752..53359f6b72 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeDatawalletVersionUpgradeSyncRunCommandValidator.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeDatawalletVersionUpgradeSyncRunCommandValidator.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using FluentValidation;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Commands.FinalizeSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeExternalEventSyncSyncRunCommand.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeExternalEventSyncSyncRunCommand.cs
index 254f118907..942e7ab9de 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeExternalEventSyncSyncRunCommand.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeExternalEventSyncSyncRunCommand.cs
@@ -1,7 +1,7 @@
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
using MediatR;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Commands.FinalizeSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeExternalEventSyncSyncRunCommandValidator.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeExternalEventSyncSyncRunCommandValidator.cs
index 02c63adb85..d625a04b91 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeExternalEventSyncSyncRunCommandValidator.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/FinalizeExternalEventSyncSyncRunCommandValidator.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using FluentValidation;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Commands.FinalizeSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/Handler.cs
index 8017470ec2..27d32c0867 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/FinalizeSyncRun/Handler.cs
@@ -1,18 +1,18 @@
using System.Text.Json;
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.IntegrationEvents.Outgoing;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Commands.FinalizeSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/RefreshExpirationTimeOfSyncRun/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/RefreshExpirationTimeOfSyncRun/Handler.cs
index 270f1f440f..2eaea83105 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/RefreshExpirationTimeOfSyncRun/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/RefreshExpirationTimeOfSyncRun/Handler.cs
@@ -1,8 +1,8 @@
-using Backbone.Modules.Synchronization.Application.Infrastructure;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Commands.RefreshExpirationTimeOfSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/StartSyncRun/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/StartSyncRun/Handler.cs
index 6e3ebc76c0..956d8414e5 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/StartSyncRun/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/StartSyncRun/Handler.cs
@@ -1,12 +1,12 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.SyncRuns.DTOs;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
using Microsoft.EntityFrameworkCore;
using static Backbone.Modules.Synchronization.Domain.Entities.Datawallet;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/StartSyncRun/StartSyncRunCommandValidator.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/StartSyncRun/StartSyncRunCommandValidator.cs
index facba11b27..8df4fe9fba 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/StartSyncRun/StartSyncRunCommandValidator.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Commands/StartSyncRun/StartSyncRunCommandValidator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
using FluentValidation;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Commands.StartSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/DTOs/ExternalEventDTO.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/DTOs/ExternalEventDTO.cs
index 35f7ddf624..ca43cefc90 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/DTOs/ExternalEventDTO.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/DTOs/ExternalEventDTO.cs
@@ -1,6 +1,6 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.DTOs;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/DTOs/SyncRunDTO.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/DTOs/SyncRunDTO.cs
index 0bd0d6014a..3cbc303e77 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/DTOs/SyncRunDTO.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/DTOs/SyncRunDTO.cs
@@ -1,8 +1,8 @@
using AutoMapper;
using AutoMapper.Extensions.EnumMapping;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.DTOs;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/GetExternalEventsOfSyncRunQuery.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/GetExternalEventsOfSyncRunQuery.cs
index 5864a69b68..ac94d567d6 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/GetExternalEventsOfSyncRunQuery.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/GetExternalEventsOfSyncRunQuery.cs
@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
+using Backbone.BuildingBlocks.Application.Pagination;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Queries.GetExternalEventsOfSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/GetExternalEventsOfSyncRunResponse.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/GetExternalEventsOfSyncRunResponse.cs
index 3c64cb6bd3..dda7815cad 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/GetExternalEventsOfSyncRunResponse.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/GetExternalEventsOfSyncRunResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Application.SyncRuns.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Synchronization.Application.SyncRuns.DTOs;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Queries.GetExternalEventsOfSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/Handler.cs
index a6b797e86c..5b040820b7 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetExternalEventsOfSyncRun/Handler.cs
@@ -1,9 +1,9 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.SyncRuns.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Queries.GetExternalEventsOfSyncRun;
diff --git a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetSyncRunById/Handler.cs b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetSyncRunById/Handler.cs
index 1805d4bda9..6ef4e5e0c1 100644
--- a/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetSyncRunById/Handler.cs
+++ b/Modules/Synchronization/src/Synchronization.Application/SyncRuns/Queries/GetSyncRunById/Handler.cs
@@ -1,8 +1,8 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.SyncRuns.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Synchronization.Application.SyncRuns.Queries.GetSyncRunById;
diff --git a/Modules/Synchronization/src/Synchronization.ConsumerApi/Controllers/DatawalletController.cs b/Modules/Synchronization/src/Synchronization.ConsumerApi/Controllers/DatawalletController.cs
index 52a7a8058c..987e13557c 100644
--- a/Modules/Synchronization/src/Synchronization.ConsumerApi/Controllers/DatawalletController.cs
+++ b/Modules/Synchronization/src/Synchronization.ConsumerApi/Controllers/DatawalletController.cs
@@ -1,19 +1,19 @@
-using Backbone.Modules.Synchronization.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Synchronization.Application;
using Backbone.Modules.Synchronization.Application.Datawallets.Commands.PushDatawalletModifications;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Application.Datawallets.Queries.GetDatawallet;
using Backbone.Modules.Synchronization.Application.Datawallets.Queries.GetModifications;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Synchronization.ConsumerApi.Controllers;
diff --git a/Modules/Synchronization/src/Synchronization.ConsumerApi/Controllers/SyncRunsController.cs b/Modules/Synchronization/src/Synchronization.ConsumerApi/Controllers/SyncRunsController.cs
index 6c1ec2db6f..5745b8f21d 100644
--- a/Modules/Synchronization/src/Synchronization.ConsumerApi/Controllers/SyncRunsController.cs
+++ b/Modules/Synchronization/src/Synchronization.ConsumerApi/Controllers/SyncRunsController.cs
@@ -1,4 +1,9 @@
-using Backbone.Modules.Synchronization.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Synchronization.Application;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Application.SyncRuns.Commands.FinalizeSyncRun;
using Backbone.Modules.Synchronization.Application.SyncRuns.Commands.RefreshExpirationTimeOfSyncRun;
@@ -7,17 +12,12 @@
using Backbone.Modules.Synchronization.Application.SyncRuns.Queries.GetExternalEventsOfSyncRun;
using Backbone.Modules.Synchronization.Application.SyncRuns.Queries.GetSyncRunById;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Synchronization.ConsumerApi.Controllers;
diff --git a/Modules/Synchronization/src/Synchronization.ConsumerApi/SynchronizationModule.cs b/Modules/Synchronization/src/Synchronization.ConsumerApi/SynchronizationModule.cs
index 47d8e85088..588ed88ac3 100644
--- a/Modules/Synchronization/src/Synchronization.ConsumerApi/SynchronizationModule.cs
+++ b/Modules/Synchronization/src/Synchronization.ConsumerApi/SynchronizationModule.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Synchronization.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Synchronization.Application;
using Backbone.Modules.Synchronization.Application.Extensions;
using Backbone.Modules.Synchronization.Infrastructure.Persistence;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/DomainErrors.cs b/Modules/Synchronization/src/Synchronization.Domain/DomainErrors.cs
index d0915aba0d..67cd1ce896 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/DomainErrors.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/DomainErrors.cs
@@ -1,4 +1,4 @@
-using Enmeshed.BuildingBlocks.Domain.Errors;
+using Backbone.BuildingBlocks.Domain.Errors;
namespace Backbone.Modules.Synchronization.Domain;
public static class DomainErrors
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/Datawallet.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/Datawallet.cs
index 9e87e83864..bea43812e5 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/Datawallet.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/Datawallet.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Synchronization.Domain.Entities;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletId.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletId.cs
index 18aedd8394..d9628311e8 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletId.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Synchronization.Domain.Entities;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletModification.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletModification.cs
index b9692e9e48..18cdd9530a 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletModification.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletModification.cs
@@ -1,5 +1,5 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling;
namespace Backbone.Modules.Synchronization.Domain.Entities;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletModificationId.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletModificationId.cs
index 107f9dec68..02fe2247e6 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletModificationId.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/DatawalletModificationId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Synchronization.Domain.Entities;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/ExternalEvent.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/ExternalEvent.cs
index 94c73e283e..f2fb26fbb0 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/ExternalEvent.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/ExternalEvent.cs
@@ -1,5 +1,5 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling;
namespace Backbone.Modules.Synchronization.Domain.Entities.Sync;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/ExternalEventId.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/ExternalEventId.cs
index 4ee5511132..122639b93f 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/ExternalEventId.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/ExternalEventId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Synchronization.Domain.Entities.Sync;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncErrorId.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncErrorId.cs
index d4b217e222..0343ed66a5 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncErrorId.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncErrorId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Synchronization.Domain.Entities.Sync;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncRun.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncRun.cs
index eb727e31c6..25a143694a 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncRun.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncRun.cs
@@ -1,5 +1,5 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling;
namespace Backbone.Modules.Synchronization.Domain.Entities.Sync;
diff --git a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncRunId.cs b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncRunId.cs
index 95d3f84e0e..e472a9a09a 100644
--- a/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncRunId.cs
+++ b/Modules/Synchronization/src/Synchronization.Domain/Entities/Sync/SyncRunId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Synchronization.Domain.Entities.Sync;
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/DatawalletEntityType.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/DatawalletEntityType.cs
index c61b86c84a..c1812d01b5 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/DatawalletEntityType.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/DatawalletEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/DatawalletModificationEntityType.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/DatawalletModificationEntityType.cs
index 98cc81452f..131ecda0a1 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/DatawalletModificationEntityType.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/DatawalletModificationEntityType.cs
@@ -2,10 +2,10 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/ExternalEventEntityType.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/ExternalEventEntityType.cs
index c8132f6744..0edd19f5b9 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/ExternalEventEntityType.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/ExternalEventEntityType.cs
@@ -2,10 +2,10 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/SyncRunEntityType.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/SyncRunEntityType.cs
index 5b0208b8d4..b98178e586 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/SyncRunEntityType.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/Postgres/SyncRunEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/DatawalletEntityType.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/DatawalletEntityType.cs
index 08f72a3b7c..4cfabf79ff 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/DatawalletEntityType.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/DatawalletEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/DatawalletModificationEntityType.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/DatawalletModificationEntityType.cs
index c1ebd041f9..355de98f80 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/DatawalletModificationEntityType.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/DatawalletModificationEntityType.cs
@@ -2,10 +2,10 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/ExternalEventEntityType.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/ExternalEventEntityType.cs
index b44062d532..4f03f2e1f3 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/ExternalEventEntityType.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/ExternalEventEntityType.cs
@@ -2,10 +2,10 @@
using System;
using System.Collections.Generic;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/SyncRunEntityType.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/SyncRunEntityType.cs
index 86e231d2e4..30d9ea4ae5 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/SyncRunEntityType.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/CompiledModels/SqlServer/SyncRunEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/Persistence/Database/SynchronizationDbContext.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/Persistence/Database/SynchronizationDbContext.cs
index 9ca634f6a4..1408c174ac 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/Persistence/Database/SynchronizationDbContext.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/Persistence/Database/SynchronizationDbContext.cs
@@ -1,15 +1,15 @@
using System.Data;
using System.Data.Common;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.Extensions;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.Data.SqlClient;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore;
diff --git a/Modules/Synchronization/src/Synchronization.Infrastructure/Persistence/IServiceCollectionExtensions.cs b/Modules/Synchronization/src/Synchronization.Infrastructure/Persistence/IServiceCollectionExtensions.cs
index 878ed3ef4e..0aa74efa10 100644
--- a/Modules/Synchronization/src/Synchronization.Infrastructure/Persistence/IServiceCollectionExtensions.cs
+++ b/Modules/Synchronization/src/Synchronization.Infrastructure/Persistence/IServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Synchronization.Application.Infrastructure;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
using Microsoft.Extensions.DependencyInjection;
namespace Backbone.Modules.Synchronization.Infrastructure.Persistence;
diff --git a/Modules/Synchronization/src/Synchronization.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs b/Modules/Synchronization/src/Synchronization.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
index b6fe651292..bb0c05e5af 100644
--- a/Modules/Synchronization/src/Synchronization.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
+++ b/Modules/Synchronization/src/Synchronization.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Synchronization.Application.Infrastructure;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Synchronization/src/Synchronization.Jobs.SanityCheck/Program.cs b/Modules/Synchronization/src/Synchronization.Jobs.SanityCheck/Program.cs
index 4795ef3182..a48cfe0c9a 100644
--- a/Modules/Synchronization/src/Synchronization.Jobs.SanityCheck/Program.cs
+++ b/Modules/Synchronization/src/Synchronization.Jobs.SanityCheck/Program.cs
@@ -3,7 +3,7 @@
using Backbone.Modules.Synchronization.Jobs.SanityCheck.Extensions;
using Backbone.Modules.Synchronization.Jobs.SanityCheck.Infrastructure.DataSource;
using Backbone.Modules.Synchronization.Jobs.SanityCheck.Infrastructure.Reporter;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Synchronization.Jobs.SanityCheck;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/DatawalletExtensions.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/DatawalletExtensions.cs
index f8e4188053..46f8fda3d1 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/DatawalletExtensions.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/DatawalletExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Domain.Entities;
namespace Backbone.Modules.Synchronization.Application.Tests;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/ExceptionAssertionsExtensions.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/ExceptionAssertionsExtensions.cs
index d34c65b8c2..66e5ffed22 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/ExceptionAssertionsExtensions.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/ExceptionAssertionsExtensions.cs
@@ -2,7 +2,7 @@
using FluentAssertions.Execution;
using FluentAssertions.Primitives;
using FluentAssertions.Specialized;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Synchronization.Application.Tests;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/ExternalEventBuilder.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/ExternalEventBuilder.cs
index e9d92997c7..ddc1e5de83 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/ExternalEventBuilder.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/ExternalEventBuilder.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Domain.Entities.Sync;
namespace Backbone.Modules.Synchronization.Application.Tests;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/SyncRunBuilder.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/SyncRunBuilder.cs
index 26a9bd1757..9dba83d62c 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/SyncRunBuilder.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/SyncRunBuilder.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Synchronization.Domain.Entities.Sync;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Domain.Entities.Sync;
namespace Backbone.Modules.Synchronization.Application.Tests;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/TestDataGenerator.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/TestDataGenerator.cs
index 648f79e299..865acbcd68 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/TestDataGenerator.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/TestDataGenerator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Synchronization.Application.Tests;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/Datawallet/Commands/PushDatawalletModifications/HandlerTests.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/Datawallet/Commands/PushDatawalletModifications/HandlerTests.cs
index 820ffc9a62..2a2da9e0e6 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/Datawallet/Commands/PushDatawalletModifications/HandlerTests.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/Datawallet/Commands/PushDatawalletModifications/HandlerTests.cs
@@ -1,14 +1,14 @@
using AutoFixture;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.AutoMapper;
using Backbone.Modules.Synchronization.Application.Datawallets.Commands.PushDatawalletModifications;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using FakeItEasy;
using FluentAssertions;
using Microsoft.Data.Sqlite;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/Datawallet/Queries/GetDatawalletModifications/HandlerTests.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/Datawallet/Queries/GetDatawalletModifications/HandlerTests.cs
index 552dc78322..698c3eb565 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/Datawallet/Queries/GetDatawalletModifications/HandlerTests.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/Datawallet/Queries/GetDatawalletModifications/HandlerTests.cs
@@ -1,13 +1,13 @@
-using Backbone.Modules.Synchronization.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Application.AutoMapper;
using Backbone.Modules.Synchronization.Application.Datawallets.Queries.GetModifications;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.UnitTestTools.TestDoubles.Fakes;
+using Backbone.UnitTestTools.TestDoubles.Fakes;
using FakeItEasy;
using FluentAssertions;
using FluentAssertions.Execution;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/FinalizeSyncRun/HandlerTests.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/FinalizeSyncRun/HandlerTests.cs
index 99fdc419f0..dae43f2c88 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/FinalizeSyncRun/HandlerTests.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/FinalizeSyncRun/HandlerTests.cs
@@ -1,14 +1,14 @@
-using Backbone.Modules.Synchronization.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Application.AutoMapper;
using Backbone.Modules.Synchronization.Application.Datawallets.DTOs;
using Backbone.Modules.Synchronization.Application.Infrastructure;
using Backbone.Modules.Synchronization.Application.SyncRuns.Commands.FinalizeSyncRun;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.UnitTestTools.BaseClasses;
+using Backbone.UnitTestTools.BaseClasses;
using FakeItEasy;
using FluentAssertions;
using Microsoft.Extensions.Options;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/RefreshExpirationTimeOfSyncRun/HandlerTests.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/RefreshExpirationTimeOfSyncRun/HandlerTests.cs
index b42cfe2fab..d599473505 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/RefreshExpirationTimeOfSyncRun/HandlerTests.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/RefreshExpirationTimeOfSyncRun/HandlerTests.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Synchronization.Application.SyncRuns.Commands.RefreshExpirationTimeOfSyncRun;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Synchronization.Application.SyncRuns.Commands.RefreshExpirationTimeOfSyncRun;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
-using Enmeshed.UnitTestTools.BaseClasses;
+using Backbone.Tooling;
+using Backbone.UnitTestTools.BaseClasses;
using FakeItEasy;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/StartSyncRun/HandlerTests.cs b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/StartSyncRun/HandlerTests.cs
index 05217c9167..64ab1942fd 100644
--- a/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/StartSyncRun/HandlerTests.cs
+++ b/Modules/Synchronization/test/Synchronization.Application.Tests/Tests/SyncRuns/Commands/StartSyncRun/HandlerTests.cs
@@ -1,12 +1,12 @@
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Synchronization.Application.AutoMapper;
using Backbone.Modules.Synchronization.Application.SyncRuns.Commands.StartSyncRun;
using Backbone.Modules.Synchronization.Application.SyncRuns.DTOs;
using Backbone.Modules.Synchronization.Domain.Entities.Sync;
using Backbone.Modules.Synchronization.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.Tooling;
using FakeItEasy;
using FluentAssertions;
using Microsoft.Data.Sqlite;
diff --git a/Modules/Synchronization/test/Synchronization.Domain.Tests/DatawalletTests.cs b/Modules/Synchronization/test/Synchronization.Domain.Tests/DatawalletTests.cs
index 34b6de1525..7efa862169 100644
--- a/Modules/Synchronization/test/Synchronization.Domain.Tests/DatawalletTests.cs
+++ b/Modules/Synchronization/test/Synchronization.Domain.Tests/DatawalletTests.cs
@@ -1,5 +1,5 @@
+using Backbone.BuildingBlocks.Domain;
using Backbone.Modules.Synchronization.Domain.Entities;
-using Enmeshed.BuildingBlocks.Domain;
using FluentAssertions;
using Xunit;
diff --git a/Modules/Synchronization/test/Synchronization.Domain.Tests/TestDataGenerator.cs b/Modules/Synchronization/test/Synchronization.Domain.Tests/TestDataGenerator.cs
index 196812abdc..8a9b3290f1 100644
--- a/Modules/Synchronization/test/Synchronization.Domain.Tests/TestDataGenerator.cs
+++ b/Modules/Synchronization/test/Synchronization.Domain.Tests/TestDataGenerator.cs
@@ -1,4 +1,4 @@
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
namespace Backbone.Modules.Synchronization.Domain.Tests;
diff --git a/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs b/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
index 350e92cea4..8513799f56 100644
--- a/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
+++ b/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Jobs.SanityCheck.Infrastructure.DataSource;
-namespace Synchronization.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+namespace Backbone.Modules.Synchronization.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
public class FakeDataSource : IDataSource
{
diff --git a/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs b/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
index 4dae768cf5..1600d37f53 100644
--- a/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
+++ b/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Synchronization.Domain.Entities;
using Backbone.Modules.Synchronization.Jobs.SanityCheck.Infrastructure.Reporter;
-namespace Synchronization.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
+namespace Backbone.Modules.Synchronization.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
public class TestReporter : IReporter
{
diff --git a/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs b/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
index f54175d6ae..9ed784a701 100644
--- a/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
+++ b/Modules/Synchronization/test/Synchronization.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
@@ -1,10 +1,10 @@
using Backbone.Modules.Synchronization.Domain.Entities;
+using Backbone.Modules.Synchronization.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+using Backbone.Modules.Synchronization.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using FluentAssertions;
-using Synchronization.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
-using Synchronization.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using Xunit;
-namespace Synchronization.Jobs.SanityCheck.Tests.Tests;
+namespace Backbone.Modules.Synchronization.Jobs.SanityCheck.Tests.Tests;
public class SanityCheckTests
{
diff --git a/Modules/Tokens/src/Tokens.Application/AutoMapper/AutoMapperProfile.cs b/Modules/Tokens/src/Tokens.Application/AutoMapper/AutoMapperProfile.cs
index bef1fb8e29..cd2ec79918 100644
--- a/Modules/Tokens/src/Tokens.Application/AutoMapper/AutoMapperProfile.cs
+++ b/Modules/Tokens/src/Tokens.Application/AutoMapper/AutoMapperProfile.cs
@@ -1,6 +1,6 @@
using System.Reflection;
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.AutoMapper;
namespace Backbone.Modules.Tokens.Application.AutoMapper;
diff --git a/Modules/Tokens/src/Tokens.Application/Extensions/IServiceCollectionExtensions.cs b/Modules/Tokens/src/Tokens.Application/Extensions/IServiceCollectionExtensions.cs
index 4b393f86cf..ff99dcbee9 100644
--- a/Modules/Tokens/src/Tokens.Application/Extensions/IServiceCollectionExtensions.cs
+++ b/Modules/Tokens/src/Tokens.Application/Extensions/IServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Tokens.Application.AutoMapper;
+using Backbone.BuildingBlocks.Application.MediatR;
+using Backbone.Modules.Tokens.Application.AutoMapper;
using Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
-using Enmeshed.BuildingBlocks.Application.MediatR;
using FluentValidation;
using Microsoft.Extensions.DependencyInjection;
diff --git a/Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs b/Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs
index 7f5d78684e..e71a298cbd 100644
--- a/Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs
+++ b/Modules/Tokens/src/Tokens.Application/Infrastructure/Persistence/Repository/ITokensRepository.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Tokens.Domain.Entities;
namespace Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
diff --git a/Modules/Tokens/src/Tokens.Application/IntegrationEvents/TokenCreatedIntegrationEvent.cs b/Modules/Tokens/src/Tokens.Application/IntegrationEvents/TokenCreatedIntegrationEvent.cs
index 1d9f7b0941..7854379b3d 100644
--- a/Modules/Tokens/src/Tokens.Application/IntegrationEvents/TokenCreatedIntegrationEvent.cs
+++ b/Modules/Tokens/src/Tokens.Application/IntegrationEvents/TokenCreatedIntegrationEvent.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.Modules.Tokens.Domain.Entities;
namespace Backbone.Modules.Tokens.Application.IntegrationEvents;
public class TokenCreatedIntegrationEvent : IntegrationEvent
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommand.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommand.cs
index de8901066a..7351f766a5 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommand.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommand.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.BuildingBlocks.Application.Attributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.BuildingBlocks.Application.Attributes;
+using Backbone.Modules.Tokens.Domain.Entities;
using MediatR;
namespace Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommandValidator.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommandValidator.cs
index dfcfdc3c5e..bec0f2c896 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommandValidator.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenCommandValidator.cs
@@ -1,7 +1,7 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.FluentValidation;
-using Enmeshed.Tooling;
-using Enmeshed.Tooling.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.FluentValidation;
+using Backbone.Tooling;
+using Backbone.Tooling.Extensions;
using FluentValidation;
namespace Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenResponse.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenResponse.cs
index af56f5a815..b1dd011b47 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenResponse.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/CreateTokenResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.Modules.Tokens.Domain.Entities;
namespace Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/Handler.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/Handler.cs
index 043b5f8e63..1fd792b7b9 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/Handler.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Commands/CreateToken/Handler.cs
@@ -1,9 +1,9 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Tokens.Application.IntegrationEvents;
using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
using MediatR;
namespace Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/DTOs/TokenDTO.cs b/Modules/Tokens/src/Tokens.Application/Tokens/DTOs/TokenDTO.cs
index d5891f729f..71fad7976e 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/DTOs/TokenDTO.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/DTOs/TokenDTO.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Mapping;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Tokens.Domain.Entities;
namespace Backbone.Modules.Tokens.Application.Tokens.DTOs;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/Handler.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/Handler.cs
index 84792a4318..924a1c3f56 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/Handler.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/Handler.cs
@@ -1,8 +1,8 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Tokens.Application.Tokens.DTOs;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Tokens.Application.Tokens.Queries.ListTokens;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQuery.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQuery.cs
index 3f1e164130..fa7cb26d4f 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQuery.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQuery.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Tokens.Domain.Entities;
using MediatR;
namespace Backbone.Modules.Tokens.Application.Tokens.Queries.ListTokens;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQueryValidator.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQueryValidator.cs
index 9fb396331b..71ec3baed6 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQueryValidator.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensQueryValidator.cs
@@ -1,5 +1,5 @@
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
using FluentValidation;
namespace Backbone.Modules.Tokens.Application.Tokens.Queries.ListTokens;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensResponse.cs b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensResponse.cs
index 71045f243f..5f7f3179c2 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensResponse.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/Queries/ListTokens/ListTokensResponse.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Tokens.Application.Tokens.DTOs;
-using Enmeshed.BuildingBlocks.Application.Pagination;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Tokens.Application.Tokens.DTOs;
namespace Backbone.Modules.Tokens.Application.Tokens.Queries.ListTokens;
diff --git a/Modules/Tokens/src/Tokens.Application/Tokens/RequestHandlerBase.cs b/Modules/Tokens/src/Tokens.Application/Tokens/RequestHandlerBase.cs
index 073e9f57ba..132878c32a 100644
--- a/Modules/Tokens/src/Tokens.Application/Tokens/RequestHandlerBase.cs
+++ b/Modules/Tokens/src/Tokens.Application/Tokens/RequestHandlerBase.cs
@@ -1,6 +1,6 @@
using AutoMapper;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using MediatR;
namespace Backbone.Modules.Tokens.Application.Tokens;
diff --git a/Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs b/Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs
index 354a39a147..81883242ad 100644
--- a/Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs
+++ b/Modules/Tokens/src/Tokens.ConsumerApi/Controllers/TokensController.cs
@@ -1,20 +1,20 @@
-using Backbone.Modules.Tokens.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Mvc;
+using Backbone.BuildingBlocks.API.Mvc.ControllerAttributes;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.Modules.Tokens.Application;
using Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
using Backbone.Modules.Tokens.Application.Tokens.DTOs;
using Backbone.Modules.Tokens.Application.Tokens.Queries.GetToken;
using Backbone.Modules.Tokens.Application.Tokens.Queries.ListTokens;
using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Mvc;
-using Enmeshed.BuildingBlocks.API.Mvc.ControllerAttributes;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
using MediatR;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
-using ApplicationException = Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
+using ApplicationException = Backbone.BuildingBlocks.Application.Abstractions.Exceptions.ApplicationException;
namespace Backbone.Modules.Tokens.ConsumerApi.Controllers;
diff --git a/Modules/Tokens/src/Tokens.ConsumerApi/TokensModule.cs b/Modules/Tokens/src/Tokens.ConsumerApi/TokensModule.cs
index 5ee75871e0..3bf646db06 100644
--- a/Modules/Tokens/src/Tokens.ConsumerApi/TokensModule.cs
+++ b/Modules/Tokens/src/Tokens.ConsumerApi/TokensModule.cs
@@ -1,10 +1,10 @@
-using Backbone.Modules.Tokens.Application;
+using Backbone.BuildingBlocks.API;
+using Backbone.BuildingBlocks.API.Extensions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.Modules.Tokens.Application;
using Backbone.Modules.Tokens.Application.Extensions;
using Backbone.Modules.Tokens.Infrastructure.Persistence;
-using Enmeshed.BuildingBlocks.API;
-using Enmeshed.BuildingBlocks.API.Extensions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options;
diff --git a/Modules/Tokens/src/Tokens.Domain/Entities/Token.cs b/Modules/Tokens/src/Tokens.Domain/Entities/Token.cs
index acbcf82115..47db71b820 100644
--- a/Modules/Tokens/src/Tokens.Domain/Entities/Token.cs
+++ b/Modules/Tokens/src/Tokens.Domain/Entities/Token.cs
@@ -1,6 +1,6 @@
using System.Linq.Expressions;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
-using Enmeshed.Tooling;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Tooling;
namespace Backbone.Modules.Tokens.Domain.Entities;
diff --git a/Modules/Tokens/src/Tokens.Domain/Entities/TokenId.cs b/Modules/Tokens/src/Tokens.Domain/Entities/TokenId.cs
index 477a97890f..95ac55bcb2 100644
--- a/Modules/Tokens/src/Tokens.Domain/Entities/TokenId.cs
+++ b/Modules/Tokens/src/Tokens.Domain/Entities/TokenId.cs
@@ -1,7 +1,7 @@
using System.ComponentModel;
using System.Globalization;
-using Enmeshed.BuildingBlocks.Domain;
-using Enmeshed.BuildingBlocks.Domain.StronglyTypedIds.Classes;
+using Backbone.BuildingBlocks.Domain;
+using Backbone.BuildingBlocks.Domain.StronglyTypedIds.Classes;
namespace Backbone.Modules.Tokens.Domain.Entities;
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/CompiledModels/Postgres/TokenEntityType.cs b/Modules/Tokens/src/Tokens.Infrastructure/CompiledModels/Postgres/TokenEntityType.cs
index b26a80a842..a8e2290930 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/CompiledModels/Postgres/TokenEntityType.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/CompiledModels/Postgres/TokenEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Tokens.Domain.Entities;
using Backbone.Modules.Tokens.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/CompiledModels/SqlServer/TokenEntityType.cs b/Modules/Tokens/src/Tokens.Infrastructure/CompiledModels/SqlServer/TokenEntityType.cs
index d504099ae6..e0254ea32e 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/CompiledModels/SqlServer/TokenEntityType.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/CompiledModels/SqlServer/TokenEntityType.cs
@@ -1,10 +1,10 @@
//
using System;
using System.Reflection;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Tokens.Domain.Entities;
using Backbone.Modules.Tokens.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore.Metadata;
#pragma warning disable 219, 612, 618
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/TokensDbContext.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/TokensDbContext.cs
index 4144fa30ea..1a536236ba 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/TokensDbContext.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Database/TokensDbContext.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Tokens.Domain.Entities;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.Database;
+using Backbone.Modules.Tokens.Domain.Entities;
using Backbone.Modules.Tokens.Infrastructure.Persistence.Database.ValueConverters;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.Database;
using Microsoft.EntityFrameworkCore;
namespace Backbone.Modules.Tokens.Infrastructure.Persistence.Database;
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/IServiceCollectionExtensions.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/IServiceCollectionExtensions.cs
index 7b65994fe8..ea1924335c 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/IServiceCollectionExtensions.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/IServiceCollectionExtensions.cs
@@ -1,6 +1,6 @@
-using Backbone.Modules.Tokens.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Tokens.Infrastructure.Persistence.Database;
using Backbone.Modules.Tokens.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
using Microsoft.Extensions.DependencyInjection;
namespace Backbone.Modules.Tokens.Infrastructure.Persistence;
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/IServiceCollectionExtensions.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/IServiceCollectionExtensions.cs
index 093862e7ce..08c26dc8c1 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/IServiceCollectionExtensions.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/IServiceCollectionExtensions.cs
@@ -1,5 +1,5 @@
-using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
using Microsoft.Extensions.DependencyInjection;
namespace Backbone.Modules.Tokens.Infrastructure.Persistence.Repository;
diff --git a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs
index 87b38df1e2..6916fb1e52 100644
--- a/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs
+++ b/Modules/Tokens/src/Tokens.Infrastructure/Persistence/Repository/TokensRepository.cs
@@ -1,12 +1,12 @@
-using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
+using Backbone.BuildingBlocks.Application.Extensions;
+using Backbone.BuildingBlocks.Application.Pagination;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
+using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Tokens.Domain.Entities;
using Backbone.Modules.Tokens.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Exceptions;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.Database;
-using Enmeshed.BuildingBlocks.Application.Extensions;
-using Enmeshed.BuildingBlocks.Application.Pagination;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Tokens/src/Tokens.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs b/Modules/Tokens/src/Tokens.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
index 5c0a878e69..ae70f67b75 100644
--- a/Modules/Tokens/src/Tokens.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
+++ b/Modules/Tokens/src/Tokens.Jobs.SanityCheck/Infrastructure/DataSource/DataSource.cs
@@ -1,7 +1,7 @@
-using Backbone.Modules.Tokens.Domain.Entities;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
+using Backbone.Modules.Tokens.Domain.Entities;
using Backbone.Modules.Tokens.Infrastructure.Persistence.Database;
using Backbone.Modules.Tokens.Infrastructure.Persistence.Repository;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.Persistence.BlobStorage;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Options;
diff --git a/Modules/Tokens/src/Tokens.Jobs.SanityCheck/Program.cs b/Modules/Tokens/src/Tokens.Jobs.SanityCheck/Program.cs
index d3da05249d..f9061d2048 100644
--- a/Modules/Tokens/src/Tokens.Jobs.SanityCheck/Program.cs
+++ b/Modules/Tokens/src/Tokens.Jobs.SanityCheck/Program.cs
@@ -3,7 +3,7 @@
using Backbone.Modules.Tokens.Jobs.SanityCheck.Extensions;
using Backbone.Modules.Tokens.Jobs.SanityCheck.Infrastructure.DataSource;
using Backbone.Modules.Tokens.Jobs.SanityCheck.Infrastructure.Reporter;
-using Enmeshed.Tooling.Extensions;
+using Backbone.Tooling.Extensions;
namespace Backbone.Modules.Tokens.Jobs.SanityCheck;
diff --git a/Modules/Tokens/test/Tokens.Application.Tests/Tests/Tokens/CreateToken/HandlerTests.cs b/Modules/Tokens/test/Tokens.Application.Tests/Tests/Tokens/CreateToken/HandlerTests.cs
index 8e6e763193..01c9cf0d78 100644
--- a/Modules/Tokens/test/Tokens.Application.Tests/Tests/Tokens/CreateToken/HandlerTests.cs
+++ b/Modules/Tokens/test/Tokens.Application.Tests/Tests/Tokens/CreateToken/HandlerTests.cs
@@ -1,12 +1,12 @@
using AutoMapper;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.DevelopmentKit.Identity.ValueObjects;
using Backbone.Modules.Tokens.Application.Infrastructure.Persistence.Repository;
using Backbone.Modules.Tokens.Application.IntegrationEvents;
using Backbone.Modules.Tokens.Application.Tokens.Commands.CreateToken;
using Backbone.Modules.Tokens.Domain.Entities;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.EventBus.Events;
-using Enmeshed.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
-using Enmeshed.DevelopmentKit.Identity.ValueObjects;
using FakeItEasy;
using FluentAssertions.Execution;
using Xunit;
diff --git a/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs b/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
index 2c264d2463..062d152dd4 100644
--- a/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
+++ b/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Infrastructure/DataSource/FakeDataSource.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Tokens.Domain.Entities;
using Backbone.Modules.Tokens.Jobs.SanityCheck.Infrastructure.DataSource;
-namespace Tokens.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+namespace Backbone.Modules.Tokens.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
public class FakeDataSource : IDataSource
{
diff --git a/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs b/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
index 450c62e059..cf81b5511d 100644
--- a/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
+++ b/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Infrastructure/Reporter/TestReporter.cs
@@ -1,7 +1,7 @@
using Backbone.Modules.Tokens.Domain.Entities;
using Backbone.Modules.Tokens.Jobs.SanityCheck.Infrastructure.Reporter;
-namespace Tokens.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
+namespace Backbone.Modules.Tokens.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
public class TestReporter : IReporter
{
diff --git a/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs b/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
index 5037c3c84f..104c7a04f9 100644
--- a/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
+++ b/Modules/Tokens/test/Tokens.Jobs.SanityCheck.Tests/Tests/SanityCheckTests.cs
@@ -1,10 +1,10 @@
using Backbone.Modules.Tokens.Domain.Entities;
+using Backbone.Modules.Tokens.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
+using Backbone.Modules.Tokens.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using FluentAssertions;
-using Tokens.Jobs.SanityCheck.Tests.Infrastructure.DataSource;
-using Tokens.Jobs.SanityCheck.Tests.Infrastructure.Reporter;
using Xunit;
-namespace Tokens.Jobs.SanityCheck.Tests.Tests;
+namespace Backbone.Modules.Tokens.Jobs.SanityCheck.Tests.Tests;
public class SanityCheckTests
{