diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/App.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/App.cshtml
index 0618d02adb..59be8326e1 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/App.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/App.cshtml
@@ -1,6 +1,5 @@
 <!--
-    Configuring this stuff here is temporary. Later we'll move the app config
+    Configuring this here is temporary. Later we'll move the app config
     into Program.cs, and it won't be necessary to specify AppAssembly.
 -->
-<Router AppAssembly=typeof(Program).Assembly
-        PagesNamespace="BlazorHosted.CSharp.Client.Pages" />
+<Router AppAssembly=typeof(Program).Assembly />
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml
index 88367f46fa..3677204440 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml
@@ -1,4 +1,5 @@
-<h1>Counter</h1>
+@page "/counter"
+<h1>Counter</h1>
 
 <p>Current count: @currentCount</p>
 
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml
index 86eecd2911..3e93b74450 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml
@@ -1,4 +1,5 @@
 @using BlazorHosted.CSharp.Shared
+@page "/fetchdata"
 @inject HttpClient Http
 
 <h1>Weather forecast</h1>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Index.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Index.cshtml
index f75a462181..86eb281395 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Index.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Index.cshtml
@@ -1,3 +1,4 @@
-<h1>Hello, world!</h1>
+@page "/"
+<h1>Hello, world!</h1>
 
 Welcome to your new app.
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/App.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/App.cshtml
index 78267a4bf4..59be8326e1 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/App.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/App.cshtml
@@ -1,6 +1,5 @@
 <!--
-    Configuring this stuff here is temporary. Later we'll move the app config
+    Configuring this here is temporary. Later we'll move the app config
     into Program.cs, and it won't be necessary to specify AppAssembly.
 -->
-<Router AppAssembly=typeof(Program).Assembly
-        PagesNamespace="BlazorStandalone.CSharp.Pages" />
+<Router AppAssembly=typeof(Program).Assembly />
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml
index 88367f46fa..3677204440 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml
@@ -1,4 +1,5 @@
-<h1>Counter</h1>
+@page "/counter"
+<h1>Counter</h1>
 
 <p>Current count: @currentCount</p>
 
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml
index 4c65fb0c2a..4c87bda9f6 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml
@@ -1,4 +1,5 @@
-@inject HttpClient Http
+@page "/fetchdata"
+@inject HttpClient Http
 
 <h1>Weather forecast</h1>
 
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Index.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Index.cshtml
index f75a462181..86eb281395 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Index.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Index.cshtml
@@ -1,3 +1,4 @@
-<h1>Hello, world!</h1>
+@page "/"
+<h1>Hello, world!</h1>
 
 Welcome to your new app.