From 261975b0bc8c5750b5fb40c99684eb902d00c4d6 Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Fri, 5 Jun 2015 20:30:17 -0700
Subject: [PATCH] Rename `MvcTagHelpersWebSite` to `HtmlGenerationsWebSite` -
 name was too specific and I am about to add another HTML helper scenario

---
 Mvc.sln                                       |   2 +-
 ...agHelpersTest.cs => HtmlGenerationTest.cs} |  42 +++++++++---------
 ...ebSite.HtmlGeneration_Customer.Index.html} |   2 +-
 ....HtmlGeneration_Home.CreateWarehouse.html} |   2 +-
 ...WebSite.HtmlGeneration_Home.Customer.html} |   2 +-
 ...eneration_Home.EditWarehouse.Encoded.html} |   2 +-
 ...te.HtmlGeneration_Home.EditWarehouse.html} |   2 +-
 ...ite.HtmlGeneration_Home.EmployeeList.html} |   2 +-
 ...Site.HtmlGeneration_Home.Environment.html} |   0
 ...n_Home.Form.Options.AntiForgery.False.html |  15 +++++++
 ...on_Home.Form.Options.AntiForgery.True.html |  15 +++++++
 ...on_Home.Form.Options.AntiForgery.null.html |  15 +++++++
 ...ionWebSite.HtmlGeneration_Home.Image.html} |   0
 ...te.HtmlGeneration_Home.Index.Encoded.html} |  12 ++---
 ...ionWebSite.HtmlGeneration_Home.Index.html} |  12 ++---
 ...ionWebSite.HtmlGeneration_Home.Input.html} |   0
 ...ite.HtmlGeneration_Home.Link.Encoded.html} |   0
 ...tionWebSite.HtmlGeneration_Home.Link.html} |   0
 ...te.HtmlGeneration_Home.Order.Encoded.html} |   4 +-
 ...ionWebSite.HtmlGeneration_Home.Order.html} |   4 +-
 ...n_Home.OrderUsingHtmlHelpers.Encoded.html} |   4 +-
 ...eneration_Home.OrderUsingHtmlHelpers.html} |   4 +-
 ....HtmlGeneration_Home.Product.Encoded.html} |   4 +-
 ...nWebSite.HtmlGeneration_Home.Product.html} |   4 +-
 ...Site.HtmlGeneration_Home.ProductList.html} |   4 +-
 ...e.HtmlGeneration_Home.Script.Encoded.html} |   0
 ...onWebSite.HtmlGeneration_Home.Script.html} |   0
 ...r_Home.Form.Options.AntiForgery.False.html |  15 -------
 ...er_Home.Form.Options.AntiForgery.True.html |  15 -------
 ...er_Home.Form.Options.AntiForgery.null.html |  15 -------
 .../project.json                              |   4 +-
 .../HtmlGeneration_CustomerController.cs}     |   7 ++-
 .../Components/ProductsViewComponent.cs       |   2 +-
 .../Components/SplashViewComponent.cs         |   0
 .../Catalog_CacheTagHelperController.cs       |   2 +-
 .../HtmlGeneration_HomeController.cs}         |  10 ++---
 .../HtmlGeneration_OrderController.cs}        |   6 +--
 .../HtmlGeneration_ProductController.cs}      |   6 +--
 .../HtmlGenerationWebSite.xproj}              |   0
 .../Models/Customer.cs                        |   2 +-
 .../Models/Employee.cs                        |   2 +-
 .../Models/Folder.cs                          |   2 +-
 .../Models/Gender.cs                          |   2 +-
 .../Models/Order.cs                           |   2 +-
 .../Models/Person.cs                          |   2 +-
 .../Models/Product.cs                         |   3 +-
 .../Models/Warehouse.cs                       |   2 +-
 .../ProductsService.cs                        |   3 +-
 .../Startup.cs                                |   4 +-
 .../ConfirmPayment.cshtml                     |   0
 .../Views/Catalog_CacheTagHelper/Deals.cshtml |   0
 .../Catalog_CacheTagHelper/Details.cshtml     |   0
 .../ListCategories.cshtml                     |   0
 .../PastPurchases.cshtml                      |   0
 .../ShoppingCart.cshtml                       |   0
 .../Catalog_CacheTagHelper/Splash.cshtml      |   0
 .../_SplashPartial.cshtml                     |   0
 .../_ViewImports.cshtml                       |   0
 .../CreateWarehouse.cshtml                    |   4 +-
 .../HtmlGeneration_Home}/EditWarehouse.cshtml |   4 +-
 .../EditorTemplates/Employee.cshtml           |   2 +-
 .../GenderUsingHtmlHelpers.cshtml             |   4 ++
 .../GenderUsingTagHelpers.cshtml              |   2 +-
 .../HtmlGeneration_Home}/EmployeeList.cshtml  |   4 +-
 .../HtmlGeneration_Home}/Environment.cshtml   |   0
 .../Views/HtmlGeneration_Home/Form.cshtml     |  18 ++++++++
 .../Views/HtmlGeneration_Home}/Image.cshtml   |   0
 .../Views/HtmlGeneration_Home}/Index.cshtml   |  12 ++---
 .../Views/HtmlGeneration_Home}/Input.cshtml   |   2 +-
 .../Views/HtmlGeneration_Home}/Link.cshtml    |   0
 .../Views/HtmlGeneration_Home}/Order.cshtml   |   4 +-
 .../OrderUsingHtmlHelpers.cshtml              |   4 +-
 .../Views/HtmlGeneration_Home}/Product.cshtml |   4 +-
 .../HtmlGeneration_Home}/ProductList.cshtml   |   4 +-
 .../Views/HtmlGeneration_Home}/Script.cshtml  |   0
 .../_ProductPartial.cshtml                    |   2 +-
 .../Shared/Components/Products/Default.cshtml |   0
 .../Shared/Components/Splash/Default.cshtml   |   0
 .../Views/Shared/Customer.cshtml              |   4 +-
 .../appRoot.css                               |   0
 .../appRoot.js                                |   0
 .../project.json                              |   0
 test/WebSites/HtmlGenerationWebSite/readme.md |   4 ++
 .../wwwroot/HelloWorld.htm                    |   0
 .../wwwroot/images/red.png                    | Bin
 .../wwwroot/site.css                          |   0
 .../wwwroot/site.js                           |   0
 .../wwwroot/sub/site2.css                     |   0
 .../wwwroot/sub/site2.js                      |   0
 .../wwwroot/sub/site3.css                     |   0
 .../wwwroot/sub/site3.js                      |   0
 .../wwwroot/sub/site3.min.css                 |   0
 .../GenderUsingHtmlHelpers.cshtml             |   4 --
 .../Views/MvcTagHelper_Home/Form.cshtml       |  18 --------
 test/WebSites/MvcTagHelpersWebSite/readme.md  |   4 --
 95 files changed, 180 insertions(+), 183 deletions(-)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/{MvcTagHelpersTest.cs => HtmlGenerationTest.cs} (93%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html => HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html} (96%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.CreateWarehouse.html => HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html} (92%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html => HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html} (96%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.Encoded.html => HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html} (96%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.html => HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html} (96%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.EmployeeList.html => HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html} (98%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Environment.html => HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html} (100%)
 create mode 100644 test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.False.html
 create mode 100644 test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.True.html
 create mode 100644 test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.null.html
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Image.html => HtmlGenerationWebSite.HtmlGeneration_Home.Image.html} (100%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Index.Encoded.html => HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html} (77%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Index.html => HtmlGenerationWebSite.HtmlGeneration_Home.Index.html} (78%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Input.html => HtmlGenerationWebSite.HtmlGeneration_Home.Input.html} (100%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Link.Encoded.html => HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html} (100%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Link.html => HtmlGenerationWebSite.HtmlGeneration_Home.Link.html} (100%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Order.Encoded.html => HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html} (98%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html => HtmlGenerationWebSite.HtmlGeneration_Home.Order.html} (98%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.OrderUsingHtmlHelpers.Encoded.html => HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html} (98%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.OrderUsingHtmlHelpers.html => HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html} (98%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Product.Encoded.html => HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html} (87%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Product.html => HtmlGenerationWebSite.HtmlGeneration_Home.Product.html} (86%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.ProductList.html => HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html} (96%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Script.Encoded.html => HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html} (100%)
 rename test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/{MvcTagHelpersWebSite.MvcTagHelper_Home.Script.html => HtmlGenerationWebSite.HtmlGeneration_Home.Script.html} (100%)
 delete mode 100644 test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.False.html
 delete mode 100644 test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.True.html
 delete mode 100644 test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.null.html
 rename test/WebSites/{MvcTagHelpersWebSite/Areas/Customer/Controllers/MvcTagHelper_CustomerController.cs => HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs} (57%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Components/ProductsViewComponent.cs (96%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Components/SplashViewComponent.cs (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Controllers/Catalog_CacheTagHelperController.cs (98%)
 rename test/WebSites/{MvcTagHelpersWebSite/Controllers/MvcTagHelper_HomeController.cs => HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs} (96%)
 rename test/WebSites/{MvcTagHelpersWebSite/Controllers/MvcTagHelper_OrderController.cs => HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs} (70%)
 rename test/WebSites/{MvcTagHelpersWebSite/Controllers/MvcTagHelper_ProductController.cs => HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs} (79%)
 rename test/WebSites/{MvcTagHelpersWebSite/MvcTagHelpersWebSite.xproj => HtmlGenerationWebSite/HtmlGenerationWebSite.xproj} (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Models/Customer.cs (88%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Models/Employee.cs (92%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Models/Folder.cs (94%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Models/Gender.cs (85%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Models/Order.cs (96%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Models/Person.cs (96%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Models/Product.cs (89%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Models/Warehouse.cs (93%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/ProductsService.cs (92%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Startup.cs (90%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/Deals.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/Details.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/ListCategories.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/PastPurchases.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/Splash.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Catalog_CacheTagHelper/_ViewImports.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/CreateWarehouse.cshtml (84%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/EditWarehouse.cshtml (91%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/EditorTemplates/Employee.cshtml (94%)
 create mode 100644 test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/EditorTemplates/GenderUsingTagHelpers.cshtml (55%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/EmployeeList.cshtml (70%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/Environment.cshtml (100%)
 create mode 100644 test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/Image.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/Index.cshtml (86%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/Input.cshtml (94%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/Link.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/Order.cshtml (96%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/OrderUsingHtmlHelpers.cshtml (96%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/Product.cshtml (76%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/ProductList.cshtml (88%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/Script.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite/Views/MvcTagHelper_Home => HtmlGenerationWebSite/Views/HtmlGeneration_Home}/_ProductPartial.cshtml (88%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Shared/Components/Products/Default.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Shared/Components/Splash/Default.cshtml (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/Views/Shared/Customer.cshtml (90%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/appRoot.css (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/appRoot.js (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/project.json (100%)
 create mode 100644 test/WebSites/HtmlGenerationWebSite/readme.md
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/HelloWorld.htm (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/images/red.png (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/site.css (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/site.js (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/sub/site2.css (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/sub/site2.js (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/sub/site3.css (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/sub/site3.js (100%)
 rename test/WebSites/{MvcTagHelpersWebSite => HtmlGenerationWebSite}/wwwroot/sub/site3.min.css (100%)
 delete mode 100644 test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
 delete mode 100644 test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Form.cshtml
 delete mode 100644 test/WebSites/MvcTagHelpersWebSite/readme.md

diff --git a/Mvc.sln b/Mvc.sln
index 3e4c137962..485f478ec9 100644
--- a/Mvc.sln
+++ b/Mvc.sln
@@ -102,7 +102,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CompositeViewEngineWebSite"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ValueProvidersWebSite", "test\WebSites\ValueProvidersWebSite\ValueProvidersWebSite.xproj", "{14F79E79-AE79-48FA-95DE-D794EF4EABB3}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MvcTagHelpersWebSite", "test\WebSites\MvcTagHelpersWebSite\MvcTagHelpersWebSite.xproj", "{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlGenerationWebSite", "test\WebSites\HtmlGenerationWebSite\HtmlGenerationWebSite.xproj", "{920F8A0E-6F7D-4BBE-84FF-840B89099BE6}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ActionResultsWebSite", "test\WebSites\ActionResultsWebSite\ActionResultsWebSite.xproj", "{0A6BB4C0-48D3-4E7F-952B-B8917345E075}"
 EndProject
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTagHelpersTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/HtmlGenerationTest.cs
similarity index 93%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTagHelpersTest.cs
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/HtmlGenerationTest.cs
index dc3f4468c8..32953a01b6 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTagHelpersTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/HtmlGenerationTest.cs
@@ -9,19 +9,19 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Reflection;
 using System.Threading.Tasks;
+using HtmlGenerationWebSite;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc.TagHelpers;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.WebEncoders;
-using MvcTagHelpersWebSite;
 using Xunit;
 
 namespace Microsoft.AspNet.Mvc.FunctionalTests
 {
-    public class MvcTagHelpersTest
+    public class HtmlGenerationTest
     {
-        private const string SiteName = nameof(MvcTagHelpersWebSite);
-        private static readonly Assembly _resourcesAssembly = typeof(MvcTagHelpersTest).GetTypeInfo().Assembly;
+        private const string SiteName = nameof(HtmlGenerationWebSite);
+        private static readonly Assembly _resourcesAssembly = typeof(HtmlGenerationTest).GetTypeInfo().Assembly;
 
         private readonly Action<IApplicationBuilder> _app = new Startup().Configure;
         private readonly Action<IServiceCollection> _configureServices = new Startup().ConfigureServices;
@@ -30,13 +30,13 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         [InlineData("Index", null)]
         // Test ability to generate nearly identical HTML with MVC tag and HTML helpers.
         // Only attribute order should differ.
-        [InlineData("Order", "/MvcTagHelper_Order/Submit")]
-        [InlineData("OrderUsingHtmlHelpers", "/MvcTagHelper_Order/Submit")]
+        [InlineData("Order", "/HtmlGeneration_Order/Submit")]
+        [InlineData("OrderUsingHtmlHelpers", "/HtmlGeneration_Order/Submit")]
         [InlineData("Product", null)]
-        [InlineData("Customer", "/Customer/MvcTagHelper_Customer")]
+        [InlineData("Customer", "/Customer/HtmlGeneration_Customer")]
         // Testing InputTagHelpers invoked in the partial views
         [InlineData("ProductList", null)]
-        // Testing MvcTagHelpers invoked in the editor templates with the HTML helpers
+        // Testing MVC tag helpers invoked in the editor templates from HTML helpers
         [InlineData("EmployeeList", null)]
         // Testing SelectTagHelper with Html.BeginForm
         [InlineData("CreateWarehouse", null)]
@@ -52,19 +52,19 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         [InlineData("Image", null)]
         // Testing InputTagHelper with File
         [InlineData("Input", null)]
-        public async Task MvcTagHelpers_GeneratesExpectedResults(string action, string antiForgeryPath)
+        public async Task HtmlGenerationWebSite_GeneratesExpectedResults(string action, string antiForgeryPath)
         {
             // Arrange
             var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
             var client = server.CreateClient();
             var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
-            var outputFile = "compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home." + action + ".html";
+            var outputFile = "compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home." + action + ".html";
             var expectedContent =
                 await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
 
             // Act
             // The host is not important as everything runs in memory and tests are isolated from each other.
-            var response = await client.GetAsync("http://localhost/MvcTagHelper_Home/" + action);
+            var response = await client.GetAsync("http://localhost/HtmlGeneration_Home/" + action);
             var responseContent = await response.Content.ReadAsStringAsync();
 
             // Assert
@@ -98,11 +98,11 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
         [InlineData("EditWarehouse", null)]
         [InlineData("Index", null)]
         [InlineData("Link", null)]
-        [InlineData("Order", "/MvcTagHelper_Order/Submit")]
-        [InlineData("OrderUsingHtmlHelpers", "/MvcTagHelper_Order/Submit")]
+        [InlineData("Order", "/HtmlGeneration_Order/Submit")]
+        [InlineData("OrderUsingHtmlHelpers", "/HtmlGeneration_Order/Submit")]
         [InlineData("Product", null)]
         [InlineData("Script", null)]
-        public async Task MvcTagHelpers_GenerateEncodedResults(string action, string antiForgeryPath)
+        public async Task HtmlGenerationWebSite_GenerateEncodedResults(string action, string antiForgeryPath)
         {
             // Arrange
             var server = TestHelper.CreateServer(_app, SiteName, services =>
@@ -114,13 +114,13 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             });
             var client = server.CreateClient();
             var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
-            var outputFile = "compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home." + action + ".Encoded.html";
+            var outputFile = "compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home." + action + ".Encoded.html";
             var expectedContent =
                 await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
 
             // Act
             // The host is not important as everything runs in memory and tests are isolated from each other.
-            var response = await client.GetAsync("http://localhost/MvcTagHelper_Home/" + action);
+            var response = await client.GetAsync("http://localhost/HtmlGeneration_Home/" + action);
             var responseContent = await response.Content.ReadAsStringAsync();
 
             // Assert
@@ -156,11 +156,11 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
             // Arrange
             var server = TestHelper.CreateServer(_app, SiteName, _configureServices);
             var client = server.CreateClient();
-            var outputFile = "compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html";
+            var outputFile = "compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html";
             var expectedContent =
                 await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
 
-            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Customer/MvcTagHelper_Customer");
+            var request = new HttpRequestMessage(HttpMethod.Post, "http://localhost/Customer/HtmlGeneration_Customer");
             var nameValueCollection = new List<KeyValuePair<string, string>>
             {
                 new KeyValuePair<string,string>("Number", string.Empty),
@@ -180,7 +180,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
 
             responseContent = responseContent.Trim();
             var forgeryToken =
-                AntiForgeryTestHelper.RetrieveAntiForgeryToken(responseContent, "Customer/MvcTagHelper_Customer");
+                AntiForgeryTestHelper.RetrieveAntiForgeryToken(responseContent, "Customer/HtmlGeneration_Customer");
 
 #if GENERATE_BASELINES
             // Reverse usual substitution and insert a format item into the new file content.
@@ -476,14 +476,14 @@ Products: Laptops (3)";
             var expectedMediaType = MediaTypeHeaderValue.Parse("text/html; charset=utf-8");
 
             var outputFile = string.Format(
-                "compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.{0}.html",
+                "compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.{0}.html",
                 optionsAntiForgery?.ToString() ?? "null");
             var expectedContent =
                 await ResourceFile.ReadResourceAsync(_resourcesAssembly, outputFile, sourceFile: false);
 
             // Act
             // The host is not important as everything runs in memory and tests are isolated from each other.
-            var response = await client.GetAsync("http://localhost/MvcTagHelper_Home/Form");
+            var response = await client.GetAsync("http://localhost/HtmlGeneration_Home/Form");
             var responseContent = await response.Content.ReadAsStringAsync();
 
             // Assert
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
index a3340f55ba..631e57ecad 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-    <form action="/Customer/MvcTagHelper_Customer" method="post">
+    <form action="/Customer/HtmlGeneration_Customer" method="post">
         <div>
             <label class="order" for="Number">Number</label>
             <input class="form-control input-validation-error" type="number" data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." id="Number" name="Number" value="" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.CreateWarehouse.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
similarity index 92%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.CreateWarehouse.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
index 68ab2d052d..f5475cc0ab 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.CreateWarehouse.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form action="/MvcTagHelper_Home/CreateWarehouse" method="post">        <div>
+<form action="/HtmlGeneration_Home/CreateWarehouse" method="post">        <div>
             <label class="warehouse" for="City">City</label>
             <input size="50" type="text" data-val="true" data-val-minlength="The field City must be a string or array type with a minimum length of &#x27;2&#x27;." data-val-minlength-min="2" id="City" name="City" value="" />
             <span class="field-validation-valid" data-valmsg-for="City" data-valmsg-replace="true"></span>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
index 4f43116083..b6b9557fca 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-    <form action="/Customer/MvcTagHelper_Customer" method="post">
+    <form action="/Customer/HtmlGeneration_Customer" method="post">
         <div>
             <label class="order" for="Number">Number</label>
             <input class="form-control" type="number" data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." id="Number" name="Number" value="" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.Encoded.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
index 3cbb7c7161..e3e2866979 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-    <form action="HtmlEncode[[/MvcTagHelper_Home/EditWarehouse]]" method="HtmlEncode[[post]]">
+    <form action="HtmlEncode[[/HtmlGeneration_Home/EditWarehouse]]" method="HtmlEncode[[post]]">
         <div>
             HtmlEncode[[City_1]]
             <input type="HtmlEncode[[text]]" data-val="HtmlEncode[[true]]" data-val-minlength="HtmlEncode[[The field City must be a string or array type with a minimum length of '2'.]]" data-val-minlength-min="HtmlEncode[[2]]" id="HtmlEncode[[City]]" name="HtmlEncode[[City]]" value="HtmlEncode[[City_1]]" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
index e1a4e3c25a..c5adfada42 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EditWarehouse.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-    <form action="/MvcTagHelper_Home/EditWarehouse" method="post">
+    <form action="/HtmlGeneration_Home/EditWarehouse" method="post">
         <div>
             City_1
             <input type="text" data-val="true" data-val-minlength="The field City must be a string or array type with a minimum length of &#x27;2&#x27;." data-val-minlength-min="2" id="City" name="City" value="City_1" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EmployeeList.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EmployeeList.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
index f950802a05..50aa85c866 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.EmployeeList.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form action="/MvcTagHelper_Home/EmployeeList" method="post">
+<form action="/HtmlGeneration_Home/EmployeeList" method="post">
 <div>
     <label for="z0__Number">Number</label>
     <input data-val="true" data-val-range="The field Number must be between 1 and 100." data-val-range-max="100" data-val-range-min="1" data-val-required="The Number field is required." disabled="disabled" id="z0__Number" name="[0].Number" readonly="readonly" type="text" value="0" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Environment.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
similarity index 100%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Environment.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.False.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.False.html
new file mode 100644
index 0000000000..24c01c7601
--- /dev/null
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.False.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Form</title>
+</head>
+<body>
+
+    <h2>Form Tag Helper Test</h2>
+    
+    <form></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.True.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.True.html
new file mode 100644
index 0000000000..8b87eec8f0
--- /dev/null
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.True.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Form</title>
+</head>
+<body>
+
+    <h2>Form Tag Helper Test</h2>
+    
+    <form></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{1}" /></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.null.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.null.html
new file mode 100644
index 0000000000..8b87eec8f0
--- /dev/null
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.Options.AntiForgery.null.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Form</title>
+</head>
+<body>
+
+    <h2>Form Tag Helper Test</h2>
+    
+    <form></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{1}" /></form>
+    <form action="/HtmlGeneration_Home/Form" method="post"></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Image.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
similarity index 100%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Image.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Index.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
similarity index 77%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Index.Encoded.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
index 3796a25177..81a53c4d49 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Index.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
@@ -7,7 +7,7 @@
         <a title="&quot;the&quot; title" href="">Product List</a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndex">MvcTagHelperTest Index</a>
+        <a id="HtmlGenerationWebSite_Index">HtmlGenerationWebSite Index</a>
     </div>
     <div>
         <a href="HtmlEncode[[/]]">Default Controller</a>
@@ -19,13 +19,13 @@
         <a href="">Produt Submit Fragment</a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndexFragment" href="HtmlEncode[[/#fragment]]">
-            MvcTagHelperTest Index Fragment
+        <a id="HtmlGenerationWebSite_IndexFragment" href="HtmlEncode[[/#fragment]]">
+            HtmlGenerationWebSite Index Fragment
         </a>
     </div>
     <div>
         <a href="HtmlEncode[[ftp://localhost/#fragment]]">
-            FTP MvcTagHelperTest Index Fragment
+            FTP HtmlGenerationWebSite Index Fragment
         </a>
     </div>
     <div>
@@ -34,8 +34,8 @@
         </a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndexProtocol" href="HtmlEncode[[/]]">
-            Empty Protocol MvcTagHelperTest Index
+        <a id="HtmlGenerationWebSite_IndexProtocol" href="HtmlEncode[[/]]">
+            Empty Protocol HtmlGenerationWebSite Index
         </a>
     </div>
     <div>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Index.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
similarity index 78%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Index.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
index d55f8d8cff..cdfb98dd1b 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Index.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
@@ -7,7 +7,7 @@
         <a title="&quot;the&quot; title" href="">Product List</a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndex">MvcTagHelperTest Index</a>
+        <a id="HtmlGenerationWebSite_Index">HtmlGenerationWebSite Index</a>
     </div>
     <div>
         <a href="/">Default Controller</a>
@@ -19,13 +19,13 @@
         <a href="">Produt Submit Fragment</a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndexFragment" href="/#fragment">
-            MvcTagHelperTest Index Fragment
+        <a id="HtmlGenerationWebSite_IndexFragment" href="/#fragment">
+            HtmlGenerationWebSite Index Fragment
         </a>
     </div>
     <div>
         <a href="ftp://localhost/#fragment">
-            FTP MvcTagHelperTest Index Fragment
+            FTP HtmlGenerationWebSite Index Fragment
         </a>
     </div>
     <div>
@@ -34,8 +34,8 @@
         </a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndexProtocol" href="/">
-            Empty Protocol MvcTagHelperTest Index
+        <a id="HtmlGenerationWebSite_IndexProtocol" href="/">
+            Empty Protocol HtmlGenerationWebSite Index
         </a>
     </div>
     <div>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Input.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
similarity index 100%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Input.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Link.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Link.Encoded.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Link.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
similarity index 100%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Link.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.Encoded.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
index 24831dc118..1ad8237332 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
@@ -1,10 +1,10 @@
-<html>
+<html>
 <head>
     <meta charset="utf-8" />
     <title></title>
 </head>
 <body>
-    <form action="HtmlEncode[[/MvcTagHelper_Order/Submit]]" method="HtmlEncode[[post]]">
+    <form action="HtmlEncode[[/HtmlGeneration_Order/Submit]]" method="HtmlEncode[[post]]">
         <div>
             <label class="order" for="HtmlEncode[[Shipping]]">HtmlEncode[[Shipping]]</label>
             <input size="50" type="HtmlEncode[[text]]" id="HtmlEncode[[Shipping]]" name="HtmlEncode[[Shipping]]" value="HtmlEncode[[Your shipping method is UPSP]]" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
index 11f1713b3f..a12a485761 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
@@ -1,10 +1,10 @@
-<html>
+<html>
 <head>
     <meta charset="utf-8" />
     <title></title>
 </head>
 <body>
-    <form action="/MvcTagHelper_Order/Submit" method="post">
+    <form action="/HtmlGeneration_Order/Submit" method="post">
         <div>
             <label class="order" for="Shipping">Shipping</label>
             <input size="50" type="text" id="Shipping" name="Shipping" value="Your shipping method is UPSP" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.OrderUsingHtmlHelpers.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.OrderUsingHtmlHelpers.Encoded.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
index 38c5d0daa9..c6e007ac18 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.OrderUsingHtmlHelpers.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
@@ -1,10 +1,10 @@
-<html>
+<html>
 <head>
     <meta charset="utf-8" />
     <title></title>
 </head>
 <body>
-    <form action="HtmlEncode[[/MvcTagHelper_Order/Submit]]" method="HtmlEncode[[post]]">
+    <form action="HtmlEncode[[/HtmlGeneration_Order/Submit]]" method="HtmlEncode[[post]]">
         <div>
             <label class="HtmlEncode[[order]]" for="HtmlEncode[[Shipping]]">HtmlEncode[[Shipping]]</label>
             <input id="HtmlEncode[[Shipping]]" name="HtmlEncode[[Shipping]]" size="HtmlEncode[[50]]" type="HtmlEncode[[text]]" value="HtmlEncode[[Your shipping method is UPSP]]" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.OrderUsingHtmlHelpers.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
similarity index 98%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.OrderUsingHtmlHelpers.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
index 5cc7b459f2..3696a39609 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.OrderUsingHtmlHelpers.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
@@ -1,10 +1,10 @@
-<html>
+<html>
 <head>
     <meta charset="utf-8" />
     <title></title>
 </head>
 <body>
-    <form action="/MvcTagHelper_Order/Submit" method="post">
+    <form action="/HtmlGeneration_Order/Submit" method="post">
         <div>
             <label class="order" for="Shipping">Shipping</label>
             <input id="Shipping" name="Shipping" size="50" type="text" value="Your shipping method is UPSP" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
similarity index 87%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.Encoded.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
index 4cad81d700..6019532ad0 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
@@ -1,10 +1,10 @@
-<html>
+<html>
 <head>
     <meta charset="utf-8" />
     <title></title>
 </head>
 <body>
-    <form method="get" action="HtmlEncode[[/MvcTagHelper_Home/ProductSubmit]]">
+    <form method="get" action="HtmlEncode[[/HtmlGeneration_Home/ProductSubmit]]">
         <div>
             <label class="product" for="HtmlEncode[[HomePage]]">HtmlEncode[[HomePage]]</label>
             <input size="50" type="HtmlEncode[[url]]" id="HtmlEncode[[HomePage]]" name="HtmlEncode[[HomePage]]" value="HtmlEncode[[http://www.contoso.com/]]" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
similarity index 86%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
index a4769331ce..b6176ea4ae 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Product.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
@@ -1,10 +1,10 @@
-<html>
+<html>
 <head>
     <meta charset="utf-8" />
     <title></title>
 </head>
 <body>
-    <form method="get" action="/MvcTagHelper_Home/ProductSubmit">
+    <form method="get" action="/HtmlGeneration_Home/ProductSubmit">
         <div>
             <label class="product" for="HomePage">HomePage</label>
             <input size="50" type="url" id="HomePage" name="HomePage" value="http://www.contoso.com/" />
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.ProductList.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
similarity index 96%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.ProductList.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
index fdd9d419c6..61526e7cdc 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.ProductList.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
@@ -1,9 +1,9 @@
-<html>
+<html>
 <head>
     <meta charset="utf-8" />
 </head>
 <body>
-<form action="/MvcTagHelper_Product" method="post">            <div>
+<form action="/HtmlGeneration_Product" method="post">            <div>
                 <label class="product" for="z0__HomePage">HomePage</label>
                 <input size="50" disabled="disabled" readonly="readonly" type="url" id="z0__HomePage" name="[0].HomePage" value="http://www.contoso.com/" />
             </div>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Script.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Script.Encoded.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Script.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
similarity index 100%
rename from test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Script.html
rename to test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.False.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.False.html
deleted file mode 100644
index 18041fe48b..0000000000
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.False.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>Form</title>
-</head>
-<body>
-
-    <h2>Form Tag Helper Test</h2>
-    
-    <form></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"></form>
-</body>
-</html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.True.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.True.html
deleted file mode 100644
index b1e706bfed..0000000000
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.True.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>Form</title>
-</head>
-<body>
-
-    <h2>Form Tag Helper Test</h2>
-    
-    <form></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{1}" /></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"></form>
-</body>
-</html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.null.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.null.html
deleted file mode 100644
index b1e706bfed..0000000000
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Form.Options.AntiForgery.null.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>Form</title>
-</head>
-<body>
-
-    <h2>Form Tag Helper Test</h2>
-    
-    <form></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{0}" /></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"><input name="__RequestVerificationToken" type="hidden" value="{1}" /></form>
-    <form action="/MvcTagHelper_Home/Form" method="post"></form>
-</body>
-</html>
\ 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 1821706094..80c6a59a2a 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json
@@ -20,14 +20,15 @@
     "ContentNegotiationWebSite": "1.0.0",
     "ControllerDiscoveryConventionsWebSite": "1.0.0",
     "ControllersFromServicesWebSite": "1.0.0",
-    "CorsWebSite": "1.0.0",
     "CorsMiddlewareWebSite": "1.0.0",
+    "CorsWebSite": "1.0.0",
     "CustomRouteWebSite": "1.0.0",
     "ErrorPageMiddlewareWebSite": "1.0.0",
     "FilesWebSite": "1.0.0",
     "FiltersWebSite": "1.0.0",
     "FormatFilterWebSite": "1.0.0-*",
     "FormatterWebSite": "1.0.0",
+    "HtmlGenerationWebSite": "1.0.0",
     "InlineConstraintsWebSite": "1.0.0",
     "JsonPatchWebSite": "1.0.0",
     "LoggingWebSite": "1.0.0",
@@ -41,7 +42,6 @@
     "Microsoft.Framework.Configuration.Json": "1.0.0-*",
     "ModelBindingWebSite": "1.0.0",
     "MvcSample.Web": "1.0.0",
-    "MvcTagHelpersWebSite": "1.0.0",
     "PrecompilationWebSite": "1.0.0",
     "RazorCompilerCacheWebSite": "1.0.0",
     "RazorEmbeddedViewsWebSite": "1.0.0",
diff --git a/test/WebSites/MvcTagHelpersWebSite/Areas/Customer/Controllers/MvcTagHelper_CustomerController.cs b/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs
similarity index 57%
rename from test/WebSites/MvcTagHelpersWebSite/Areas/Customer/Controllers/MvcTagHelper_CustomerController.cs
rename to test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs
index b1caf9eb3d..fbff65076c 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Areas/Customer/Controllers/MvcTagHelper_CustomerController.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs
@@ -1,15 +1,14 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using Microsoft.AspNet.Mvc;
 
-namespace MvcTagHelpersWebSite.Areas.Customer.Controllers
+namespace HtmlGenerationWebSite.Areas.Customer.Controllers
 {
     [Area("Customer")]
-    public class MvcTagHelper_CustomerController : Controller
+    public class HtmlGeneration_CustomerController : Controller
     {
-        public IActionResult Index(MvcTagHelpersWebSite.Models.Customer customer)
+        public IActionResult Index(Models.Customer customer)
         {
             return View("Customer");
         }
diff --git a/test/WebSites/MvcTagHelpersWebSite/Components/ProductsViewComponent.cs b/test/WebSites/HtmlGenerationWebSite/Components/ProductsViewComponent.cs
similarity index 96%
rename from test/WebSites/MvcTagHelpersWebSite/Components/ProductsViewComponent.cs
rename to test/WebSites/HtmlGenerationWebSite/Components/ProductsViewComponent.cs
index 04b3c6d10b..a6bebeecf0 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Components/ProductsViewComponent.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Components/ProductsViewComponent.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNet.Mvc;
 using Microsoft.Framework.Caching;
 using Microsoft.Framework.Caching.Memory;
 
-namespace MvcTagHelpersWebSite.Components
+namespace HtmlGenerationWebSite.Components
 {
     public class ProductsViewComponent : ViewComponent
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Components/SplashViewComponent.cs b/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Components/SplashViewComponent.cs
rename to test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
diff --git a/test/WebSites/MvcTagHelpersWebSite/Controllers/Catalog_CacheTagHelperController.cs b/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
similarity index 98%
rename from test/WebSites/MvcTagHelpersWebSite/Controllers/Catalog_CacheTagHelperController.cs
rename to test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
index b6f1f82c8d..1849ed0187 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Controllers/Catalog_CacheTagHelperController.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
@@ -4,7 +4,7 @@
 using System.Security.Claims;
 using Microsoft.AspNet.Mvc;
 
-namespace MvcTagHelpersWebSite.Controllers
+namespace HtmlGenerationWebSite.Controllers
 {
     public class Catalog_CacheTagHelperController : Controller
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_HomeController.cs b/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs
similarity index 96%
rename from test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_HomeController.cs
rename to test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs
index 2ee3dcebc3..4136394f7b 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_HomeController.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs
@@ -3,13 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using HtmlGenerationWebSite.Models;
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.Rendering;
-using MvcTagHelpersWebSite.Models;
 
-namespace MvcTagHelpersWebSite.Controllers
+namespace HtmlGenerationWebSite.Controllers
 {
-    public class MvcTagHelper_HomeController : Controller
+    public class HtmlGeneration_HomeController : Controller
     {
         private readonly List<Product> _products = new List<Product>
         {
@@ -48,7 +48,7 @@ namespace MvcTagHelpersWebSite.Controllers
             Products = new List<int> { 0, 1 },
         };
 
-        public MvcTagHelper_HomeController()
+        public HtmlGeneration_HomeController()
         {
             _productsList = new SelectList(_products, "Number", "ProductName");
             _productsListWithSelection = new SelectList(_products, "Number", "ProductName", 2);
@@ -156,7 +156,7 @@ namespace MvcTagHelpersWebSite.Controllers
         {
             return View();
         }
-        
+
         public IActionResult Link()
         {
             return View();
diff --git a/test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_OrderController.cs b/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs
similarity index 70%
rename from test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_OrderController.cs
rename to test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs
index 33c3eab4c7..f09fc88191 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_OrderController.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs
@@ -2,12 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using HtmlGenerationWebSite.Models;
 using Microsoft.AspNet.Mvc;
-using MvcTagHelpersWebSite.Models;
 
-namespace MvcTagHelpersWebSite.Controllers
+namespace HtmlGenerationWebSite.Controllers
 {
-    public class MvcTagHelper_OrderController : Controller
+    public class HtmlGeneration_OrderController : Controller
     {
         public IActionResult Submit(Order order)
         {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_ProductController.cs b/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs
similarity index 79%
rename from test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_ProductController.cs
rename to test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs
index 40d9eb3825..09bfbf5d4e 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Controllers/MvcTagHelper_ProductController.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs
@@ -2,12 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using HtmlGenerationWebSite.Models;
 using Microsoft.AspNet.Mvc;
-using MvcTagHelpersWebSite.Models;
 
-namespace MvcTagHelpersWebSite.Controllers
+namespace HtmlGenerationWebSite.Controllers
 {
-    public class MvcTagHelper_ProductController : Controller
+    public class HtmlGeneration_ProductController : Controller
     {
         public IActionResult Index()
         {
diff --git a/test/WebSites/MvcTagHelpersWebSite/MvcTagHelpersWebSite.xproj b/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.xproj
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/MvcTagHelpersWebSite.xproj
rename to test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.xproj
diff --git a/test/WebSites/MvcTagHelpersWebSite/Models/Customer.cs b/test/WebSites/HtmlGenerationWebSite/Models/Customer.cs
similarity index 88%
rename from test/WebSites/MvcTagHelpersWebSite/Models/Customer.cs
rename to test/WebSites/HtmlGenerationWebSite/Models/Customer.cs
index b2de6aa244..202611dfb8 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Models/Customer.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Models/Customer.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace MvcTagHelpersWebSite.Models
+namespace HtmlGenerationWebSite.Models
 {
     public class Customer : Person
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Models/Employee.cs b/test/WebSites/HtmlGenerationWebSite/Models/Employee.cs
similarity index 92%
rename from test/WebSites/MvcTagHelpersWebSite/Models/Employee.cs
rename to test/WebSites/HtmlGenerationWebSite/Models/Employee.cs
index 066815dd85..cb9a0e4078 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Models/Employee.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Models/Employee.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace MvcTagHelpersWebSite.Models
+namespace HtmlGenerationWebSite.Models
 {
     public class Employee : Person
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Models/Folder.cs b/test/WebSites/HtmlGenerationWebSite/Models/Folder.cs
similarity index 94%
rename from test/WebSites/MvcTagHelpersWebSite/Models/Folder.cs
rename to test/WebSites/HtmlGenerationWebSite/Models/Folder.cs
index 87b99966a0..293792cd17 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Models/Folder.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Models/Folder.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Features.Internal;
 using Microsoft.AspNet.Http.Internal;
 
-namespace MvcTagHelpersWebSite.Models
+namespace HtmlGenerationWebSite.Models
 {
     public class Folder
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Models/Gender.cs b/test/WebSites/HtmlGenerationWebSite/Models/Gender.cs
similarity index 85%
rename from test/WebSites/MvcTagHelpersWebSite/Models/Gender.cs
rename to test/WebSites/HtmlGenerationWebSite/Models/Gender.cs
index a769cc21fa..b6d83253a4 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Models/Gender.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Models/Gender.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace MvcTagHelpersWebSite.Models
+namespace HtmlGenerationWebSite.Models
 {
     public enum Gender
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Models/Order.cs b/test/WebSites/HtmlGenerationWebSite/Models/Order.cs
similarity index 96%
rename from test/WebSites/MvcTagHelpersWebSite/Models/Order.cs
rename to test/WebSites/HtmlGenerationWebSite/Models/Order.cs
index 367873913b..9f41a9ae79 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Models/Order.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Models/Order.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MvcTagHelpersWebSite.Models
+namespace HtmlGenerationWebSite.Models
 {
     public class Order
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Models/Person.cs b/test/WebSites/HtmlGenerationWebSite/Models/Person.cs
similarity index 96%
rename from test/WebSites/MvcTagHelpersWebSite/Models/Person.cs
rename to test/WebSites/HtmlGenerationWebSite/Models/Person.cs
index 99938ae0dd..a6fff37da6 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Models/Person.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Models/Person.cs
@@ -4,7 +4,7 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNet.Mvc;
 
-namespace MvcTagHelpersWebSite.Models
+namespace HtmlGenerationWebSite.Models
 {
     public class Person
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Models/Product.cs b/test/WebSites/HtmlGenerationWebSite/Models/Product.cs
similarity index 89%
rename from test/WebSites/MvcTagHelpersWebSite/Models/Product.cs
rename to test/WebSites/HtmlGenerationWebSite/Models/Product.cs
index 04118673cd..9a70476b33 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Models/Product.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Models/Product.cs
@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace MvcTagHelpersWebSite.Models
+namespace HtmlGenerationWebSite.Models
 {
     public class Product
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Models/Warehouse.cs b/test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs
similarity index 93%
rename from test/WebSites/MvcTagHelpersWebSite/Models/Warehouse.cs
rename to test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs
index 813a871856..fa8bd6b02d 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Models/Warehouse.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace MvcTagHelpersWebSite.Models
+namespace HtmlGenerationWebSite.Models
 {
     public class Warehouse
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/ProductsService.cs b/test/WebSites/HtmlGenerationWebSite/ProductsService.cs
similarity index 92%
rename from test/WebSites/MvcTagHelpersWebSite/ProductsService.cs
rename to test/WebSites/HtmlGenerationWebSite/ProductsService.cs
index 948d906770..e4d328b8c1 100644
--- a/test/WebSites/MvcTagHelpersWebSite/ProductsService.cs
+++ b/test/WebSites/HtmlGenerationWebSite/ProductsService.cs
@@ -3,9 +3,8 @@
 
 using System.Threading;
 using Microsoft.Framework.Caching;
-using Microsoft.Framework.Caching.Memory;
 
-namespace MvcTagHelpersWebSite
+namespace HtmlGenerationWebSite
 {
     public class ProductsService
     {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Startup.cs b/test/WebSites/HtmlGenerationWebSite/Startup.cs
similarity index 90%
rename from test/WebSites/MvcTagHelpersWebSite/Startup.cs
rename to test/WebSites/HtmlGenerationWebSite/Startup.cs
index d18d6bb8dc..8e84ab8977 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Startup.cs
+++ b/test/WebSites/HtmlGenerationWebSite/Startup.cs
@@ -4,7 +4,7 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.Framework.DependencyInjection;
 
-namespace MvcTagHelpersWebSite
+namespace HtmlGenerationWebSite
 {
     public class Startup
     {
@@ -25,7 +25,7 @@ namespace MvcTagHelpersWebSite
                 routes.MapRoute(
                     name: "default",
                     template: "{controller}/{action}/{id?}",
-                    defaults: new { controller = "MvcTagHelper_Home", action = "Index" });
+                    defaults: new { controller = "HtmlGeneration_Home", action = "Index" });
                 routes.MapRoute(
                     name: "areaRoute",
                     template: "{area:exists}/{controller}/{action}/{id?}",
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Details.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
similarity index 84%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
index fc1eb4c40f..12c3d7fa32 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
@@ -1,4 +1,4 @@
-@model MvcTagHelpersWebSite.Models.Warehouse
+@model HtmlGenerationWebSite.Models.Warehouse
 
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
@@ -8,7 +8,7 @@
 
 <html>
 <body>
-    @using (Html.BeginForm("CreateWarehouse", "MvcTagHelper_Home"))
+    @using (Html.BeginForm("CreateWarehouse", "HtmlGeneration_Home"))
     {
         <div>
             <label asp-for="City" class="warehouse"></label>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditWarehouse.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
similarity index 91%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditWarehouse.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
index d8c13e1181..77c3994740 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditWarehouse.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
@@ -1,4 +1,4 @@
-@model MvcTagHelpersWebSite.Models.Warehouse
+@model HtmlGenerationWebSite.Models.Warehouse
 
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
@@ -8,7 +8,7 @@
 
 <html>
 <body>
-    <form asp-controller="MvcTagHelper_Home" asp-action="EditWarehouse" asp-anti-forgery="false">
+    <form asp-controller="HtmlGeneration_Home" asp-action="EditWarehouse" asp-anti-forgery="false">
         <div>
             @Html.DisplayFor(m => m.City)
             <input asp-for="City" type="text" />
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
similarity index 94%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
index d7e8dd9ab8..c8a83e3ca3 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
@@ -1,4 +1,4 @@
-@model MvcTagHelpersWebSite.Models.Employee
+@model HtmlGenerationWebSite.Models.Employee
 
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
new file mode 100644
index 0000000000..0522a5af33
--- /dev/null
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
@@ -0,0 +1,4 @@
+@using HtmlGenerationWebSite.Models
+@model Gender
+@Html.RadioButtonFor(m => m, value: "Male") Male
+@Html.RadioButtonFor(m => m, value: "Female") Female
\ No newline at end of file
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/GenderUsingTagHelpers.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
similarity index 55%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
index 90cb36f0d1..6e3eb3b2ed 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
@@ -1,4 +1,4 @@
-@using MvcTagHelpersWebSite.Models
+@using HtmlGenerationWebSite.Models
 @model Gender
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 <input asp-for="@Model" type="radio" value="Male" /> Male
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EmployeeList.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml
similarity index 70%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EmployeeList.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml
index 173c1dbe39..83bc47fba7 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EmployeeList.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml
@@ -1,4 +1,4 @@
-@using MvcTagHelpersWebSite.Models
+@using HtmlGenerationWebSite.Models
 
 @model List<Employee>
 
@@ -10,7 +10,7 @@
 <body>
     @if (Model != null && Model.Count() != 0)
     {
-        using (@Html.BeginForm("EmployeeList", "MvcTagHelper_Home", FormMethod.Post))
+        using (@Html.BeginForm("EmployeeList", "HtmlGeneration_Home", FormMethod.Post))
         {
             for (int i = 0; i < Model.Count; ++i)
             {
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Environment.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Environment.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
new file mode 100644
index 0000000000..efea289d60
--- /dev/null
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
@@ -0,0 +1,18 @@
+@using Microsoft.Framework.DependencyInjection
+@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Form</title>
+</head>
+<body>
+
+    <h2>Form Tag Helper Test</h2>
+    
+    <form></form>
+    <form asp-controller="HtmlGeneration_Home" asp-action="Form"></form>
+    <form asp-controller="HtmlGeneration_Home" asp-action="Form" asp-anti-forgery="true"></form>
+    <form asp-controller="HtmlGeneration_Home" asp-action="Form" asp-anti-forgery="false"></form>
+</body>
+</html>
\ No newline at end of file
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Image.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Image.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Index.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
similarity index 86%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Index.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
index 6645b9131e..73bf5c8413 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Index.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
@@ -13,7 +13,7 @@
         <a asp-controller="Product" asp-action="List" title='"the" title'>Product List</a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndex">MvcTagHelperTest Index</a>
+        <a id="HtmlGenerationWebSite_Index">HtmlGenerationWebSite Index</a>
     </div>
     <div>
         <a asp-action="Index">Default Controller</a>
@@ -25,13 +25,13 @@
         <a asp-controller="Product" asp-action="Submit" asp-fragment="fragment">Produt Submit Fragment</a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndexFragment" asp-fragment="fragment">
-            MvcTagHelperTest Index Fragment
+        <a id="HtmlGenerationWebSite_IndexFragment" asp-fragment="fragment">
+            HtmlGenerationWebSite Index Fragment
         </a>
     </div>
     <div>
         <a asp-action="Index" asp-fragment="fragment" asp-protocol="ftp">
-            FTP MvcTagHelperTest Index Fragment
+            FTP HtmlGenerationWebSite Index Fragment
         </a>
     </div>
     <div>
@@ -40,8 +40,8 @@
         </a>
     </div>
     <div>
-        <a id="MvcTagHelperTestIndexProtocol" asp-protocol="">
-            Empty Protocol MvcTagHelperTest Index
+        <a id="HtmlGenerationWebSite_IndexProtocol" asp-protocol="">
+            Empty Protocol HtmlGenerationWebSite Index
         </a>
     </div>
     <div>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Input.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
similarity index 94%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Input.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
index 0a22f9f5e7..b3e44285a2 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Input.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
@@ -1,4 +1,4 @@
-@using MvcTagHelpersWebSite.Models
+@using HtmlGenerationWebSite.Models
 @model Folder
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Link.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Link.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml
similarity index 96%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml
index 12ae02d7fe..3fd9aeb3b1 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Order.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml
@@ -1,4 +1,4 @@
-@model MvcTagHelpersWebSite.Models.Order
+@model HtmlGenerationWebSite.Models.Order
 
 @{
     ViewBag.Title = "Order Page";
@@ -18,7 +18,7 @@
     <title></title>
 </head>
 <body>
-    <form asp-controller="MvcTagHelper_Order" asp-action="Submit" asp-anti-forgery=" true">
+    <form asp-controller="HtmlGeneration_Order" asp-action="Submit" asp-anti-forgery=" true">
         <div>
             <label asp-for="Shipping" class="order"></label>
             <input asp-for="Shipping" type="text" asp-format="Your shipping method is {0}" size="50" />
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/OrderUsingHtmlHelpers.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml
similarity index 96%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/OrderUsingHtmlHelpers.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml
index 05fd856f97..5924f1eb98 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/OrderUsingHtmlHelpers.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml
@@ -1,4 +1,4 @@
-@model MvcTagHelpersWebSite.Models.Order
+@model HtmlGenerationWebSite.Models.Order
 
 @{
     ViewBag.Title = "Order Page";
@@ -12,7 +12,7 @@
 </head>
 <body>
     @* Use comments and <text/> elements to force whitespace in generated HTML. *@@using (
-Html.BeginForm(actionName: "Submit", controllerName: "MvcTagHelper_Order"))
+Html.BeginForm(actionName: "Submit", controllerName: "HtmlGeneration_Order"))
     {<text></text>
         <div>
             @Html.LabelFor(m => m.Shipping, htmlAttributes: new { @class = "order" })
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
similarity index 76%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
index f9da8c5fe0..bcaf0157c3 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
@@ -1,4 +1,4 @@
-@model MvcTagHelpersWebSite.Models.Product
+@model HtmlGenerationWebSite.Models.Product
 
 @{
     ViewBag.Title = "Product Page";
@@ -12,7 +12,7 @@
     <title></title>
 </head>
 <body>
-    <form asp-controller="MvcTagHelper_Home" asp-route-action="ProductSubmit" asp-anti-forgery="false" method="get">
+    <form asp-controller="HtmlGeneration_Home" asp-route-action="ProductSubmit" asp-anti-forgery="false" method="get">
         <div>
             <label asp-for="HomePage" class="product"></label>
             <input asp-for="HomePage" type="url" size="50" />
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
similarity index 88%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
index 501dfc5a83..461cf66fe3 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
@@ -1,4 +1,4 @@
-@using MvcTagHelpersWebSite.Models
+@using HtmlGenerationWebSite.Models
 @model IEnumerable<Product>
 
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
@@ -8,7 +8,7 @@
     <meta charset="utf-8" />
 </head>
 <body>
-    @using (@Html.BeginForm("Index", "MvcTagHelper_Product", FormMethod.Post))
+    @using (@Html.BeginForm("Index", "HtmlGeneration_Product", FormMethod.Post))
     {
         var index = 0;
         var fieldPrefix = ViewData.TemplateInfo.HtmlFieldPrefix;
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Script.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Script.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
similarity index 88%
rename from test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
index 2c5d5224b3..b57b14dd1e 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
@@ -1,4 +1,4 @@
-@model MvcTagHelpersWebSite.Models.Product
+@model HtmlGenerationWebSite.Models.Product
 
 @addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Components/Products/Default.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Products/Default.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Shared/Components/Products/Default.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Products/Default.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Components/Splash/Default.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Shared/Components/Splash/Default.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
similarity index 90%
rename from test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml
rename to test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
index e2f4b6374e..c757d592d0 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
@@ -1,4 +1,4 @@
-@model MvcTagHelpersWebSite.Models.Customer
+@model HtmlGenerationWebSite.Models.Customer
 
 @{
     ViewBag.Title = "Customer Page";
@@ -8,7 +8,7 @@
 
 <html>
 <body>
-    <form asp-route-area="Customer" asp-controller="MvcTagHelper_Customer" asp-action="Index">
+    <form asp-route-area="Customer" asp-controller="HtmlGeneration_Customer" asp-action="Index">
         <div>
             <label asp-for="Number" class="order"></label>
             <input asp-for="Number" type="number" class="form-control" />
diff --git a/test/WebSites/MvcTagHelpersWebSite/appRoot.css b/test/WebSites/HtmlGenerationWebSite/appRoot.css
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/appRoot.css
rename to test/WebSites/HtmlGenerationWebSite/appRoot.css
diff --git a/test/WebSites/MvcTagHelpersWebSite/appRoot.js b/test/WebSites/HtmlGenerationWebSite/appRoot.js
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/appRoot.js
rename to test/WebSites/HtmlGenerationWebSite/appRoot.js
diff --git a/test/WebSites/MvcTagHelpersWebSite/project.json b/test/WebSites/HtmlGenerationWebSite/project.json
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/project.json
rename to test/WebSites/HtmlGenerationWebSite/project.json
diff --git a/test/WebSites/HtmlGenerationWebSite/readme.md b/test/WebSites/HtmlGenerationWebSite/readme.md
new file mode 100644
index 0000000000..40cb613bba
--- /dev/null
+++ b/test/WebSites/HtmlGenerationWebSite/readme.md
@@ -0,0 +1,4 @@
+HtmlGenerationWebSite
+===
+
+This web site illustrates how to use MVC HTML and tag helpers.
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/HelloWorld.htm b/test/WebSites/HtmlGenerationWebSite/wwwroot/HelloWorld.htm
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/HelloWorld.htm
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/HelloWorld.htm
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/images/red.png b/test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/images/red.png
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/site.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/site.css
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/site.css
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/site.css
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/site.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/site.js
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/site.js
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/site.js
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site2.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.css
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site2.css
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.css
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site2.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.js
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site2.js
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site2.js
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site3.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.css
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site3.css
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.css
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site3.js b/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.js
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site3.js
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.js
diff --git a/test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site3.min.css b/test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.min.css
similarity index 100%
rename from test/WebSites/MvcTagHelpersWebSite/wwwroot/sub/site3.min.css
rename to test/WebSites/HtmlGenerationWebSite/wwwroot/sub/site3.min.css
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
deleted file mode 100644
index bfb24e4fc2..0000000000
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
+++ /dev/null
@@ -1,4 +0,0 @@
-@using MvcTagHelpersWebSite.Models
-@model Gender
-@Html.RadioButtonFor(m => m, value: "Male") Male
-@Html.RadioButtonFor(m => m, value: "Female") Female
\ No newline at end of file
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Form.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Form.cshtml
deleted file mode 100644
index b5b808a5fd..0000000000
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Form.cshtml
+++ /dev/null
@@ -1,18 +0,0 @@
-@using Microsoft.Framework.DependencyInjection
-@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
-
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title>Form</title>
-</head>
-<body>
-
-    <h2>Form Tag Helper Test</h2>
-    
-    <form></form>
-    <form asp-controller="MvcTagHelper_Home" asp-action="Form"></form>
-    <form asp-controller="MvcTagHelper_Home" asp-action="Form" asp-anti-forgery="true"></form>
-    <form asp-controller="MvcTagHelper_Home" asp-action="Form" asp-anti-forgery="false"></form>
-</body>
-</html>
\ No newline at end of file
diff --git a/test/WebSites/MvcTagHelpersWebSite/readme.md b/test/WebSites/MvcTagHelpersWebSite/readme.md
deleted file mode 100644
index c5f4dc9cae..0000000000
--- a/test/WebSites/MvcTagHelpersWebSite/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-MvcTagHelpersWebSite
-===
-
-This web site illustrates how to use MVC tag helpers.