diff --git a/src/ApiGateways/Web.Bff.Shopping/aggregator/Extensions/ServiceCollectionExtensions.cs b/src/ApiGateways/Web.Bff.Shopping/aggregator/Extensions/Extensions.cs
similarity index 97%
rename from src/ApiGateways/Web.Bff.Shopping/aggregator/Extensions/ServiceCollectionExtensions.cs
rename to src/ApiGateways/Web.Bff.Shopping/aggregator/Extensions/Extensions.cs
index c39149111..d1ead0af6 100644
--- a/src/ApiGateways/Web.Bff.Shopping/aggregator/Extensions/ServiceCollectionExtensions.cs
+++ b/src/ApiGateways/Web.Bff.Shopping/aggregator/Extensions/Extensions.cs
@@ -1,4 +1,4 @@
-public static class ServiceCollectionExtensions
+internal static class Extensions
 {
     public static IServiceCollection AddHealthChecks(this IServiceCollection services, IConfiguration configuration)
     {
@@ -17,7 +17,6 @@
         services.AddTransient<HttpClientAuthorizationDelegatingHandler>();
 
         // Register http services
-
         services.AddHttpClient<IOrderApiClient, OrderApiClient>()
             .AddHttpMessageHandler<HttpClientAuthorizationDelegatingHandler>();
 
diff --git a/src/Services/Basket/Basket.API/Extensions/CustomExtensionMethods.cs b/src/Services/Basket/Basket.API/Extensions/Extensions.cs
similarity index 93%
rename from src/Services/Basket/Basket.API/Extensions/CustomExtensionMethods.cs
rename to src/Services/Basket/Basket.API/Extensions/Extensions.cs
index 00cea7367..7fce10b50 100644
--- a/src/Services/Basket/Basket.API/Extensions/CustomExtensionMethods.cs
+++ b/src/Services/Basket/Basket.API/Extensions/Extensions.cs
@@ -1,5 +1,4 @@
-
-public static class CustomExtensionMethods
+public static class Extensions
 {
     public static IServiceCollection AddHealthChecks(this IServiceCollection services, IConfiguration configuration)
     {
diff --git a/src/Services/Catalog/Catalog.API/Extensions/CustomExtensionMethods.cs b/src/Services/Catalog/Catalog.API/Extensions/Extensions.cs
similarity index 98%
rename from src/Services/Catalog/Catalog.API/Extensions/CustomExtensionMethods.cs
rename to src/Services/Catalog/Catalog.API/Extensions/Extensions.cs
index f1320f00f..490c5ede4 100644
--- a/src/Services/Catalog/Catalog.API/Extensions/CustomExtensionMethods.cs
+++ b/src/Services/Catalog/Catalog.API/Extensions/Extensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
-public static class CustomExtensionMethods
+public static class Extensions
 {
     public static IServiceCollection AddHealthChecks(this IServiceCollection services, IConfiguration configuration)
     {
diff --git a/src/Services/Ordering/Ordering.API/Extensions/CustomExtensionsMethods.cs b/src/Services/Ordering/Ordering.API/Extensions/Extensions.cs
similarity index 98%
rename from src/Services/Ordering/Ordering.API/Extensions/CustomExtensionsMethods.cs
rename to src/Services/Ordering/Ordering.API/Extensions/Extensions.cs
index 9ad366a1a..52de0f4cf 100644
--- a/src/Services/Ordering/Ordering.API/Extensions/CustomExtensionsMethods.cs
+++ b/src/Services/Ordering/Ordering.API/Extensions/Extensions.cs
@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
-static class CustomExtensionsMethods
+internal static class Extensions
 {
     public static IServiceCollection AddHealthChecks(this IServiceCollection services, IConfiguration configuration)
     {
diff --git a/src/Services/Ordering/Ordering.SignalrHub/Extensions/CustomExtensionMethods.cs b/src/Services/Ordering/Ordering.SignalrHub/Extensions/Extensions.cs
similarity index 93%
rename from src/Services/Ordering/Ordering.SignalrHub/Extensions/CustomExtensionMethods.cs
rename to src/Services/Ordering/Ordering.SignalrHub/Extensions/Extensions.cs
index dd6a3d442..40b8d1ff6 100644
--- a/src/Services/Ordering/Ordering.SignalrHub/Extensions/CustomExtensionMethods.cs
+++ b/src/Services/Ordering/Ordering.SignalrHub/Extensions/Extensions.cs
@@ -1,12 +1,12 @@
 using Microsoft.AspNetCore.Http;
 
-public static class CustomExtensionMethods
+internal static class Extensions
 {
     public static IServiceCollection AddSignalR(this IServiceCollection services, IConfiguration configuration)
     {
         if (configuration.GetConnectionString("redis") is string redisConnection)
         {
-            // Add a redis health check
+            // TODO: Add a redis health check
             services.AddSignalR().AddStackExchangeRedis(redisConnection);
         }
         else
diff --git a/src/Services/Webhooks/Webhooks.API/Extensions/CustomExtensionMethods.cs b/src/Services/Webhooks/Webhooks.API/Extensions/Extensions.cs
similarity index 97%
rename from src/Services/Webhooks/Webhooks.API/Extensions/CustomExtensionMethods.cs
rename to src/Services/Webhooks/Webhooks.API/Extensions/Extensions.cs
index 8a962781e..d8369382c 100644
--- a/src/Services/Webhooks/Webhooks.API/Extensions/CustomExtensionMethods.cs
+++ b/src/Services/Webhooks/Webhooks.API/Extensions/Extensions.cs
@@ -1,4 +1,4 @@
-internal static class CustomExtensionMethods
+internal static class Extensions
 {
     public static IServiceCollection AddDbContexts(this IServiceCollection services, IConfiguration configuration)
     {