diff --git a/docker-compose.yml b/docker-compose.yml
index ae7a7faa0..18372f23e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -142,5 +142,5 @@ services:
     image: eshop/webshoppingagg
     build:
       context: .
-      dockerfile: src/Aggregators/Mobile.Shopping.HttpAggregator/Dockerfile
+      dockerfile: src/Aggregators/Web.Shopping.HttpAggregator/Dockerfile
 
diff --git a/src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs b/src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs
index 083839bd5..73b736519 100644
--- a/src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs
+++ b/src/Aggregators/Mobile.Shopping.HttpAggregator/Startup.cs
@@ -47,9 +47,9 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
                 options.DescribeAllEnumsAsStrings();
                 options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info
                 {
-                    Title = "Purchase BFF API Gateway",
+                    Title = "Shopping Aggregator for Mobile Clients",
                     Version = "v1",
-                    Description = "BFF API Gateway for Purchase features",
+                    Description = "Shopping Aggregator for Mobile Clients",
                     TermsOfService = "Terms Of Service"
                 });
 
@@ -61,7 +61,7 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
                     TokenUrl = $"{Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token",
                     Scopes = new Dictionary<string, string>()
                     {
-                        { "mobileshoppingagg", "Purchase BFF API Gateway" }
+                        { "mobileshoppingagg", "Shopping Aggregator for Mobile Clients" }
                     }
                 });
 
diff --git a/src/Aggregators/Web.Shopping.HttpAggregator/Startup.cs b/src/Aggregators/Web.Shopping.HttpAggregator/Startup.cs
index 79b9bc77b..17f9f90e6 100644
--- a/src/Aggregators/Web.Shopping.HttpAggregator/Startup.cs
+++ b/src/Aggregators/Web.Shopping.HttpAggregator/Startup.cs
@@ -47,9 +47,9 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
                 options.DescribeAllEnumsAsStrings();
                 options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info
                 {
-                    Title = "Purchase BFF API Gateway",
+                    Title = "Shopping Aggregator for Web Clients",
                     Version = "v1",
-                    Description = "BFF API Gateway for Purchase features",
+                    Description = "Shopping Aggregator for Web Clients",
                     TermsOfService = "Terms Of Service"
                 });
 
@@ -61,7 +61,7 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
                     TokenUrl = $"{Configuration.GetValue<string>("IdentityUrlExternal")}/connect/token",
                     Scopes = new Dictionary<string, string>()
                     {
-                        { "webshoppingagg", "Purchase BFF API Gateway" }
+                        { "webshoppingagg", "Shopping Aggregator for Web Clients" }
                     }
                 });
 
diff --git a/src/Services/Identity/Identity.API/Configuration/Config.cs b/src/Services/Identity/Identity.API/Configuration/Config.cs
index 6aed6120d..3bc705995 100644
--- a/src/Services/Identity/Identity.API/Configuration/Config.cs
+++ b/src/Services/Identity/Identity.API/Configuration/Config.cs
@@ -16,7 +16,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API.Configuration
                 new ApiResource("marketing", "Marketing Service"),
                 new ApiResource("locations", "Locations Service"),
                 new ApiResource("mobileshoppingagg", "Mobile Shopping Aggregator"),
-                new ApiResource("Webshoppingagg", "Web Shopping Aggregator")
+                new ApiResource("webshoppingagg", "Web Shopping Aggregator")
             };
         }
 
diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs
index 385a007c3..b1dd6580a 100644
--- a/src/Web/WebMVC/Startup.cs
+++ b/src/Web/WebMVC/Startup.cs
@@ -130,7 +130,6 @@ namespace Microsoft.eShopOnContainers.WebMVC
                 options.Scope.Add("basket");
                 options.Scope.Add("marketing");
                 options.Scope.Add("locations");
-                options.Scope.Add("mobileshoppingagg");
                 options.Scope.Add("webshoppingagg");
             });
         }
diff --git a/src/Web/WebSPA/Client/modules/shared/services/security.service.ts b/src/Web/WebSPA/Client/modules/shared/services/security.service.ts
index c2ac8e5e2..45007b5d1 100644
--- a/src/Web/WebSPA/Client/modules/shared/services/security.service.ts
+++ b/src/Web/WebSPA/Client/modules/shared/services/security.service.ts
@@ -82,7 +82,7 @@ export class SecurityService {
         let client_id = 'js';
         let redirect_uri = location.origin + '/';
         let response_type = 'id_token token';
-        let scope = 'openid profile orders basket marketing locations mobileshoppingagg';
+        let scope = 'openid profile orders basket marketing locations webshoppingagg';
         let nonce = 'N' + Math.random() + '' + Date.now();
         let state = Date.now() + '' + Math.random();