diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
index 54044bcc0d..059914d02c 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs
@@ -11,6 +11,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
     /// <see cref="ITagHelper"/> implementation targeting &lt;textarea&gt; elements with an <c>asp-for</c> attribute.
     /// </summary>
     [ContentBehavior(ContentBehavior.Replace)]
+    [HtmlElementName("textarea")]
     public class TextAreaTagHelper : TagHelper
     {
         private const string ForAttributeName = "asp-for";
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html
index 22b7b20f68..2e248d7b06 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Customer.Index.html
@@ -29,8 +29,8 @@
         </div>
         <div>
             <label class="order" for="Gender">Gender</label>
-            <input type="radio" Value="Male" id="Gender" name="Gender" /> Male
-            <input type="radio" Value="Female" id="Gender" name="Gender" /> Female
+            <input type="radio" value="Male" id="Gender" name="Gender" /> Male
+            <input type="radio" value="Female" id="Gender" name="Gender" /> Female
             <span class="field-validation-valid" data-valmsg-for="Gender" data-valmsg-replace="true"></span>
         </div>
         <div class="order validation-summary-errors" data-valmsg-summary="true"><ul><li>A value is required.</li>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html
index 6ba3d0ffc8..4e69656839 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Customer.html
@@ -29,8 +29,8 @@
         </div>
         <div>
             <label class="order" for="Gender">Gender</label>
-            <input type="radio" Value="Male" id="Gender" name="Gender" /> Male
-            <input type="radio" Value="Female" id="Gender" name="Gender" /> Female
+            <input type="radio" value="Male" id="Gender" name="Gender" /> Male
+            <input type="radio" value="Female" id="Gender" name="Gender" /> Female
             <span class="field-validation-valid" data-valmsg-for="Gender" data-valmsg-replace="true"></span>
         </div>
         <div class="order validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
index 8e38335701..f9213ea9b1 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/MvcTagHelpersWebSite.MvcTagHelper_Home.Order.html
@@ -18,7 +18,7 @@
         </div>
         <div>
             <label class="order" for="Products">Products</label>
-            <select Multiple="multiple" id="Products" name="Products"><option value="0">Product_0</option>
+            <select multiple="multiple" id="Products" name="Products"><option value="0">Product_0</option>
 <option value="1">Product_1</option>
 <option selected="selected" value="2">Product_2</option>
 </select>
@@ -34,8 +34,8 @@
         <div>
             <label class="order" for="PaymentMethod">PaymentMethod</label>
             <select id="PaymentMethod" multiple="multiple" name="PaymentMethod">
-                <option Value="Credit">Credit</option>
-                <option Value="Check" selected="selected">Check</option>
+                <option value="Credit">Credit</option>
+                <option value="Check" selected="selected">Check</option>
             </select>
         </div>
         <div>
@@ -63,8 +63,8 @@
         </div>
         <div>
             <label class="order" for="Customer_Gender">Gender</label>
-            <input type="radio" Value="Male" id="Customer_Gender" name="Customer.Gender" /> Male
-            <input type="radio" Value="Female" checked="checked" id="Customer_Gender" name="Customer.Gender" /> Female
+            <input type="radio" value="Male" id="Customer_Gender" name="Customer.Gender" /> Male
+            <input type="radio" value="Female" checked="checked" id="Customer_Gender" name="Customer.Gender" /> Female
             <span class="field-validation-valid" data-valmsg-for="Customer.Gender" data-valmsg-replace="true"></span>
         </div>
         <div class="order validation-summary-valid" data-valmsg-summary="true"><ul><li style="display:none"></li>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html
index 3ac18fd762..11b09a7ed1 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.Invalid.html
@@ -36,7 +36,7 @@
                     <span class="field-validation-valid" data-valmsg-for="Email" data-valmsg-replace="true"></span>
                 </div>
             </div>
-            <input type="hidden" Value="0" id="EmployeeId" name="EmployeeId" />
+            <input type="hidden" value="0" id="EmployeeId" name="EmployeeId" />
             <div class="form-group">
                 <label class="control-label col-md-2" for="FullName">Full Name</label>
                 <div class="col-md-10">
@@ -47,8 +47,8 @@
             <div class="form-group">
                 <label class="control-label col-md-2" for="Gender">Gender</label>
                 <div class="col-md-10">
-                    <input type="radio" Value="M" checked="checked" id="Gender" name="Gender" /> Male
-                    <input type="radio" Value="F" id="Gender" name="Gender" /> Female
+                    <input type="radio" value="M" checked="checked" id="Gender" name="Gender" /> Male
+                    <input type="radio" value="F" id="Gender" name="Gender" /> Female
                     <span class="field-validation-valid" data-valmsg-for="Gender" data-valmsg-replace="true"></span>
                 </div>
             </div>
@@ -69,7 +69,7 @@
 
             <div class="form-group">
                 <div class="col-md-offset-2 col-md-10">
-                    <input class="btn btn-default" type="submit" Value="Create"></input>
+                    <input class="btn btn-default" type="submit" value="Create"></input>
                 </div>
             </div>
         </div>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html
index 85f318c70c..c38c8c2075 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/Compiler/Resources/TagHelpersWebSite.Employee.Create.html
@@ -34,7 +34,7 @@
                     <span class="field-validation-valid" data-valmsg-for="Email" data-valmsg-replace="true"></span>
                 </div>
             </div>
-            <input type="hidden" Value="0" id="EmployeeId" name="EmployeeId" />
+            <input type="hidden" value="0" id="EmployeeId" name="EmployeeId" />
             <div class="form-group">
                 <label class="control-label col-md-2" for="FullName">Full Name</label>
                 <div class="col-md-10">
@@ -45,8 +45,8 @@
             <div class="form-group">
                 <label class="control-label col-md-2" for="Gender">Gender</label>
                 <div class="col-md-10">
-                    <input type="radio" Value="M" id="Gender" name="Gender" /> Male
-                    <input type="radio" Value="F" id="Gender" name="Gender" /> Female
+                    <input type="radio" value="M" id="Gender" name="Gender" /> Male
+                    <input type="radio" value="F" id="Gender" name="Gender" /> Female
                     <span class="field-validation-valid" data-valmsg-for="Gender" data-valmsg-replace="true"></span>
                 </div>
             </div>
@@ -67,7 +67,7 @@
 
             <div class="form-group">
                 <div class="col-md-offset-2 col-md-10">
-                    <input class="btn btn-default" type="submit" Value="Create"></input>
+                    <input class="btn btn-default" type="submit" value="Create"></input>
                 </div>
             </div>
         </div>
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RequestServicesTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RequestServicesTest.cs
index 8bf7da227e..e52b7ae6fb 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RequestServicesTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RequestServicesTest.cs
@@ -65,7 +65,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
 
                 var body = (await response.Content.ReadAsStringAsync()).Trim();
 
-                var expected = "<requestscoped>" + requestId + "</requestscoped>";
+                var expected = "<request-scoped>" + requestId + "</request-scoped>";
                 Assert.Equal(expected, body);
             }
         }
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
index 69593eed9e..d562a524b1 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorHostTest.cs
@@ -52,9 +52,9 @@ namespace Microsoft.AspNet.Mvc.Razor
                                  generatedLineIndex: 25,
                                  generatedCharacterIndex: 14,
                                  contentLength: 85),
-                BuildLineMapping(documentAbsoluteIndex: 138,
+                BuildLineMapping(documentAbsoluteIndex: 139,
                                  documentLineIndex: 4,
-                                 documentCharacterIndex: 16,
+                                 documentCharacterIndex: 17,
                                  generatedAbsoluteIndex: 2058,
                                  generatedLineIndex: 52,
                                  generatedCharacterIndex: 107,
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Input/ModelExpressionTagHelper.cshtml b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Input/ModelExpressionTagHelper.cshtml
index 7114a5c211..73751bc204 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Input/ModelExpressionTagHelper.cshtml
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Input/ModelExpressionTagHelper.cshtml
@@ -2,4 +2,4 @@
 
 @addtaghelper "Microsoft.AspNet.Mvc.Razor.InputTestTagHelper, Microsoft.AspNet.Mvc.Razor.Host.Test"
 
-<inputTest for="Now" />
\ No newline at end of file
+<input-test for="Now" />
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
index 52d772d950..a0ad0bf866 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/TestFiles/Output/Runtime/ModelExpressionTagHelper.cs
@@ -1,4 +1,4 @@
-#pragma checksum "TestFiles/Input/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "11088b573392b1db9fe4cac4fff3a9ce68a72c40"
+#pragma checksum "TestFiles/Input/ModelExpressionTagHelper.cshtml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5de24be79bca2d0ce7e180eab7b197442352f137"
 namespace Asp
 {
     using Microsoft.AspNet.Razor.Runtime.TagHelpers;
@@ -45,11 +45,11 @@ namespace Asp
             BeginContext(120, 2, true);
             WriteLiteral("\r\n");
             EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("inputTest", "test");
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", "test");
             __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper = CreateTagHelper<Microsoft.AspNet.Mvc.Razor.InputTestTagHelper>();
             __tagHelperExecutionContext.Add(__Microsoft_AspNet_Mvc_Razor_InputTestTagHelper);
             __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For = CreateModelExpression(__model => __model.Now);
-            __tagHelperExecutionContext.AddTagHelperAttribute("For", __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For);
+            __tagHelperExecutionContext.AddTagHelperAttribute("for", __Microsoft_AspNet_Mvc_Razor_InputTestTagHelper.For);
             __tagHelperExecutionContext.Output = __tagHelperRunner.RunAsync(__tagHelperExecutionContext).Result;
             WriteLiteral(__tagHelperExecutionContext.Output.GenerateStartTag());
             WriteLiteral(__tagHelperExecutionContext.Output.GenerateEndTag());
diff --git a/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml b/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml
index f87669fbca..722ea106f8 100644
--- a/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml
+++ b/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml
@@ -8,6 +8,6 @@
 }
 
 <body>
-<div expression="Name" repeatcontent="3"></div>
+<div expression="Name" repeat-content="3"></div>
 <span name="foo">test content</span>
 </body>
\ No newline at end of file
diff --git a/test/WebSites/RequestServicesWebSite/Views/Other/TagHelper.cshtml b/test/WebSites/RequestServicesWebSite/Views/Other/TagHelper.cshtml
index b459fc044f..e1f0dec043 100644
--- a/test/WebSites/RequestServicesWebSite/Views/Other/TagHelper.cshtml
+++ b/test/WebSites/RequestServicesWebSite/Views/Other/TagHelper.cshtml
@@ -1,3 +1,3 @@
 @using RequestServicesWebSite
 @addtaghelper "RequestServicesWebSite.RequestScopedTagHelper, RequestServicesWebSite"
-<requestscoped></requestscoped>
\ No newline at end of file
+<request-scoped></request-scoped>
\ No newline at end of file
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml b/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
index 93f679a046..4acb9f2028 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
@@ -11,7 +11,7 @@
     <p>Hello, you've reached the about page.</p>
 
     <h3>Information about our website (outdated):</h3>
-    <websiteinformation info="new WebsiteContext {
+    <website-information info="new WebsiteContext {
                                     Version = new Version(1, 1),
                                     CopyrightYear = 1990,
                                     Approved = true,
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml b/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
index 6bc1da9313..e280df1ef7 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
@@ -17,7 +17,7 @@
 }
 
 <div condition="!Model.Approved">
-    <p>This website has <strong>not</strong> been approved yet. Visit www.contoso.com for <strong makePretty="false">more</strong> information.</p>
+    <p>This website has <strong>not</strong> been approved yet. Visit www.contoso.com for <strong make-pretty="false">more</strong> information.</p>
 </div>
 
 <div>