diff --git a/tests/DevApps/AzureFunctions/SampleFunc/appsettings.json b/tests/DevApps/AzureFunctions/SampleFunc/appsettings.json
index 3ff4bb69a..7d35a52ac 100644
--- a/tests/DevApps/AzureFunctions/SampleFunc/appsettings.json
+++ b/tests/DevApps/AzureFunctions/SampleFunc/appsettings.json
@@ -3,7 +3,7 @@
         "Instance": "https://login.microsoftonline.com/",
         "Domain": "msidentitysamplestesting.onmicrosoft.com",
         "TenantId": "7f58f645-c190-4ce5-9de4-e2b7acd2a6ab",
-        "ClientId": "e2fb196-50ce-4652-a4f9-26c1bf2e826b",
+        "ClientId": "1e2fb196-50ce-4652-a4f9-26c1bf2e826b",
         "ClientSecret": "",
         "AllowWebApiToBeAuthorizedByACL": false
     },
diff --git a/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/Controllers/HomeController.cs b/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/Controllers/HomeController.cs
index 09770de0e..83c0fd604 100644
--- a/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/Controllers/HomeController.cs
+++ b/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/Controllers/HomeController.cs
@@ -51,7 +51,7 @@ public async Task<ActionResult> SayHello()
             var channel = GrpcChannel.ForAddress("https://localhost:5001");
             var client = new Greeter.GreeterClient(channel);
 
-            string token = await _tokenAcquisition.GetAccessTokenForUserAsync(new string[] { "api://e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" }).ConfigureAwait(false);
+            string token = await _tokenAcquisition.GetAccessTokenForUserAsync(new string[] { "api://1e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" }).ConfigureAwait(false);
 
             var headers = new Metadata();
             headers.Add("Authorization", $"Bearer {token}");
diff --git a/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/appsettings.json b/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/appsettings.json
index a7def7ac5..63bed91ed 100644
--- a/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/appsettings.json
+++ b/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/appsettings.json
@@ -20,23 +20,23 @@
     },
     "TodoList": {
         // TodoListScope is the scope of the Web API you want to call.
-        "Scopes": [ "api://e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" ],
+        "Scopes": [ "api://1e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" ],
         "BaseUrl": "http://localhost:44350"
 
     },
     "SayHello": {
         // Scope for the web API set up w/gRPC
-        "Scopes": [ "api://e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" ],
+        "Scopes": [ "api://1e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" ],
         "BaseUrl": "https://localhost:5001"
     },
     "AzureFunction": {
         // Scope for the web API set up Azure function
-        "Scopes": [ "api://e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" ],
+        "Scopes": [ "api://1e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" ],
         "BaseUrl": "http://localhost:7071/api/SampleFunc"
     },
     "TodoListJwe": {
         // Scope for the web API used with the token decryption certificates.
-        "Scopes": [ "api://e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" ],
+        "Scopes": [ "api://1e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user" ],
         "BaseUrl": "https://localhost:44350"
     },
     "Logging": {
diff --git a/tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/appsettings.json b/tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/appsettings.json
index b2bdb8419..ae01e5afc 100644
--- a/tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/appsettings.json
+++ b/tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/appsettings.json
@@ -15,7 +15,7 @@
         //   - WebAppsCallsWebApiCallGraph\\TodoListClient,
         // - Navigate to the todo list. this provokes a 401.
         // "Authority": "https://localhost:1234/v2.0",
-        "ClientId": "e2fb196-50ce-4652-a4f9-26c1bf2e826b", //"712ae8d7-548a-4306-95b6-ee9117ee86f0", JWE clientID
+        "ClientId": "1e2fb196-50ce-4652-a4f9-26c1bf2e826b", //"712ae8d7-548a-4306-95b6-ee9117ee86f0", JWE clientID
         //"ClientSecret": null,
         "ClientCertificates": [
             {
diff --git a/tests/DevApps/WebAppCallsWebApiCallsGraph/gRPC/appsettings.json b/tests/DevApps/WebAppCallsWebApiCallsGraph/gRPC/appsettings.json
index dab11434d..678db5f5d 100644
--- a/tests/DevApps/WebAppCallsWebApiCallsGraph/gRPC/appsettings.json
+++ b/tests/DevApps/WebAppCallsWebApiCallsGraph/gRPC/appsettings.json
@@ -3,7 +3,7 @@
         "Instance": "https://login.microsoftonline.com/",
         "Domain": "msidentitysamplestesting.onmicrosoft.com",
         "TenantId": "7f58f645-c190-4ce5-9de4-e2b7acd2a6ab",
-        "ClientId": "e2fb196-50ce-4652-a4f9-26c1bf2e826b",
+        "ClientId": "1e2fb196-50ce-4652-a4f9-26c1bf2e826b",
         "ClientCertificates": [
             {
                 "SourceType": "KeyVault",
diff --git a/tests/DevApps/aspnet-mvc/OwinWebApi/appsettings.json b/tests/DevApps/aspnet-mvc/OwinWebApi/appsettings.json
index f55201b7b..24a901697 100644
--- a/tests/DevApps/aspnet-mvc/OwinWebApi/appsettings.json
+++ b/tests/DevApps/aspnet-mvc/OwinWebApi/appsettings.json
@@ -3,7 +3,7 @@
         "Instance": "https://login.microsoftonline.com/",
         "Domain": "msidentitysamplestesting.onmicrosoft.com",
         "TenantId": "7f58f645-c190-4ce5-9de4-e2b7acd2a6ab",
-        "ClientId": "e2fb196-50ce-4652-a4f9-26c1bf2e826b", //"712ae8d7-548a-4306-95b6-ee9117ee86f0", JWE clientID
+        "ClientId": "1e2fb196-50ce-4652-a4f9-26c1bf2e826b", //"712ae8d7-548a-4306-95b6-ee9117ee86f0", JWE clientID
         // "ClientSecret": "",
         "Scopes": "access_as_user",
         "EnableCacheSynchronization": false,
diff --git a/tests/DevApps/blazorwasm2/Client/Program.cs b/tests/DevApps/blazorwasm2/Client/Program.cs
index 616b2091c..0c74053ab 100644
--- a/tests/DevApps/blazorwasm2/Client/Program.cs
+++ b/tests/DevApps/blazorwasm2/Client/Program.cs
@@ -27,7 +27,7 @@ public static async Task Main(string[] args)
             builder.Services.AddMsalAuthentication(options =>
             {
                 builder.Configuration.Bind("AzureAd", options.ProviderOptions.Authentication);
-                options.ProviderOptions.DefaultAccessTokenScopes.Add("api://e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user");
+                options.ProviderOptions.DefaultAccessTokenScopes.Add("api://1e2fb196-50ce-4652-a4f9-26c1bf2e826b/access_as_user");
             });
 
             await builder.Build().RunAsync();
diff --git a/tests/DevApps/blazorwasm2/Server/appsettings.json b/tests/DevApps/blazorwasm2/Server/appsettings.json
index 7faed0970..444753147 100644
--- a/tests/DevApps/blazorwasm2/Server/appsettings.json
+++ b/tests/DevApps/blazorwasm2/Server/appsettings.json
@@ -3,7 +3,7 @@
         "Instance": "https://login.microsoftonline.com/",
         "Domain": "msidentitysamplestesting.onmicrosoft.com",
         "TenantId": "7f58f645-c190-4ce5-9de4-e2b7acd2a6ab",
-        "ClientId": "e2fb196-50ce-4652-a4f9-26c1bf2e826b",
+        "ClientId": "1e2fb196-50ce-4652-a4f9-26c1bf2e826b",
         "CallbackPath": "/signin-oidc"
     },
     //  },
diff --git a/tests/DevApps/daemon-app/Daemon-app/Program-net60.cs b/tests/DevApps/daemon-app/Daemon-app/Program-net60.cs
index 99b74f2b5..4a48a94d7 100644
--- a/tests/DevApps/daemon-app/Daemon-app/Program-net60.cs
+++ b/tests/DevApps/daemon-app/Daemon-app/Program-net60.cs
@@ -47,7 +47,7 @@ static async Task Main(string[] args)
             // Get the token acquisition service
             ITokenAcquirerFactory tokenAcquirerFactory = app.Services.GetRequiredService<ITokenAcquirerFactory>();
             var tokenAcquirer = tokenAcquirerFactory.GetTokenAcquirer();
-            var result = await tokenAcquirer.GetTokenForAppAsync("api://e2fb196-50ce-4652-a4f9-26c1bf2e826b/.default");
+            var result = await tokenAcquirer.GetTokenForAppAsync("api://1e2fb196-50ce-4652-a4f9-26c1bf2e826b/.default");
             Console.WriteLine($"Token expires on {result.ExpiresOn}");
 
 #endif
diff --git a/tests/DevApps/daemon-app/daemon-console-calling-downstreamApi/appsettings.json b/tests/DevApps/daemon-app/daemon-console-calling-downstreamApi/appsettings.json
index b4d802cfa..07da6bbcd 100644
--- a/tests/DevApps/daemon-app/daemon-console-calling-downstreamApi/appsettings.json
+++ b/tests/DevApps/daemon-app/daemon-console-calling-downstreamApi/appsettings.json
@@ -16,6 +16,6 @@
     "BaseUrl": "https://localhost:7060/",
     "RelativePath": "/WeatherForecast",
     "RequestAppToken": true,
-    "Scopes": [ "api://e2fb196-50ce-4652-a4f9-26c1bf2e826b/.default" ]
+    "Scopes": [ "api://1e2fb196-50ce-4652-a4f9-26c1bf2e826b/.default" ]
   }
 }
diff --git a/tests/DevApps/daemon-app/minimal-web-api/appsettings.json b/tests/DevApps/daemon-app/minimal-web-api/appsettings.json
index 553d23bd2..94cce6d19 100644
--- a/tests/DevApps/daemon-app/minimal-web-api/appsettings.json
+++ b/tests/DevApps/daemon-app/minimal-web-api/appsettings.json
@@ -2,7 +2,7 @@
   "AzureAd": {
     "Instance": "https://login.microsoftonline.com/",
     "TenantId": "7f58f645-c190-4ce5-9de4-e2b7acd2a6ab",
-    "ClientId": "e2fb196-50ce-4652-a4f9-26c1bf2e826b",
+    "ClientId": "1e2fb196-50ce-4652-a4f9-26c1bf2e826b",
     "Scopes": "Weather.All",
     "TokenDecryptionCredentials": [
     ]