diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Extensions/ServiceCollectionExtensions.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Extensions/ServiceCollectionExtensions.cs
index 899bd51..9d1427b 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Extensions/ServiceCollectionExtensions.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Extensions/ServiceCollectionExtensions.cs
@@ -56,7 +56,7 @@ public static IServiceCollection AddGraphQlServices(this IServiceCollection serv
             // TODO: Configure cost analyzer at some point (enforces maximum query costs)
             .AddGraphQLServer(disableCostAnalyzer: true)
             // Adds all GraphQL query and mutation types using the code generator (looks for attributes)
-            .AddTypes()
+            .AddResolvers()
             // TODO: Document what the different extensions methods do
             // AddQueryConventions: https://www.youtube.com/watch?v=yoW2Mt6C0Cg
             .AddQueryConventions()
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Properties/ModuleInfo.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Properties/ModuleInfo.cs
index 4cfb15d..fd1b95d 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Properties/ModuleInfo.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Properties/ModuleInfo.cs
@@ -1 +1 @@
-[assembly: Module("Types")]
\ No newline at end of file
+[assembly: Module("Resolvers")]
\ No newline at end of file
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/AuthenticationMutationResolvers.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/AuthenticationMutationResolvers.cs
similarity index 95%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/AuthenticationMutationResolvers.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/AuthenticationMutationResolvers.cs
index 5d393f0..38744f3 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/AuthenticationMutationResolvers.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/AuthenticationMutationResolvers.cs
@@ -3,7 +3,7 @@
 using RobinTTY.PersonalFinanceDashboard.Core.Models;
 using RobinTTY.PersonalFinanceDashboard.Infrastructure.Repositories;
 
-namespace RobinTTY.PersonalFinanceDashboard.Api.Types.Mutations;
+namespace RobinTTY.PersonalFinanceDashboard.Api.Resolvers.Mutations;
 
 /// <summary>
 /// <see cref="AuthenticationRequest"/> related mutation resolvers.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/BankingInstitutionMutationResolvers.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/BankingInstitutionMutationResolvers.cs
similarity index 96%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/BankingInstitutionMutationResolvers.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/BankingInstitutionMutationResolvers.cs
index 8e8058a..54f7731 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/BankingInstitutionMutationResolvers.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/BankingInstitutionMutationResolvers.cs
@@ -2,7 +2,7 @@
 using RobinTTY.PersonalFinanceDashboard.Core.Models;
 using RobinTTY.PersonalFinanceDashboard.Infrastructure.Repositories;
 
-namespace RobinTTY.PersonalFinanceDashboard.Api.Types.Mutations;
+namespace RobinTTY.PersonalFinanceDashboard.Api.Resolvers.Mutations;
 
 /// <summary>
 /// <see cref="BankingInstitution"/> related mutation resolvers.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/TransactionMutationResolvers.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/TransactionMutationResolvers.cs
similarity index 95%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/TransactionMutationResolvers.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/TransactionMutationResolvers.cs
index 40a66e0..a993ba1 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Mutations/TransactionMutationResolvers.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Mutations/TransactionMutationResolvers.cs
@@ -2,7 +2,7 @@
 using RobinTTY.PersonalFinanceDashboard.Core.Models;
 using RobinTTY.PersonalFinanceDashboard.Infrastructure.Repositories;
 
-namespace RobinTTY.PersonalFinanceDashboard.Api.Types.Mutations;
+namespace RobinTTY.PersonalFinanceDashboard.Api.Resolvers.Mutations;
 
 /// <summary>
 /// <see cref="Transaction"/> related mutation resolvers.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/AuthenticationRequestQueryResolvers.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/AuthenticationRequestQueryResolvers.cs
similarity index 94%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/AuthenticationRequestQueryResolvers.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/AuthenticationRequestQueryResolvers.cs
index c5608eb..e3eec80 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/AuthenticationRequestQueryResolvers.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/AuthenticationRequestQueryResolvers.cs
@@ -2,7 +2,7 @@
 using RobinTTY.PersonalFinanceDashboard.Core.Models;
 using RobinTTY.PersonalFinanceDashboard.Infrastructure.Repositories;
 
-namespace RobinTTY.PersonalFinanceDashboard.Api.Types.Queries;
+namespace RobinTTY.PersonalFinanceDashboard.Api.Resolvers.Queries;
 
 /// <summary>
 /// <see cref="AuthenticationRequest"/> related query resolvers.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/BankAccountQueryResolvers.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/BankAccountQueryResolvers.cs
similarity index 93%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/BankAccountQueryResolvers.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/BankAccountQueryResolvers.cs
index 7b2db44..0f9f531 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/BankAccountQueryResolvers.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/BankAccountQueryResolvers.cs
@@ -2,7 +2,7 @@
 using RobinTTY.PersonalFinanceDashboard.Core.Models;
 using RobinTTY.PersonalFinanceDashboard.Infrastructure.Repositories;
 
-namespace RobinTTY.PersonalFinanceDashboard.Api.Types.Queries;
+namespace RobinTTY.PersonalFinanceDashboard.Api.Resolvers.Queries;
 
 /// <summary>
 /// <see cref="BankAccount"/> related query resolvers.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/BankingInstitutionQueryResolvers.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/BankingInstitutionQueryResolvers.cs
similarity index 91%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/BankingInstitutionQueryResolvers.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/BankingInstitutionQueryResolvers.cs
index ae4187e..401f959 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/BankingInstitutionQueryResolvers.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/BankingInstitutionQueryResolvers.cs
@@ -1,9 +1,8 @@
 using HotChocolate.Types;
 using RobinTTY.PersonalFinanceDashboard.Core.Models;
 using RobinTTY.PersonalFinanceDashboard.Infrastructure.Repositories;
-using RobinTTY.PersonalFinanceDashboard.Infrastructure.Services;
 
-namespace RobinTTY.PersonalFinanceDashboard.Api.Types.Queries;
+namespace RobinTTY.PersonalFinanceDashboard.Api.Resolvers.Queries;
 
 /// <summary>
 /// <see cref="BankingInstitution"/> related query resolvers.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/TransactionQueryResolvers.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/TransactionQueryResolvers.cs
similarity index 95%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/TransactionQueryResolvers.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/TransactionQueryResolvers.cs
index be99278..ce5e872 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/Queries/TransactionQueryResolvers.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Resolvers/Queries/TransactionQueryResolvers.cs
@@ -2,7 +2,7 @@
 using RobinTTY.PersonalFinanceDashboard.Core.Models;
 using RobinTTY.PersonalFinanceDashboard.Infrastructure.Repositories;
 
-namespace RobinTTY.PersonalFinanceDashboard.Api.Types.Queries;
+namespace RobinTTY.PersonalFinanceDashboard.Api.Resolvers.Queries;
 
 /// <summary>
 /// <see cref="Transaction"/> related query resolvers.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/AppConfiguration.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Utility/AppConfiguration.cs
similarity index 96%
rename from src/server/RobinTTY.PersonalFinanceDashboard.API/Types/AppConfiguration.cs
rename to src/server/RobinTTY.PersonalFinanceDashboard.API/Utility/AppConfiguration.cs
index 526cfc3..8dc9db5 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Types/AppConfiguration.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Utility/AppConfiguration.cs
@@ -1,4 +1,4 @@
-namespace RobinTTY.PersonalFinanceDashboard.Api.Types;
+namespace RobinTTY.PersonalFinanceDashboard.Api.Utility;
 
 /// <summary>
 /// The configuration of the application server.
diff --git a/src/server/RobinTTY.PersonalFinanceDashboard.API/Utility/AppConfigurationManager.cs b/src/server/RobinTTY.PersonalFinanceDashboard.API/Utility/AppConfigurationManager.cs
index c7eadf4..b5c87a6 100644
--- a/src/server/RobinTTY.PersonalFinanceDashboard.API/Utility/AppConfigurationManager.cs
+++ b/src/server/RobinTTY.PersonalFinanceDashboard.API/Utility/AppConfigurationManager.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using RobinTTY.PersonalFinanceDashboard.Api.Types;
+using RobinTTY.PersonalFinanceDashboard.Api.Utility;
 
 namespace RobinTTY.PersonalFinanceDashboard.API.Utility;