diff --git a/Blazor.sln b/Blazor.sln
index 811a604b46..cf9d4db9db 100644
--- a/Blazor.sln
+++ b/Blazor.sln
@@ -30,8 +30,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.Browser",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.DevHost", "src\Microsoft.Blazor.DevHost\Microsoft.Blazor.DevHost.csproj", "{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorStandalone", "samples\BlazorStandalone\BlazorStandalone.csproj", "{754BBACA-E05B-4DAE-ACFC-1B3B429AE43F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Blazor.BuildTools", "src\Microsoft.Blazor.BuildTools\Microsoft.Blazor.BuildTools.csproj", "{BB34336F-E68E-4411-9805-CAAA919F5EA1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostedInAspNet", "HostedInAspNet", "{4D367450-96E9-4C8C-8B56-EED8ADE3A20D}"
@@ -42,6 +40,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Server", "sa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Blazor", "src\Microsoft.Blazor\Microsoft.Blazor.csproj", "{7FD8C650-74B3-4153-AEA1-00F4F6AF393D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "samples\StandaloneApp\StandaloneApp.csproj", "{B241434A-1642-44CC-AE9A-2012B5C5BD02}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -80,10 +80,6 @@ Global
 		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{754BBACA-E05B-4DAE-ACFC-1B3B429AE43F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{754BBACA-E05B-4DAE-ACFC-1B3B429AE43F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{754BBACA-E05B-4DAE-ACFC-1B3B429AE43F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{754BBACA-E05B-4DAE-ACFC-1B3B429AE43F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB34336F-E68E-4411-9805-CAAA919F5EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BB34336F-E68E-4411-9805-CAAA919F5EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB34336F-E68E-4411-9805-CAAA919F5EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -100,6 +96,10 @@ Global
 		{7FD8C650-74B3-4153-AEA1-00F4F6AF393D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7FD8C650-74B3-4153-AEA1-00F4F6AF393D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FD8C650-74B3-4153-AEA1-00F4F6AF393D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B241434A-1642-44CC-AE9A-2012B5C5BD02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B241434A-1642-44CC-AE9A-2012B5C5BD02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B241434A-1642-44CC-AE9A-2012B5C5BD02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B241434A-1642-44CC-AE9A-2012B5C5BD02}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -114,12 +114,12 @@ Global
 		{06AAAE9E-96DE-4574-97DA-9C4C7D9FE990} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA}
 		{58D2DF2E-4181-4B16-9C69-A3F3EDB89B28} = {B867E038-B3CE-43E3-9292-61568C46CDEB}
 		{EE690312-2353-4DD0-9250-EE5EDAC6D4F7} = {B867E038-B3CE-43E3-9292-61568C46CDEB}
-		{754BBACA-E05B-4DAE-ACFC-1B3B429AE43F} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA}
 		{BB34336F-E68E-4411-9805-CAAA919F5EA1} = {B867E038-B3CE-43E3-9292-61568C46CDEB}
 		{4D367450-96E9-4C8C-8B56-EED8ADE3A20D} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA}
 		{B4335F7C-4E86-4559-821F-F1B1C75F5FAE} = {4D367450-96E9-4C8C-8B56-EED8ADE3A20D}
 		{F8996835-41F7-4663-91DF-3B5652ADC37D} = {4D367450-96E9-4C8C-8B56-EED8ADE3A20D}
 		{7FD8C650-74B3-4153-AEA1-00F4F6AF393D} = {B867E038-B3CE-43E3-9292-61568C46CDEB}
+		{B241434A-1642-44CC-AE9A-2012B5C5BD02} = {F5FDD4E5-6A52-4A86-BE5E-5E42CB1DC8DA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {504DA352-6788-4DC0-8705-82167E72A4D3}
diff --git a/samples/BlazorStandalone/Program.cs b/samples/StandaloneApp/Program.cs
similarity index 92%
rename from samples/BlazorStandalone/Program.cs
rename to samples/StandaloneApp/Program.cs
index 9ef94e93a5..a439e0def1 100644
--- a/samples/BlazorStandalone/Program.cs
+++ b/samples/StandaloneApp/Program.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace BlazorStandalone
+namespace StandaloneApp
 {
     public class Program
     {
diff --git a/samples/BlazorStandalone/Properties/launchSettings.json b/samples/StandaloneApp/Properties/launchSettings.json
similarity index 95%
rename from samples/BlazorStandalone/Properties/launchSettings.json
rename to samples/StandaloneApp/Properties/launchSettings.json
index 310cc2ccd5..d8ef188be3 100644
--- a/samples/BlazorStandalone/Properties/launchSettings.json
+++ b/samples/StandaloneApp/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "BlazorStandalone": {
+    "StandaloneApp": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
diff --git a/samples/BlazorStandalone/BlazorStandalone.csproj b/samples/StandaloneApp/StandaloneApp.csproj
similarity index 100%
rename from samples/BlazorStandalone/BlazorStandalone.csproj
rename to samples/StandaloneApp/StandaloneApp.csproj
diff --git a/samples/BlazorStandalone/wwwroot/index.html b/samples/StandaloneApp/wwwroot/index.html
similarity index 100%
rename from samples/BlazorStandalone/wwwroot/index.html
rename to samples/StandaloneApp/wwwroot/index.html
diff --git a/test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj b/test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj
index b7684c3b03..14e05aa106 100644
--- a/test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj
+++ b/test/Microsoft.Blazor.E2ETest/Microsoft.Blazor.E2ETest.csproj
@@ -16,9 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\samples\BlazorStandalone\BlazorStandalone.csproj" />
     <ProjectReference Include="..\..\samples\HostedInAspNet.Server\HostedInAspNet.Server.csproj" />
     <ProjectReference Include="..\..\samples\MonoSanity\MonoSanity.csproj" />
+    <ProjectReference Include="..\..\samples\StandaloneApp\StandaloneApp.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.Blazor.DevHost\Microsoft.Blazor.DevHost.csproj" />
   </ItemGroup>
 
diff --git a/test/Microsoft.Blazor.E2ETest/Tests/BlazorStandaloneTest.cs b/test/Microsoft.Blazor.E2ETest/Tests/StandaloneAppTest.cs
similarity index 70%
rename from test/Microsoft.Blazor.E2ETest/Tests/BlazorStandaloneTest.cs
rename to test/Microsoft.Blazor.E2ETest/Tests/StandaloneAppTest.cs
index c403c6838c..28e36d964d 100644
--- a/test/Microsoft.Blazor.E2ETest/Tests/BlazorStandaloneTest.cs
+++ b/test/Microsoft.Blazor.E2ETest/Tests/StandaloneAppTest.cs
@@ -7,10 +7,10 @@ using Xunit;
 
 namespace Microsoft.Blazor.E2ETest.Tests
 {
-    public class BlazorStandaloneTest
-        : ServerTestBase<DevHostServerFixture<BlazorStandalone.Program>>
+    public class StandaloneAppTest
+        : ServerTestBase<DevHostServerFixture<StandaloneApp.Program>>
     {
-        public BlazorStandaloneTest(BrowserFixture browserFixture, DevHostServerFixture<BlazorStandalone.Program> serverFixture)
+        public StandaloneAppTest(BrowserFixture browserFixture, DevHostServerFixture<StandaloneApp.Program> serverFixture)
             : base(browserFixture, serverFixture)
         {
         }