diff --git a/samples/StandaloneApp/App.cshtml b/samples/StandaloneApp/App.cshtml
index e7bed1320d..c115391ee3 100644
--- a/samples/StandaloneApp/App.cshtml
+++ b/samples/StandaloneApp/App.cshtml
@@ -1,8 +1,8 @@
-@using Microsoft.AspNetCore.Blazor.Browser.Routing
+@using Microsoft.AspNetCore.Blazor.Routing
 <!--
     Configuring this stuff here is temporary. Later we'll move the app config
     into Program.cs, and it won't be necessary to specify AppAssembly.
 -->
-<c:BrowserRouter
+<c:Router
     AppAssembly=@(typeof(StandaloneApp.Program).Assembly)
     PagesNamespace=@("StandaloneApp.Pages") />
diff --git a/src/Microsoft.AspNetCore.Blazor.Browser/Routing/BrowserRouter.cs b/src/Microsoft.AspNetCore.Blazor/Routing/Router.cs
similarity index 95%
rename from src/Microsoft.AspNetCore.Blazor.Browser/Routing/BrowserRouter.cs
rename to src/Microsoft.AspNetCore.Blazor/Routing/Router.cs
index e7cb7b8329..4691689ed5 100644
--- a/src/Microsoft.AspNetCore.Blazor.Browser/Routing/BrowserRouter.cs
+++ b/src/Microsoft.AspNetCore.Blazor/Routing/Router.cs
@@ -9,13 +9,13 @@ using Microsoft.AspNetCore.Blazor.Layouts;
 using Microsoft.AspNetCore.Blazor.RenderTree;
 using Microsoft.AspNetCore.Blazor.Services;
 
-namespace Microsoft.AspNetCore.Blazor.Browser.Routing
+namespace Microsoft.AspNetCore.Blazor.Routing
 {
     /// <summary>
     /// A component that displays whichever other component corresponds to the
-    /// browser's changing navigation state.
+    /// current navigation location.
     /// </summary>
-    public class BrowserRouter : IComponent, IDisposable
+    public class Router : IComponent, IDisposable
     {
         static readonly char[] _queryOrHashStartChar = new[] { '?', '#' };
 
@@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Routing
             }
 
             return FindComponentTypeInAssemblyOrReferences(AppAssembly, componentTypeName)
-                ?? throw new InvalidOperationException($"{nameof(BrowserRouter)} cannot find any component type with name {componentTypeName}.");
+                ?? throw new InvalidOperationException($"{nameof(Router)} cannot find any component type with name {componentTypeName}.");
         }
 
         private string StringUntilAny(string str, char[] chars)
diff --git a/test/testapps/BasicTestApp/RouterTest/TestRouter.cshtml b/test/testapps/BasicTestApp/RouterTest/TestRouter.cshtml
index 9a5cb63bbb..c628df304d 100644
--- a/test/testapps/BasicTestApp/RouterTest/TestRouter.cshtml
+++ b/test/testapps/BasicTestApp/RouterTest/TestRouter.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Blazor.Browser.Routing
-<c:BrowserRouter AppAssembly=@(typeof(BasicTestApp.Program).Assembly)
+@using Microsoft.AspNetCore.Blazor.Routing
+<c:Router AppAssembly=@(typeof(BasicTestApp.Program).Assembly)
                  PagesNamespace=@nameof(BasicTestApp)
                  DefaultComponentName=@("Default") />