diff --git a/src/Components/Components.sln b/src/Components/Components.sln
index f9d4642e5c..0a909ab6e3 100644
--- a/src/Components/Components.sln
+++ b/src/Components/Components.sln
@@ -83,7 +83,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.Server", "sam
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComponentsApp.App", "samples\ComponentsApp.App\ComponentsApp.App.csproj", "{33C361D8-CAF1-47C0-A344-251AEF4FE1FE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorServerSide-CSharp", "BlazorServerSide-CSharp", "{6BDD3018-3961-488E-97D3-1FB7320A8AC6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components-CSharp", "Components-CSharp", "{6BDD3018-3961-488E-97D3-1FB7320A8AC6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.E2EPerformance", "blazor\benchmarks\Microsoft.AspNetCore.Blazor.E2EPerformance\Microsoft.AspNetCore.Blazor.E2EPerformance.csproj", "{CCEC81C4-1A3C-40DC-952F-074712C46180}"
 EndProject
@@ -105,9 +105,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Server"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorHosted-CSharp.Shared", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorHosted-CSharp\BlazorHosted-CSharp.Shared\BlazorHosted-CSharp.Shared.csproj", "{46B3D506-E351-4668-AC65-0719191B06A7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerSide-CSharp.App", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorServerSide-CSharp\BlazorServerSide-CSharp.App\BlazorServerSide-CSharp.App.csproj", "{7437B663-B5A8-43A3-9796-EE5A64B82E9E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components-CSharp.App", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\Components-CSharp\Components-CSharp.App\Components-CSharp.App.csproj", "{7437B663-B5A8-43A3-9796-EE5A64B82E9E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerSide-CSharp.Server", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorServerSide-CSharp\BlazorServerSide-CSharp.Server\BlazorServerSide-CSharp.Server.csproj", "{24DE309C-A2F5-4726-A8D8-95BB44118CD8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components-CSharp.Server", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\Components-CSharp\Components-CSharp.Server\Components-CSharp.Server.csproj", "{24DE309C-A2F5-4726-A8D8-95BB44118CD8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorStandalone-CSharp", "blazor\src\Microsoft.AspNetCore.Blazor.Templates\content\BlazorStandalone-CSharp\BlazorStandalone-CSharp.csproj", "{2F92DE29-78E9-4A04-8F4F-F8F40E02FE98}"
 EndProject
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/dotnetcli.host.json b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/dotnetcli.host.json
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/dotnetcli.host.json
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/dotnetcli.host.json
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/icon.png b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/icon.png
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/icon.png
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/icon.png
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/template.json b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/template.json
similarity index 91%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/template.json
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/template.json
index 2be54f5977..6c2215da2c 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/template.json
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/template.json
@@ -18,19 +18,19 @@
   "primaryOutputs": [
     {
       "condition": "(HostIdentifier == \"dotnetcli\" || HostIdentifier == \"dotnetcli-preview\")", 
-      "path": "BlazorServerSide-CSharp.sln"
+      "path": "Components-CSharp.sln"
     },
     {
       "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
-      "path": "BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj"
+      "path": "Components-CSharp.Server/Components-CSharp.Server.csproj"
     },
     {
       "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
-      "path": "BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj"
+      "path": "Components-CSharp.App/Components-CSharp.App.csproj"
     }
   ],
-  "shortName": "blazorserverside",
-  "sourceName": "BlazorServerSide-CSharp",
+  "shortName": "Components",
+  "sourceName": "Components-CSharp",
   "sources": [
     {
       "source": "./",
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/vs-2017.3.host.json b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/vs-2017.3.host.json
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/.template.config.src/vs-2017.3.host.json
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/.template.config.src/vs-2017.3.host.json
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/App.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/App.cshtml
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/App.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/App.cshtml
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Components-CSharp.App.csproj
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Components-CSharp.App.csproj
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/Counter.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/Counter.cshtml
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/Counter.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/Counter.cshtml
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/FetchData.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/FetchData.cshtml
similarity index 95%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/FetchData.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/FetchData.cshtml
index 3b90a13abe..5b4fafb197 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/FetchData.cshtml
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/FetchData.cshtml
@@ -1,4 +1,4 @@
-@using BlazorServerSide_CSharp.App.Services
+@using Components_CSharp.App.Services
 @page "/fetchdata"
 @inject WeatherForecastService ForecastService
 
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/Index.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/Index.cshtml
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/Index.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/Index.cshtml
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/_ViewImports.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/_ViewImports.cshtml
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Pages/_ViewImports.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Pages/_ViewImports.cshtml
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Program.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Program.cs
similarity index 91%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Program.cs
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Program.cs
index 94a0f082be..a14704e7c5 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Program.cs
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Program.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components.Hosting;
 
-namespace BlazorServerSide_CSharp.App
+namespace Components_CSharp.App
 {
     public class Program
     {
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Services/WeatherForecast.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Services/WeatherForecast.cs
similarity index 83%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Services/WeatherForecast.cs
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Services/WeatherForecast.cs
index e03bb767b9..7b740f9958 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Services/WeatherForecast.cs
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Services/WeatherForecast.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace BlazorServerSide_CSharp.App.Services
+namespace Components_CSharp.App.Services
 {
     public class WeatherForecast
     {
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Services/WeatherForecastService.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Services/WeatherForecastService.cs
similarity index 93%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Services/WeatherForecastService.cs
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Services/WeatherForecastService.cs
index 5f599b9bb4..309f539469 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Services/WeatherForecastService.cs
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Services/WeatherForecastService.cs
@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace BlazorServerSide_CSharp.App.Services
+namespace Components_CSharp.App.Services
 {
     public class WeatherForecastService
     {
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/MainLayout.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Shared/MainLayout.cshtml
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/MainLayout.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Shared/MainLayout.cshtml
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/NavMenu.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Shared/NavMenu.cshtml
similarity index 94%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/NavMenu.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Shared/NavMenu.cshtml
index 29658b4dc4..9f979e5406 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/NavMenu.cshtml
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Shared/NavMenu.cshtml
@@ -1,5 +1,5 @@
 <div class="top-row pl-4 navbar navbar-dark">
-    <a class="navbar-brand" href="">BlazorServerSide-CSharp</a>
+    <a class="navbar-brand" href="">Components-CSharp</a>
     <button class="navbar-toggler" onclick=@ToggleNavMenu>
         <span class="navbar-toggler-icon"></span>
     </button>
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/SurveyPrompt.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Shared/SurveyPrompt.cshtml
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Shared/SurveyPrompt.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Shared/SurveyPrompt.cshtml
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Startup.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Startup.cs
similarity index 86%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Startup.cs
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Startup.cs
index 41be853ba3..1b2beee8d5 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/Startup.cs
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/Startup.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Components.Builder;
 using Microsoft.Extensions.DependencyInjection;
-using BlazorServerSide_CSharp.App.Services;
+using Components_CSharp.App.Services;
 
-namespace BlazorServerSide_CSharp.App
+namespace Components_CSharp.App
 {
     public class Startup
     {
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/_ViewImports.cshtml b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/_ViewImports.cshtml
similarity index 65%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/_ViewImports.cshtml
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/_ViewImports.cshtml
index d55166f205..9b0dcb450d 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/_ViewImports.cshtml
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/_ViewImports.cshtml
@@ -2,5 +2,5 @@
 @using Microsoft.AspNetCore.Components.Layouts
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
-@using BlazorServerSide_CSharp.App
-@using BlazorServerSide_CSharp.App.Shared
+@using Components_CSharp.App
+@using Components_CSharp.App.Shared
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css.map b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css.map
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css.map
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/bootstrap/bootstrap.min.css.map
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/FONT-LICENSE b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/FONT-LICENSE
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/FONT-LICENSE
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/FONT-LICENSE
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/ICON-LICENSE b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/ICON-LICENSE
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/ICON-LICENSE
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/ICON-LICENSE
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/README.md b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/README.md
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/README.md
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/README.md
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.eot
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.otf
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.svg
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/open-iconic/font/fonts/open-iconic.woff
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/site.css b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/site.css
similarity index 100%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/css/site.css
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/css/site.css
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/index.html b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/index.html
similarity index 89%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/index.html
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/index.html
index 88c6da7856..d6070128af 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/wwwroot/index.html
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.App/wwwroot/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width">
-    <title>BlazorServerSide-CSharp</title>
+    <title>Components-CSharp</title>
     <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <link href="css/site.css" rel="stylesheet" />
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Components-CSharp.Server.csproj
similarity index 87%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Components-CSharp.Server.csproj
index 03d5d75f6f..93388159b2 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Components-CSharp.Server.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BlazorServerSide-CSharp.App\BlazorServerSide-CSharp.App.csproj" />
+    <ProjectReference Include="..\Components-CSharp.App\Components-CSharp.App.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Program.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Program.cs
similarity index 93%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Program.cs
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Program.cs
index 5dcea0e595..bd899069b9 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Program.cs
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Program.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 
-namespace BlazorServerSide_CSharp.Server
+namespace Components_CSharp.Server
 {
     public class Program
     {
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Startup.cs b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Startup.cs
similarity index 97%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Startup.cs
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Startup.cs
index 67dc66b8e1..82a67af44e 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/Startup.cs
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.Server/Startup.cs
@@ -6,7 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
 using System.Linq;
 using System.Net.Mime;
 
-namespace BlazorServerSide_CSharp.Server
+namespace Components_CSharp.Server
 {
     public class Startup
     {
diff --git a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.sln b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.sln
similarity index 87%
rename from src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.sln
rename to src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.sln
index c0ba0fd5ba..dd94fc128d 100644
--- a/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.sln
+++ b/src/Components/blazor/src/Microsoft.AspNetCore.Blazor.Templates/content/Components-CSharp/Components-CSharp.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerSide-CSharp.Server", "BlazorServerSide-CSharp.Server\BlazorServerSide-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components-CSharp.Server", "Components-CSharp.Server\Components-CSharp.Server.csproj", "{650B3CE7-2E93-4CC4-9F46-466686815EAA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServerSide-CSharp.App", "BlazorServerSide-CSharp.App\BlazorServerSide-CSharp.App.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components-CSharp.App", "Components-CSharp.App\Components-CSharp.App.csproj", "{5990939C-7E7B-4CFA-86FF-44CA5756498A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution