diff --git a/samples/MicroserviceDemo/MicroserviceDemo.sln b/samples/MicroserviceDemo/MicroserviceDemo.sln
index d1ba77ae26..9e74740ca4 100644
--- a/samples/MicroserviceDemo/MicroserviceDemo.sln
+++ b/samples/MicroserviceDemo/MicroserviceDemo.sln
@@ -57,9 +57,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gateways", "gateways", "{61
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PublicWebSiteGateway.Host", "gateways\PublicWebSiteGateway.Host\PublicWebSiteGateway.Host.csproj", "{D48F6DDC-4AFC-4554-86B1-7763C0679B59}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackendAdminAppGateway", "gateways\BackendAdminAppGateway\BackendAdminAppGateway.csproj", "{E59141DB-9DDC-433E-B442-ABE63BF4724A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackendAdminAppGateway.Host", "gateways\BackendAdminAppGateway.Host\BackendAdminAppGateway.Host.csproj", "{BD4ABDEA-2F09-4CB4-855F-B06C307A352E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InternalGateway", "gateways\InternalGateway\InternalGateway.csproj", "{92A2EAAE-CC45-420F-9853-F8F2F0D9C32E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InternalGateway.Host", "gateways\InternalGateway.Host\InternalGateway.Host.csproj", "{EAE8C1F5-C8D0-4132-A8CB-D374F2C363E2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -147,14 +147,14 @@ Global
 		{D48F6DDC-4AFC-4554-86B1-7763C0679B59}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D48F6DDC-4AFC-4554-86B1-7763C0679B59}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D48F6DDC-4AFC-4554-86B1-7763C0679B59}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E59141DB-9DDC-433E-B442-ABE63BF4724A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E59141DB-9DDC-433E-B442-ABE63BF4724A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E59141DB-9DDC-433E-B442-ABE63BF4724A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E59141DB-9DDC-433E-B442-ABE63BF4724A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{92A2EAAE-CC45-420F-9853-F8F2F0D9C32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92A2EAAE-CC45-420F-9853-F8F2F0D9C32E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92A2EAAE-CC45-420F-9853-F8F2F0D9C32E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92A2EAAE-CC45-420F-9853-F8F2F0D9C32E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD4ABDEA-2F09-4CB4-855F-B06C307A352E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD4ABDEA-2F09-4CB4-855F-B06C307A352E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD4ABDEA-2F09-4CB4-855F-B06C307A352E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD4ABDEA-2F09-4CB4-855F-B06C307A352E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAE8C1F5-C8D0-4132-A8CB-D374F2C363E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAE8C1F5-C8D0-4132-A8CB-D374F2C363E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAE8C1F5-C8D0-4132-A8CB-D374F2C363E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAE8C1F5-C8D0-4132-A8CB-D374F2C363E2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -183,8 +183,8 @@ Global
 		{BBB502EC-0E3B-4C21-B8E6-59BFFBAC2055} = {8F6834D7-E6FA-4A04-83BB-955F68EA0A0A}
 		{61533609-BFF9-4B12-AB33-470FD65E326F} = {3B26D176-390B-4F51-BE52-E9B422C28A88}
 		{D48F6DDC-4AFC-4554-86B1-7763C0679B59} = {617037ED-34E3-49A2-8958-BE2013E2D151}
-		{E59141DB-9DDC-433E-B442-ABE63BF4724A} = {617037ED-34E3-49A2-8958-BE2013E2D151}
-		{92A2EAAE-CC45-420F-9853-F8F2F0D9C32E} = {617037ED-34E3-49A2-8958-BE2013E2D151}
+		{BD4ABDEA-2F09-4CB4-855F-B06C307A352E} = {617037ED-34E3-49A2-8958-BE2013E2D151}
+		{EAE8C1F5-C8D0-4132-A8CB-D374F2C363E2} = {617037ED-34E3-49A2-8958-BE2013E2D151}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {37474F0D-2E52-4D2F-B39B-7FE3FF31B4EC}
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/BackendAdminAppGateway.csproj b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj
similarity index 100%
rename from samples/MicroserviceDemo/gateways/BackendAdminAppGateway/BackendAdminAppGateway.csproj
rename to samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Program.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
similarity index 93%
rename from samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Program.cs
rename to samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
index 4b91bf5d39..453e54f19e 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Program.cs
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Program.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace BackendAdminAppGateway
+namespace BackendAdminAppGateway.Host
 {
     public class Program
     {
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Properties/launchSettings.json b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Properties/launchSettings.json
similarity index 86%
rename from samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Properties/launchSettings.json
rename to samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Properties/launchSettings.json
index 78dd5a43f7..981961f411 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "windowsAuthentication": false, 
     "anonymousAuthentication": true, 
     "iisExpress": {
-      "applicationUrl": "http://localhost:64909",
+      "applicationUrl": "http://localhost:65115",
       "sslPort": 0
     }
   },
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "BackendAdminAppGateway": {
+    "BackendAdminAppGateway.Host": {
       "commandName": "Project",
       "launchBrowser": true,
       "applicationUrl": "http://localhost:5000",
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Startup.cs b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs
similarity index 96%
rename from samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Startup.cs
rename to samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs
index a307622dca..fa24a0a687 100644
--- a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/Startup.cs
+++ b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/Startup.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace BackendAdminAppGateway
+namespace BackendAdminAppGateway.Host
 {
     public class Startup
     {
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/appsettings.Development.json b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.Development.json
similarity index 100%
rename from samples/MicroserviceDemo/gateways/BackendAdminAppGateway/appsettings.Development.json
rename to samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.Development.json
diff --git a/samples/MicroserviceDemo/gateways/BackendAdminAppGateway/appsettings.json b/samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.json
similarity index 100%
rename from samples/MicroserviceDemo/gateways/BackendAdminAppGateway/appsettings.json
rename to samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/appsettings.json
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway/InternalGateway.csproj b/samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj
similarity index 100%
rename from samples/MicroserviceDemo/gateways/InternalGateway/InternalGateway.csproj
rename to samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway/Program.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
similarity index 94%
rename from samples/MicroserviceDemo/gateways/InternalGateway/Program.cs
rename to samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
index 697f8f6128..b67ed22456 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway/Program.cs
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Program.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 
-namespace InternalGateway
+namespace InternalGateway.Host
 {
     public class Program
     {
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway/Properties/launchSettings.json b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Properties/launchSettings.json
similarity index 87%
rename from samples/MicroserviceDemo/gateways/InternalGateway/Properties/launchSettings.json
rename to samples/MicroserviceDemo/gateways/InternalGateway.Host/Properties/launchSettings.json
index abc04a8f28..f65859f468 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway/Properties/launchSettings.json
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "windowsAuthentication": false, 
     "anonymousAuthentication": true, 
     "iisExpress": {
-      "applicationUrl": "http://localhost:65042",
+      "applicationUrl": "http://localhost:65129",
       "sslPort": 0
     }
   },
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "InternalGateway": {
+    "InternalGateway.Host": {
       "commandName": "Project",
       "launchBrowser": true,
       "applicationUrl": "http://localhost:5000",
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway/Startup.cs b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs
similarity index 97%
rename from samples/MicroserviceDemo/gateways/InternalGateway/Startup.cs
rename to samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs
index 65e4e70f40..2546a72532 100644
--- a/samples/MicroserviceDemo/gateways/InternalGateway/Startup.cs
+++ b/samples/MicroserviceDemo/gateways/InternalGateway.Host/Startup.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace InternalGateway
+namespace InternalGateway.Host
 {
     public class Startup
     {
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway/appsettings.Development.json b/samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.Development.json
similarity index 100%
rename from samples/MicroserviceDemo/gateways/InternalGateway/appsettings.Development.json
rename to samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.Development.json
diff --git a/samples/MicroserviceDemo/gateways/InternalGateway/appsettings.json b/samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.json
similarity index 100%
rename from samples/MicroserviceDemo/gateways/InternalGateway/appsettings.json
rename to samples/MicroserviceDemo/gateways/InternalGateway.Host/appsettings.json