diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/HostingExtensions.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/HostingExtensions.cs
index c464c2d..36df635 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/HostingExtensions.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/HostingExtensions.cs
@@ -6,7 +6,7 @@
 using Microsoft.IdentityModel.Logging;
 using Serilog;
 
-namespace RazorAzureAD;
+namespace RazorMicrosoftEntraID;
 
 internal static class HostingExtensions
 {
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationApi.cshtml b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationApi.cshtml
index baff178..3ce8742 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationApi.cshtml
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationApi.cshtml
@@ -1,5 +1,5 @@
 @page
-@model RazorAzureAD.Pages.ApplicationApiModel
+@model RazorMicrosoftEntraID.Pages.ApplicationApiModel
 @{
     ViewData["Title"] = "ApplicationApi";
     Layout = "~/Pages/Shared/_Layout.cshtml";
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationApi.cshtml.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationApi.cshtml.cs
index bb51cdf..03fa09c 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationApi.cshtml.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationApi.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace RazorAzureAD.Pages;
+namespace RazorMicrosoftEntraID.Pages;
 
 [Authorize]
 public class ApplicationApiModel : PageModel
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationFailApi.cshtml b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationFailApi.cshtml
index d69bb46..07a6845 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationFailApi.cshtml
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationFailApi.cshtml
@@ -1,5 +1,5 @@
 @page
-@model RazorAzureAD.Pages.ApplicationFailApiModel
+@model RazorMicrosoftEntraID.Pages.ApplicationFailApiModel
 @{
     ViewData["Title"] = "ApplicationFailApi";
     Layout = "~/Pages/Shared/_Layout.cshtml";
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationFailApi.cshtml.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationFailApi.cshtml.cs
index a70f13c..9bc6561 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationFailApi.cshtml.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/ApplicationFailApi.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace RazorAzureAD.Pages;
+namespace RazorMicrosoftEntraID.Pages;
 
 [Authorize]
 public class ApplicationFailApiModel : PageModel
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedApi.cshtml b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedApi.cshtml
index a974eb1..49688c0 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedApi.cshtml
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedApi.cshtml
@@ -1,5 +1,5 @@
 @page
-@model RazorAzureAD.Pages.DelegatedApiModel
+@model RazorMicrosoftEntraID.Pages.DelegatedApiModel
 @{
     ViewData["Title"] = "DelegatedApi";
     Layout = "~/Pages/Shared/_Layout.cshtml";
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedApi.cshtml.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedApi.cshtml.cs
index 88956f3..9471d04 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedApi.cshtml.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedApi.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Identity.Web;
 
-namespace RazorAzureAD.Pages;
+namespace RazorMicrosoftEntraID.Pages;
 
 [AuthorizeForScopes(Scopes = new string[] { "api://b2a09168-54e2-4bc4-af92-a710a64ef1fa/access_as_user" })]
 public class DelegatedApiModel : PageModel
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedFailApi.cshtml b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedFailApi.cshtml
index 9cf5e79..6bb9020 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedFailApi.cshtml
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedFailApi.cshtml
@@ -1,5 +1,5 @@
 @page
-@model RazorAzureAD.Pages.DelegatedFailApiModel
+@model RazorMicrosoftEntraID.Pages.DelegatedFailApiModel
 @{
     ViewData["Title"] = "DelegatedFailApi";
     Layout = "~/Pages/Shared/_Layout.cshtml";
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedFailApi.cshtml.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedFailApi.cshtml.cs
index fefd2aa..e327a67 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedFailApi.cshtml.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/DelegatedFailApi.cshtml.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Identity.Web;
 
-namespace RazorAzureAD.Pages;
+namespace RazorMicrosoftEntraID.Pages;
 
 [AuthorizeForScopes(Scopes = new string[] { "api://b2a09168-54e2-4bc4-af92-a710a64ef1fa/access_as_user" })]
 public class DelegatedFailApiModel : PageModel
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/Error.cshtml.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/Error.cshtml.cs
index 943c85c..d4aaebd 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/Error.cshtml.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/Error.cshtml.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace RazorAzureAD.Pages;
+namespace RazorMicrosoftEntraID.Pages;
 
 [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
 public class ErrorModel : PageModel
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/Index.cshtml.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/Index.cshtml.cs
index 503f999..3b92d3f 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/Index.cshtml.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/Index.cshtml.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace RazorAzureAD.Pages;
+namespace RazorMicrosoftEntraID.Pages;
 
 public class IndexModel : PageModel
 {
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/_ViewImports.cshtml b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/_ViewImports.cshtml
index 079ee08..8854bcb 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/_ViewImports.cshtml
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Pages/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@using RazorAzureAD
+@using RazorMicrosoftEntraID
 @using NetEscapades.AspNetCore.SecurityHeaders
-@namespace RazorAzureAD.Pages
+@namespace RazorMicrosoftEntraID.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/Program.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/Program.cs
index e21bbf2..5807e4b 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/Program.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/Program.cs
@@ -1,4 +1,4 @@
-using RazorAzureAD;
+using RazorMicrosoftEntraID;
 using Serilog;
 
 Log.Logger = new LoggerConfiguration()
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/SecurityHeadersDefinitions.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/SecurityHeadersDefinitions.cs
index 0188742..1c8adb4 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/SecurityHeadersDefinitions.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/SecurityHeadersDefinitions.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace RazorAzureAD;
+namespace RazorMicrosoftEntraID;
 
 public static class SecurityHeadersDefinitions
 {
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/WebApi/MultiTenantApplicationApiService.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/WebApi/MultiTenantApplicationApiService.cs
index 6b9449c..82fb7d8 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/WebApi/MultiTenantApplicationApiService.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/WebApi/MultiTenantApplicationApiService.cs
@@ -1,7 +1,7 @@
 using Microsoft.Identity.Client;
 using System.Net.Http.Headers;
 
-namespace RazorAzureAD;
+namespace RazorMicrosoftEntraID;
 
 public class MultiTenantApplicationApiService
 {
diff --git a/MicrosoftEntraIDMultiApis/TestMultiApis/WebApi/SingleTenantApiService.cs b/MicrosoftEntraIDMultiApis/TestMultiApis/WebApi/SingleTenantApiService.cs
index 1afb5a0..5229dd1 100644
--- a/MicrosoftEntraIDMultiApis/TestMultiApis/WebApi/SingleTenantApiService.cs
+++ b/MicrosoftEntraIDMultiApis/TestMultiApis/WebApi/SingleTenantApiService.cs
@@ -1,7 +1,7 @@
 using Microsoft.Identity.Web;
 using System.Net.Http.Headers;
 
-namespace RazorAzureAD;
+namespace RazorMicrosoftEntraID;
 
 public class SingleTenantApiService
 {