diff --git a/Mvc.sln b/Mvc.sln
index b4b3d90231..0664e78c78 100644
--- a/Mvc.sln
+++ b/Mvc.sln
@@ -60,7 +60,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ConnegWebsite", "test\WebSites\ConnegWebSite\ConnegWebsite.kproj", "{C6E5AFFA-890A-448F-8DE3-878B1D3C9FC7}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ContentNegotiationWebSite", "test\WebSites\ContentNegotiationWebSite\ContentNegotiationWebSite.kproj", "{C6E5AFFA-890A-448F-8DE3-878B1D3C9FC7}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AntiForgeryWebSite", "test\WebSites\AntiForgeryWebSite\AntiForgeryWebSite.kproj", "{A353B17E-A940-4CE8-8BF9-179E24A9041F}"
 EndProject
@@ -78,7 +78,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TagHelpersWebSite", "test\W
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FilesWebSite", "test\WebSites\FilesWebSite\FilesWebSite.kproj", "{0EF9860B-10D7-452F-B0F4-A405B88BEBB3}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorInstrumentationWebSite", "test\WebSites\RazorInstrumentationWebSite\RazorInstrumentationWebSite.kproj", "{2B2B9876-903C-4065-8D62-2EE832BBA106}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorPageExecutionInstrumentationWebSite", "test\WebSites\RazorPageExecutionInstrumentationWebSite\RazorPageExecutionInstrumentationWebSite.kproj", "{2B2B9876-903C-4065-8D62-2EE832BBA106}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ApplicationModelWebSite", "test\WebSites\ApplicationModelWebSite\ApplicationModelWebSite.kproj", "{CAE52CB7-0FAC-4B5B-8251-B0FF837DB657}"
 EndProject
@@ -100,7 +100,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PrecompilationWebSite", "te
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RequestServicesWebSite", "test\WebSites\RequestServicesWebSite\RequestServicesWebSite.kproj", "{F12E9CF0-4958-40C6-A6CD-759185157F84}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorViewEngineOptionsWebsite", "test\WebSites\RazorViewEngineOptionsWebsite\RazorViewEngineOptionsWebsite.kproj", "{B18ADE62-35DE-4A06-8E1D-EDD6245F7F4D}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorEmbeddedViewsWebSite", "test\WebSites\RazorEmbeddedViewsWebSite\RazorEmbeddedViewsWebSite.kproj", "{B18ADE62-35DE-4A06-8E1D-EDD6245F7F4D}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CompositeViewEngineWebSite", "test\WebSites\CompositeViewEngineWebSite\CompositeViewEngineWebSite.kproj", "{A853B2BA-4449-4908-A416-5A3C027FC22B}"
 EndProject
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ContentNegotiationTest.cs
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/ContentNegotiationTest.cs
index 61a09e159b..c6017fdcc7 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ContentNegotiationTest.cs
@@ -11,7 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using System.Xml.Serialization;
-using ConnegWebSite;
+using ContentNegotiationWebSite;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.TestHost;
 using Microsoft.AspNet.Mvc.Xml;
@@ -19,9 +19,9 @@ using Xunit;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
-    public class ConnegTests
+    public class ContentNegotiationTest
     {
-        private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ConnegWebSite));
+        private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ContentNegotiationWebSite));
         private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
 
         [Fact]
@@ -124,7 +124,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
             var expectedContentType = MediaTypeHeaderValue.Parse("application/xml;charset=utf-8");
             var expectedOutput = "<User xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\" " +
-                                "xmlns=\"http://schemas.datacontract.org/2004/07/ConnegWebSite\">" +
+                                "xmlns=\"http://schemas.datacontract.org/2004/07/ContentNegotiationWebSite\">" +
                                 "<Address>One Microsoft Way</Address><Name>John</Name></User>";
 
             // Act
@@ -374,7 +374,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             client.DefaultRequestHeaders.AcceptCharset.Add(new StringWithQualityHeaderValue("utf-8"));
             var expectedContentType = MediaTypeHeaderValue.Parse("application/xml;charset=utf-8");
             var expectedBody = @"<User xmlns:i=""http://www.w3.org/2001/XMLSchema-instance"" " +
-                                @"xmlns=""http://schemas.datacontract.org/2004/07/ConnegWebSite""><Address>"
+                                @"xmlns=""http://schemas.datacontract.org/2004/07/ContentNegotiationWebSite""><Address>"
                                 + @"One Microsoft Way</Address><Name>John</Name></User>";
 
             for (int i = 0; i < 5; i++)
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormatterTest.cs
index ffa3a3f69f..1523e53045 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormatterTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormatterTest.cs
@@ -5,7 +5,7 @@ using System;
 using System.Net;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-using ConnegWebSite;
+using ContentNegotiationWebSite;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.TestHost;
 using Xunit;
@@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
     public class OutputFormatterTest
     {
-        private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ConnegWebSite));
+        private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ContentNegotiationWebSite));
         private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
 
         [Theory]
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorViewEngineOptionsTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorEmbeddedViewsTest.cs
similarity index 79%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/RazorViewEngineOptionsTest.cs
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/RazorEmbeddedViewsTest.cs
index e792016413..7fbd6dbac5 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorViewEngineOptionsTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorEmbeddedViewsTest.cs
@@ -5,26 +5,26 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.TestHost;
-using RazorViewEngineOptionsWebsite;
+using RazorEmbeddedViewsWebSite;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
-    public class RazorViewEngineOptionsTest
+    public class RazorEmbeddedViewsTest
     {
-        private readonly IServiceProvider _services = TestHelper.CreateServices(nameof(RazorViewEngineOptionsWebsite));
+        private readonly IServiceProvider _services = TestHelper.CreateServices(nameof(RazorEmbeddedViewsWebSite));
         private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
 
         [Fact]
         public async Task RazorViewEngine_UsesFileProviderOnViewEngineOptionsToLocateViews()
         {
             // Arrange
-            var expectedMessage = "Hello test-user, this is /RazorViewEngineOptions_Home";
+            var expectedMessage = "Hello test-user, this is /RazorEmbeddedViews_Home";
             var server = TestServer.Create(_services, _app);
             var client = server.CreateClient();
 
             // Act
-            var response = await client.GetStringAsync("http://localhost/RazorViewEngineOptions_Home?User=test-user");
+            var response = await client.GetStringAsync("http://localhost/RazorEmbeddedViews_Home?User=test-user");
 
             // Assert
             Assert.Equal(expectedMessage, response);
@@ -34,10 +34,10 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         public async Task RazorViewEngine_UsesFileProviderOnViewEngineOptionsToLocateAreaViews()
         {
             // Arrange
-            var expectedMessage = "Hello admin-user, this is /Restricted/RazorViewEngineOptions_Admin/Login";
+            var expectedMessage = "Hello admin-user, this is /Restricted/RazorEmbeddedViews_Admin/Login";
             var server = TestServer.Create(_services, _app);
             var client = server.CreateClient();
-            var target = "http://localhost/Restricted/RazorViewEngineOptions_Admin/Login?AdminUser=admin-user";
+            var target = "http://localhost/Restricted/RazorEmbeddedViews_Admin/Login?AdminUser=admin-user";
 
             // Act
             var response = await client.GetStringAsync(target);
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorInstrumentationTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs
similarity index 97%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/RazorInstrumentationTests.cs
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs
index 9b5d8e6273..124109e286 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorInstrumentationTests.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RazorPageExecutionInstrumentationTest.cs
@@ -7,14 +7,14 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.TestHost;
 using Microsoft.Framework.DependencyInjection;
-using RazorInstrumentationWebSite;
+using RazorPageExecutionInstrumentationWebSite;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
-    public class RazorInstrumentationTests
+    public class RazorPageExecutionInstrumentationTest
     {
-        private readonly IServiceProvider _services = TestHelper.CreateServices("RazorInstrumentationWebsite");
+        private readonly IServiceProvider _services = TestHelper.CreateServices(nameof(RazorPageExecutionInstrumentationWebSite));
         private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
 
         public static IEnumerable<object[]> InstrumentationData
@@ -208,7 +208,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         {
             var services = new ServiceCollection();
             services.AddInstance(pageExecutionContext);
-            return TestHelper.CreateServices("RazorInstrumentationWebsite", services);
+            return TestHelper.CreateServices(nameof(RazorPageExecutionInstrumentationWebSite), services);
         }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
index 8ae75c9d8a..a5ec57df6e 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
@@ -17,7 +17,7 @@
         "BasicWebSite": "1.0.0",
         "BestEffortLinkGenerationWebSite": "1.0.0",
         "CompositeViewEngineWebSite": "1.0.0",
-        "ConnegWebSite": "1.0.0",
+        "ContentNegotiationWebSite": "1.0.0",
         "ControllerDiscoveryConventionsWebSite": "1.0.0",
         "ControllersFromServicesWebSite": "1.0.0",
         "CustomRouteWebSite": "1.0.0",
@@ -29,16 +29,23 @@
         "InlineConstraintsWebSite": "1.0.0",
         "LoggingWebSite": "1.0.0",        
         "LowercaseUrlsWebSite": "1.0.0-*",
+        "Microsoft.AspNet.Mvc": "6.0.0-*",
+        "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0",
+        "Microsoft.AspNet.Mvc.Xml": "6.0.0-*",
+        "Microsoft.AspNet.TestHost": "1.0.0-*",
+        "Microsoft.AspNet.WebUtilities": "1.0.0-*",
+        "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
         "ModelBindingWebSite": "1.0.0",
         "MvcSample.Web": "1.0.0",
+        "MvcTagHelpersWebSite": "1.0.0",
         "PrecompilationWebSite": "1.0.0",
-        "RoutingWebSite": "1.0.0",
-        "RazorWebSite": "1.0.0",
         "RazorCompilerCacheWebSite": "1.0.0",
-        "RazorInstrumentationWebsite": "1.0.0",
-        "RazorViewEngineOptionsWebsite": "1.0.0",
+        "RazorEmbeddedViewsWebSite": "1.0.0",
+        "RazorPageExecutionInstrumentationWebSite": "1.0.0",
+        "RazorWebSite": "1.0.0",
         "RequestServicesWebSite": "1.0.0",
         "ResponseCacheWebSite": "1.0.0",
+        "RoutingWebSite": "1.0.0",
         "TagHelperSample.Web": "1.0.0",
         "TagHelpersWebSite": "1.0.0",
         "UrlHelperWebSite": "1.0.0",
@@ -46,15 +53,8 @@
         "ValueProvidersWebSite": "1.0.0",
         "VersioningWebSite": "1.0.0",
         "ViewComponentWebSite": "1.0.0",
-        "XmlFormattersWebSite": "1.0.0",
         "WebApiCompatShimWebSite": "1.0.0",
-        "Microsoft.AspNet.TestHost": "1.0.0-*",
-        "Microsoft.AspNet.Mvc": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.Xml": "6.0.0-*",
-        "Microsoft.AspNet.Mvc.TestConfiguration": "1.0.0",
-        "Microsoft.AspNet.WebUtilities": "1.0.0-*",
-        "MvcTagHelpersWebSite": "1.0.0",
-        "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
+        "XmlFormattersWebSite": "1.0.0",
         "xunit.runner.kre": "1.0.0-*"
     },
     "commands": {
diff --git a/test/WebSites/ConnegWebSite/ConnegWebsite.kproj b/test/WebSites/ContentNegotiationWebSite/ContentNegotiationWebSite.kproj
similarity index 100%
rename from test/WebSites/ConnegWebSite/ConnegWebsite.kproj
rename to test/WebSites/ContentNegotiationWebSite/ContentNegotiationWebSite.kproj
diff --git a/test/WebSites/ConnegWebSite/Controllers/FallbackOnTypeBasedMatchController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
similarity index 98%
rename from test/WebSites/ConnegWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
index 90d724afdd..f4a102bdf4 100644
--- a/test/WebSites/ConnegWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc;
 using Microsoft.Framework.DependencyInjection;
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class FallbackOnTypeBasedMatchController : Controller
     {
diff --git a/test/WebSites/ConnegWebSite/Controllers/FormatFilterController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs
similarity index 95%
rename from test/WebSites/ConnegWebSite/Controllers/FormatFilterController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs
index 8d49b9a97c..4e1e475347 100644
--- a/test/WebSites/ConnegWebSite/Controllers/FormatFilterController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     [Produces("application/FormatFilterController")]
     public class FormatFilterController : Controller
diff --git a/test/WebSites/ConnegWebSite/Controllers/HomeController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs
similarity index 96%
rename from test/WebSites/ConnegWebSite/Controllers/HomeController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs
index 6788a39f1c..22584eaaaa 100644
--- a/test/WebSites/ConnegWebSite/Controllers/HomeController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class HomeController : Controller
     {
diff --git a/test/WebSites/ConnegWebSite/Controllers/JsonResultController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs
similarity index 97%
rename from test/WebSites/ConnegWebSite/Controllers/JsonResultController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs
index f074e00609..cb78ab40fe 100644
--- a/test/WebSites/ConnegWebSite/Controllers/JsonResultController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNet.Mvc;
 using Microsoft.Net.Http.Headers;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class JsonResultController : Controller
     {
diff --git a/test/WebSites/ConnegWebSite/Controllers/NoContentController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentController.cs
similarity index 96%
rename from test/WebSites/ConnegWebSite/Controllers/NoContentController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/NoContentController.cs
index 9cd8902575..b676cba045 100644
--- a/test/WebSites/ConnegWebSite/Controllers/NoContentController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentController.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class NoContentController : Controller
     {
diff --git a/test/WebSites/ConnegWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs
similarity index 97%
rename from test/WebSites/ConnegWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs
index 8a16c2d1db..8eef11bcfb 100644
--- a/test/WebSites/ConnegWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class NoContentDoNotTreatNullValueAsNoContentController : Controller
     {
diff --git a/test/WebSites/ConnegWebSite/Controllers/NoProducesContentOnClassController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs
similarity index 96%
rename from test/WebSites/ConnegWebSite/Controllers/NoProducesContentOnClassController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs
index a223670a12..ec751cddbe 100644
--- a/test/WebSites/ConnegWebSite/Controllers/NoProducesContentOnClassController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class NoProducesContentOnClassController : ProducesContentBaseController
     {
diff --git a/test/WebSites/ConnegWebSite/Controllers/NormalController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs
similarity index 98%
rename from test/WebSites/ConnegWebSite/Controllers/NormalController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs
index 3ac7fb5d14..407c881781 100644
--- a/test/WebSites/ConnegWebSite/Controllers/NormalController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNet.Mvc;
 using Newtonsoft.Json;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class NormalController : Controller
     {
diff --git a/test/WebSites/ConnegWebSite/Controllers/ProducesContentBaseController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs
similarity index 97%
rename from test/WebSites/ConnegWebSite/Controllers/ProducesContentBaseController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs
index 2e35e28a32..571aab3a1b 100644
--- a/test/WebSites/ConnegWebSite/Controllers/ProducesContentBaseController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     [Produces("application/custom_ProducesContentBaseController")]
     public class ProducesContentBaseController : Controller
diff --git a/test/WebSites/ConnegWebSite/Controllers/ProducesContentOnClassController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs
similarity index 97%
rename from test/WebSites/ConnegWebSite/Controllers/ProducesContentOnClassController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs
index 9b0acbdd10..37336a8986 100644
--- a/test/WebSites/ConnegWebSite/Controllers/ProducesContentOnClassController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     [Produces("application/custom_ProducesContentOnClassController")]
     public class ProducesContentOnClassController : ProducesContentBaseController
diff --git a/test/WebSites/ConnegWebSite/Controllers/ProducesWithMediaTypeParametersController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs
similarity index 93%
rename from test/WebSites/ConnegWebSite/Controllers/ProducesWithMediaTypeParametersController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs
index 8e2da1a87a..943b55f07e 100644
--- a/test/WebSites/ConnegWebSite/Controllers/ProducesWithMediaTypeParametersController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using ConnegWebSite.Models;
+using ContentNegotiationWebSite.Models;
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class ProducesWithMediaTypeParametersController : Controller
     {
diff --git a/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/TextPlainController.cs
similarity index 97%
rename from test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs
rename to test/WebSites/ContentNegotiationWebSite/Controllers/TextPlainController.cs
index 4d94f88b82..ab2d4f245c 100644
--- a/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Controllers/TextPlainController.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class TextPlainController : Controller
     {
diff --git a/test/WebSites/ConnegWebSite/CustomFormatter.cs b/test/WebSites/ContentNegotiationWebSite/CustomFormatter.cs
similarity index 97%
rename from test/WebSites/ConnegWebSite/CustomFormatter.cs
rename to test/WebSites/ContentNegotiationWebSite/CustomFormatter.cs
index 608e02b613..fae9e6ffc1 100644
--- a/test/WebSites/ConnegWebSite/CustomFormatter.cs
+++ b/test/WebSites/ContentNegotiationWebSite/CustomFormatter.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Net.Http.Headers;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class CustomFormatter : OutputFormatter
     {
diff --git a/test/WebSites/ConnegWebSite/Models/Contact.cs b/test/WebSites/ContentNegotiationWebSite/Models/Contact.cs
similarity index 94%
rename from test/WebSites/ConnegWebSite/Models/Contact.cs
rename to test/WebSites/ContentNegotiationWebSite/Models/Contact.cs
index c2b31f71f0..18435f8dd1 100644
--- a/test/WebSites/ConnegWebSite/Models/Contact.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Models/Contact.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace ConnegWebSite.Models
+namespace ContentNegotiationWebSite.Models
 {
     public class Contact
     {
diff --git a/test/WebSites/ConnegWebSite/Models/User.cs b/test/WebSites/ContentNegotiationWebSite/Models/User.cs
similarity index 91%
rename from test/WebSites/ConnegWebSite/Models/User.cs
rename to test/WebSites/ContentNegotiationWebSite/Models/User.cs
index b52467214d..6e1bddd661 100644
--- a/test/WebSites/ConnegWebSite/Models/User.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Models/User.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     [DisplayColumn("Name")]
     public class User
diff --git a/test/WebSites/ConnegWebSite/PlainTextFormatter.cs b/test/WebSites/ContentNegotiationWebSite/PlainTextFormatter.cs
similarity index 97%
rename from test/WebSites/ConnegWebSite/PlainTextFormatter.cs
rename to test/WebSites/ContentNegotiationWebSite/PlainTextFormatter.cs
index f6bfe8c8c7..229b2d6dd1 100644
--- a/test/WebSites/ConnegWebSite/PlainTextFormatter.cs
+++ b/test/WebSites/ContentNegotiationWebSite/PlainTextFormatter.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Net.Http.Headers;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class PlainTextFormatter : OutputFormatter
     {
diff --git a/test/WebSites/ConnegWebSite/Startup.cs b/test/WebSites/ContentNegotiationWebSite/Startup.cs
similarity index 96%
rename from test/WebSites/ConnegWebSite/Startup.cs
rename to test/WebSites/ContentNegotiationWebSite/Startup.cs
index 12821f00e5..f138a4ad9a 100644
--- a/test/WebSites/ConnegWebSite/Startup.cs
+++ b/test/WebSites/ContentNegotiationWebSite/Startup.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc;
 using Microsoft.Framework.DependencyInjection;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     public class Startup
     {
diff --git a/test/WebSites/ConnegWebSite/VCardFormatter_V3.cs b/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V3.cs
similarity index 95%
rename from test/WebSites/ConnegWebSite/VCardFormatter_V3.cs
rename to test/WebSites/ContentNegotiationWebSite/VCardFormatter_V3.cs
index 83c75981a2..df80a84d0a 100644
--- a/test/WebSites/ConnegWebSite/VCardFormatter_V3.cs
+++ b/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V3.cs
@@ -6,12 +6,12 @@ using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using ConnegWebSite.Models;
+using ContentNegotiationWebSite.Models;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     /// <summary>
     /// Provides contact information of a person through VCard format.
diff --git a/test/WebSites/ConnegWebSite/VCardFormatter_V4.cs b/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V4.cs
similarity index 96%
rename from test/WebSites/ConnegWebSite/VCardFormatter_V4.cs
rename to test/WebSites/ContentNegotiationWebSite/VCardFormatter_V4.cs
index acd954fa01..6fbdc53155 100644
--- a/test/WebSites/ConnegWebSite/VCardFormatter_V4.cs
+++ b/test/WebSites/ContentNegotiationWebSite/VCardFormatter_V4.cs
@@ -6,12 +6,12 @@ using System.IO;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using ConnegWebSite.Models;
+using ContentNegotiationWebSite.Models;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace ConnegWebSite
+namespace ContentNegotiationWebSite
 {
     /// <summary>
     /// Provides contact information of a person through VCard format.
diff --git a/test/WebSites/ConnegWebSite/project.json b/test/WebSites/ContentNegotiationWebSite/project.json
similarity index 100%
rename from test/WebSites/ConnegWebSite/project.json
rename to test/WebSites/ContentNegotiationWebSite/project.json
diff --git a/test/WebSites/ConnegWebSite/readme.md b/test/WebSites/ContentNegotiationWebSite/readme.md
similarity index 73%
rename from test/WebSites/ConnegWebSite/readme.md
rename to test/WebSites/ContentNegotiationWebSite/readme.md
index a313792f19..ded583ecff 100644
--- a/test/WebSites/ConnegWebSite/readme.md
+++ b/test/WebSites/ContentNegotiationWebSite/readme.md
@@ -1,5 +1,5 @@
-ConnegWebsite
+ContentNegotiationWebSite
 ===
 
 This web site illustrates in depth how MVC performs output content negotiation based on the input headers and
-content. It also demonstrates various options available to participate in content negotation process.
+content. It also demonstrates various options available to participate in content negotiation process.
diff --git a/test/WebSites/ConnegWebSite/wwwroot/HelloWorld.htm b/test/WebSites/ContentNegotiationWebSite/wwwroot/HelloWorld.htm
similarity index 100%
rename from test/WebSites/ConnegWebSite/wwwroot/HelloWorld.htm
rename to test/WebSites/ContentNegotiationWebSite/wwwroot/HelloWorld.htm
diff --git a/test/WebSites/FilesWebSite/readme.md b/test/WebSites/FilesWebSite/readme.md
index 4eb39d7a2d..63d839fb36 100644
--- a/test/WebSites/FilesWebSite/readme.md
+++ b/test/WebSites/FilesWebSite/readme.md
@@ -1,4 +1,4 @@
-ConnegWebsite
+FilesWebSite
 ===
 
 This web site illustrates how to use `FileContentResult` via `File` method on the controller. It also demonstrates
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/Controllers/RazorViewEngineOptions_AdminController.cs b/test/WebSites/RazorEmbeddedViewsWebSite/Controllers/RazorEmbeddedViews_AdminController.cs
similarity index 73%
rename from test/WebSites/RazorViewEngineOptionsWebsite/Controllers/RazorViewEngineOptions_AdminController.cs
rename to test/WebSites/RazorEmbeddedViewsWebSite/Controllers/RazorEmbeddedViews_AdminController.cs
index 9d302ed2b2..ab41964c07 100644
--- a/test/WebSites/RazorViewEngineOptionsWebsite/Controllers/RazorViewEngineOptions_AdminController.cs
+++ b/test/WebSites/RazorEmbeddedViewsWebSite/Controllers/RazorEmbeddedViews_AdminController.cs
@@ -3,10 +3,10 @@
 
 using Microsoft.AspNet.Mvc;
 
-namespace RazorViewEngineOptionsWebsite.Controllers
+namespace RazorEmbeddedViewsWebSite.Controllers
 {
     [Area("Restricted")]
-    public class RazorViewEngineOptions_AdminController : Controller
+    public class RazorEmbeddedViews_AdminController : Controller
     {
         public IActionResult Login()
         {
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/Controllers/RazorViewEngineOptions_HomeController.cs b/test/WebSites/RazorEmbeddedViewsWebSite/Controllers/RazorEmbeddedViews_HomeController.cs
similarity index 74%
rename from test/WebSites/RazorViewEngineOptionsWebsite/Controllers/RazorViewEngineOptions_HomeController.cs
rename to test/WebSites/RazorEmbeddedViewsWebSite/Controllers/RazorEmbeddedViews_HomeController.cs
index 3c7d7d6cd5..618493632f 100644
--- a/test/WebSites/RazorViewEngineOptionsWebsite/Controllers/RazorViewEngineOptions_HomeController.cs
+++ b/test/WebSites/RazorEmbeddedViewsWebSite/Controllers/RazorEmbeddedViews_HomeController.cs
@@ -3,9 +3,9 @@
 
 using Microsoft.AspNet.Mvc;
 
-namespace RazorViewEngineOptionsWebsite
+namespace RazorEmbeddedViewsWebSite
 {
-    public class RazorViewEngineOptions_HomeController : Controller
+    public class RazorEmbeddedViews_HomeController : Controller
     {
         public IActionResult Index()
         {
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/EmbeddedResources/Areas/Restricted/Views/RazorViewEngineOptions_Admin/Login.cshtml b/test/WebSites/RazorEmbeddedViewsWebSite/EmbeddedResources/Areas/Restricted/Views/RazorEmbeddedViews_Admin/Login.cshtml
similarity index 100%
rename from test/WebSites/RazorViewEngineOptionsWebsite/EmbeddedResources/Areas/Restricted/Views/RazorViewEngineOptions_Admin/Login.cshtml
rename to test/WebSites/RazorEmbeddedViewsWebSite/EmbeddedResources/Areas/Restricted/Views/RazorEmbeddedViews_Admin/Login.cshtml
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/EmbeddedResources/Views/RazorViewEngineOptions_Home/Index.cshtml b/test/WebSites/RazorEmbeddedViewsWebSite/EmbeddedResources/Views/RazorEmbeddedViews_Home/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorViewEngineOptionsWebsite/EmbeddedResources/Views/RazorViewEngineOptions_Home/Index.cshtml
rename to test/WebSites/RazorEmbeddedViewsWebSite/EmbeddedResources/Views/RazorEmbeddedViews_Home/Index.cshtml
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/RazorViewEngineOptionsWebsite.kproj b/test/WebSites/RazorEmbeddedViewsWebSite/RazorEmbeddedViewsWebSite.kproj
similarity index 100%
rename from test/WebSites/RazorViewEngineOptionsWebsite/RazorViewEngineOptionsWebsite.kproj
rename to test/WebSites/RazorEmbeddedViewsWebSite/RazorEmbeddedViewsWebSite.kproj
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/Startup.cs b/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs
similarity index 96%
rename from test/WebSites/RazorViewEngineOptionsWebsite/Startup.cs
rename to test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs
index f1b17c61c5..1e8f51cb25 100644
--- a/test/WebSites/RazorViewEngineOptionsWebsite/Startup.cs
+++ b/test/WebSites/RazorEmbeddedViewsWebSite/Startup.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.Framework.DependencyInjection;
 
-namespace RazorViewEngineOptionsWebsite
+namespace RazorEmbeddedViewsWebSite
 {
     public class Startup
     {
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/project.json b/test/WebSites/RazorEmbeddedViewsWebSite/project.json
similarity index 100%
rename from test/WebSites/RazorViewEngineOptionsWebsite/project.json
rename to test/WebSites/RazorEmbeddedViewsWebSite/project.json
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/readme.md b/test/WebSites/RazorEmbeddedViewsWebSite/readme.md
similarity index 73%
rename from test/WebSites/RazorViewEngineOptionsWebsite/readme.md
rename to test/WebSites/RazorEmbeddedViewsWebSite/readme.md
index fedb6ddd12..d4e97aff00 100644
--- a/test/WebSites/RazorViewEngineOptionsWebsite/readme.md
+++ b/test/WebSites/RazorEmbeddedViewsWebSite/readme.md
@@ -1,4 +1,4 @@
-RazorViewEngineOptionsWebSite
+RazorEmbeddedViewsWebSite
 ===
 
 This web site illustrates use cases for `RazorViewEngineOptions.FileProvider`.
diff --git a/test/WebSites/RazorInstrumentationWebsite/wwwroot/HelloWorld.htm b/test/WebSites/RazorEmbeddedViewsWebSite/wwwroot/HelloWorld.htm
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/wwwroot/HelloWorld.htm
rename to test/WebSites/RazorEmbeddedViewsWebSite/wwwroot/HelloWorld.htm
diff --git a/test/WebSites/RazorInstrumentationWebsite/HomeController.cs b/test/WebSites/RazorPageExecutionInstrumentationWebSite/HomeController.cs
similarity index 91%
rename from test/WebSites/RazorInstrumentationWebsite/HomeController.cs
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/HomeController.cs
index e005904e9c..fc705cdde1 100644
--- a/test/WebSites/RazorInstrumentationWebsite/HomeController.cs
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/HomeController.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc;
 
-namespace RazorInstrumentationWebSite
+namespace RazorPageExecutionInstrumentationWebSite
 {
     public class HomeController : Controller
     {
diff --git a/test/WebSites/RazorInstrumentationWebsite/RazorInstrumentationWebsite.kproj b/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.kproj
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/RazorInstrumentationWebsite.kproj
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.kproj
diff --git a/test/WebSites/RazorInstrumentationWebsite/Startup.cs b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
similarity index 96%
rename from test/WebSites/RazorInstrumentationWebsite/Startup.cs
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
index 755f65e2b6..a4abd289a7 100644
--- a/test/WebSites/RazorInstrumentationWebsite/Startup.cs
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.PageExecutionInstrumentation;
 using Microsoft.Framework.DependencyInjection;
 
-namespace RazorInstrumentationWebSite
+namespace RazorPageExecutionInstrumentationWebSite
 {
     public class Startup
     {
diff --git a/test/WebSites/RazorInstrumentationWebsite/TestPageExecutionContext.cs b/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestPageExecutionContext.cs
similarity index 93%
rename from test/WebSites/RazorInstrumentationWebsite/TestPageExecutionContext.cs
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/TestPageExecutionContext.cs
index cd0eb02e31..17a92057f4 100644
--- a/test/WebSites/RazorInstrumentationWebsite/TestPageExecutionContext.cs
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestPageExecutionContext.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.PageExecutionInstrumentation;
 
-namespace RazorInstrumentationWebSite
+namespace RazorPageExecutionInstrumentationWebSite
 {
     public class TestPageExecutionContext : IPageExecutionContext
     {
diff --git a/test/WebSites/RazorInstrumentationWebsite/TestPageExecutionListenerFeature.cs b/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestPageExecutionListenerFeature.cs
similarity index 93%
rename from test/WebSites/RazorInstrumentationWebsite/TestPageExecutionListenerFeature.cs
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/TestPageExecutionListenerFeature.cs
index 43c8c8c9d3..1dbec7aa23 100644
--- a/test/WebSites/RazorInstrumentationWebsite/TestPageExecutionListenerFeature.cs
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestPageExecutionListenerFeature.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using Microsoft.AspNet.PageExecutionInstrumentation;
 
-namespace RazorInstrumentationWebSite
+namespace RazorPageExecutionInstrumentationWebSite
 {
     public class TestPageExecutionListenerFeature : IPageExecutionListenerFeature
     {
diff --git a/test/WebSites/RazorInstrumentationWebsite/Views/Home/FullPath.cshtml b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/FullPath.cshtml
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/Views/Home/FullPath.cshtml
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/FullPath.cshtml
diff --git a/test/WebSites/RazorInstrumentationWebsite/Views/Home/VIewWithPartial.cshtml b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/VIewWithPartial.cshtml
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/Views/Home/VIewWithPartial.cshtml
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/VIewWithPartial.cshtml
diff --git a/test/WebSites/RazorInstrumentationWebsite/Views/Home/ViewDiscoveryPath.cshtml b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/ViewDiscoveryPath.cshtml
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/Views/Home/ViewDiscoveryPath.cshtml
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/ViewDiscoveryPath.cshtml
diff --git a/test/WebSites/RazorInstrumentationWebsite/Views/Home/_PartialView.cshtml b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/_PartialView.cshtml
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/Views/Home/_PartialView.cshtml
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/Home/_PartialView.cshtml
diff --git a/test/WebSites/RazorInstrumentationWebsite/Views/_Layout.cshtml b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/Views/_Layout.cshtml
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_Layout.cshtml
diff --git a/test/WebSites/RazorInstrumentationWebsite/Views/_ViewStart.cshtml b/test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/Views/_ViewStart.cshtml
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/Views/_ViewStart.cshtml
diff --git a/test/WebSites/RazorInstrumentationWebsite/project.json b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
similarity index 100%
rename from test/WebSites/RazorInstrumentationWebsite/project.json
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
diff --git a/test/WebSites/RazorInstrumentationWebsite/readme.md b/test/WebSites/RazorPageExecutionInstrumentationWebSite/readme.md
similarity index 64%
rename from test/WebSites/RazorInstrumentationWebsite/readme.md
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/readme.md
index 953a0b68eb..b5de53569b 100644
--- a/test/WebSites/RazorInstrumentationWebsite/readme.md
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/readme.md
@@ -1,4 +1,4 @@
-RazorInstrumentationWebSite
+RazorPageExecutionInstrumentationWebSite
 ===
 
 This web site is used for functional testing of page instrumentation.
diff --git a/test/WebSites/RazorViewEngineOptionsWebsite/wwwroot/HelloWorld.htm b/test/WebSites/RazorPageExecutionInstrumentationWebSite/wwwroot/HelloWorld.htm
similarity index 100%
rename from test/WebSites/RazorViewEngineOptionsWebsite/wwwroot/HelloWorld.htm
rename to test/WebSites/RazorPageExecutionInstrumentationWebSite/wwwroot/HelloWorld.htm
diff --git a/test/WebSites/ResponseCacheWebSite/readme.md b/test/WebSites/ResponseCacheWebSite/readme.md
index 3fa0d4b982..111e2c51b1 100644
--- a/test/WebSites/ResponseCacheWebSite/readme.md
+++ b/test/WebSites/ResponseCacheWebSite/readme.md
@@ -1 +1,4 @@
-Hello, World
+ResponseCacheWebSite
+===
+
+This web site illustrates how to use response caching.
\ No newline at end of file
diff --git a/test/WebSites/ViewComponentWebSite/readme.md b/test/WebSites/ViewComponentWebSite/readme.md
index 45890e4c7b..d2d82919d1 100644
--- a/test/WebSites/ViewComponentWebSite/readme.md
+++ b/test/WebSites/ViewComponentWebSite/readme.md
@@ -1,4 +1,4 @@
-ViewComponents
+ViewComponentsWebSite
 ===
 
 This web site illustrates how to use custom view components.
diff --git a/test/WebSites/WebApiCompatShimWebSite/readme.md b/test/WebSites/WebApiCompatShimWebSite/readme.md
index deeb4b57e8..2ab97802df 100644
--- a/test/WebSites/WebApiCompatShimWebSite/readme.md
+++ b/test/WebSites/WebApiCompatShimWebSite/readme.md
@@ -1,4 +1,4 @@
-WebApiCompactShim
+WebApiCompatShimWebSite
 ===
 
 This web site illustrates how to configure and use WebApiCompatShim to get `Web API 2.*` like behavior. Features which