diff --git a/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs b/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs
index 440b5555c4..5cfb93db14 100644
--- a/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs
+++ b/src/Microsoft.AspNetCore.Blazor.DevHost/Server/Startup.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Blazor.DevHost.Server
             app.UseDeveloperExceptionPage();
 
             var clientAssemblyPath = FindClientAssemblyPath(app);
-            app.UseBlazorInternal(clientAssemblyPath);
+            app.UseBlazor(new BlazorOptions { ClientAssemblyPath = clientAssemblyPath });
         }
 
         private static string FindClientAssemblyPath(IApplicationBuilder app)
diff --git a/src/Microsoft.AspNetCore.Blazor.Server/BlazorOptions.cs b/src/Microsoft.AspNetCore.Blazor.Server/BlazorOptions.cs
index d6556dbc27..6950cf0b0a 100644
--- a/src/Microsoft.AspNetCore.Blazor.Server/BlazorOptions.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Server/BlazorOptions.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Microsoft.AspNetCore.Blazor.Server
+namespace Microsoft.AspNetCore.Builder
 {
     public class BlazorOptions
     {