diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryDbContext.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryDbContext.cs
similarity index 89%
rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryDbContext.cs
rename to directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryDbContext.cs
index d73e914b0..ef38cf948 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryDbContext.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryDbContext.cs
@@ -6,9 +6,9 @@
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade
 {
-    internal class DirectoryQueryDbContext : DbContext
+    internal class QueryDbContext : DbContext
     {
-        public DirectoryQueryDbContext(DbContextOptions<DirectoryQueryDbContext> options) : base(options)
+        public QueryDbContext(DbContextOptions<QueryDbContext> options) : base(options)
         {
         }
 
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryFacade.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacade.cs
similarity index 83%
rename from directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryFacade.cs
rename to directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacade.cs
index f8ded563b..33c191166 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/DirectoryQueryFacade.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacade.cs
@@ -6,11 +6,11 @@
 
 namespace FilterLists.Directory.Infrastructure.Persistence.Queries.Facade
 {
-    internal class DirectoryQueryFacade : IQueryDirectory, IAsyncDisposable
+    internal class QueryFacade : IQueryDirectory, IAsyncDisposable
     {
-        private readonly DirectoryQueryDbContext _dbContext;
+        private readonly QueryDbContext _dbContext;
 
-        public DirectoryQueryFacade(DirectoryQueryDbContext dbContext)
+        public QueryFacade(QueryDbContext dbContext)
         {
             _dbContext = dbContext;
         }
diff --git a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacadeExtension.cs b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacadeExtension.cs
index 05cc7ad3d..b0bbdbb72 100644
--- a/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacadeExtension.cs
+++ b/directory/src/FilterLists.Directory.Infrastructure/Persistence/Queries/Facade/QueryFacadeExtension.cs
@@ -8,9 +8,9 @@ public static class QueryFacadeExtension
     {
         public static void RegisterQueryFacade(this IServiceCollection services, IConfiguration configuration)
         {
-            services.AddDbContextPool<DirectoryQueryDbContext>(o =>
+            services.AddDbContextPool<QueryDbContext>(o =>
                 o.UseNpgsql(configuration.GetConnectionString("DirectoryConnection")));
-            services.AddScoped<IQueryDirectory, DirectoryQueryFacade>();
+            services.AddScoped<IQueryDirectory, QueryFacade>();
         }
     }
 }
\ No newline at end of file