diff --git a/samples/TagHelperSample.Web/Views/_ViewStart.cshtml b/samples/TagHelperSample.Web/Views/_ViewStart.cshtml
index db880152dc..dc7b704d1f 100644
--- a/samples/TagHelperSample.Web/Views/_ViewStart.cshtml
+++ b/samples/TagHelperSample.Web/Views/_ViewStart.cshtml
@@ -1,4 +1,4 @@
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 @{
     Layout = "_Layout";
diff --git a/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml b/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml
index 722ea106f8..fc46a399c0 100644
--- a/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml
+++ b/test/WebSites/ActivatorWebSite/Views/View/UseTagHelper.cshtml
@@ -1,7 +1,7 @@
 @using ActivatorWebSite.Models
 @model Item
 
-@addtaghelper "ActivatorWebSite"
+@addtaghelper "*, ActivatorWebSite"
 
 @{
     ViewBag.Title = "Activation Test";
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/_ViewStart.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/_ViewStart.cshtml
index 8febe27b2c..b8e4f17f01 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/_ViewStart.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/Catalog_CacheTagHelper/_ViewStart.cshtml
@@ -1 +1 @@
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
\ No newline at end of file
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
\ No newline at end of file
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml
index 8502487954..ff1d7dd5f0 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/CreateWarehouse.cshtml
@@ -1,6 +1,6 @@
 @model MvcTagHelpersWebSite.Models.Warehouse
 
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 @{
     ViewBag.Title = "Warehouse - Product";
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditWarehouse.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditWarehouse.cshtml
index 6cebd04dbe..f261b0ed02 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditWarehouse.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditWarehouse.cshtml
@@ -1,6 +1,6 @@
 @model MvcTagHelpersWebSite.Models.Warehouse
 
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 @{
     ViewBag.Title = "Warehouse - Employee";
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml
index f3aa2f1c9b..0272071c14 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Employee.cshtml
@@ -1,6 +1,6 @@
 @model MvcTagHelpersWebSite.Models.Employee
 
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 <div>
     @Html.LabelFor(m => m.Number)
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Gender.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Gender.cshtml
index 1481c6c16f..f693e9c1ee 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Gender.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/EditorTemplates/Gender.cshtml
@@ -1,5 +1,5 @@
 @using MvcTagHelpersWebSite.Models
 @model Gender
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 <input asp-for="@Model" type="radio" value="Male" /> Male
 <input asp-for="@Model" type="radio" value="Female" /> Female
\ No newline at end of file
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Environment.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Environment.cshtml
index 06dd4e84bc..f4a4120c71 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Environment.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Environment.cshtml
@@ -1,4 +1,4 @@
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 <!doctype html>
 <html>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Link.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Link.cshtml
index 66e6432164..77d606bf60 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Link.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Link.cshtml
@@ -1,4 +1,4 @@
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 <!doctype html>
 <html>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml
index 559af73824..610500a07a 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/Product.cshtml
@@ -4,7 +4,7 @@
     ViewBag.Title = "Product Page";
 }
 
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 <html>
 <head>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml
index 7c2889c7a8..f90f4690e5 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/ProductList.cshtml
@@ -1,7 +1,7 @@
 @using MvcTagHelpersWebSite.Models
 @model IEnumerable<Product>
 
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 <html>
 <head>
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml
index dcdf146564..0aa43bb564 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/MvcTagHelper_Home/_ProductPartial.cshtml
@@ -1,6 +1,6 @@
 @model MvcTagHelpersWebSite.Models.Product
 
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 <div>
     <label asp-for="Number" class="product" />
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Components/Splash/Default.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Components/Splash/Default.cshtml
index e62c9a6450..fda0a7258f 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Components/Splash/Default.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Components/Splash/Default.cshtml
@@ -1,4 +1,4 @@
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 @model string
 Locations closest to your locale:
 <cache vary-by-header="Locale">
diff --git a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml b/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml
index 8209b65bda..573baa463a 100644
--- a/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml
+++ b/test/WebSites/MvcTagHelpersWebSite/Views/Shared/Customer.cshtml
@@ -4,7 +4,7 @@
     ViewBag.Title = "Customer Page";
 }
 
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 <html>
 <body>
diff --git a/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml b/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
index f0c961cc89..4e0afd6559 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
@@ -1,6 +1,6 @@
 @model TagHelpersWebSite.Models.Employee
 
-@addtaghelper "Microsoft.AspNet.Mvc.TagHelpers"
+@addtaghelper "*, Microsoft.AspNet.Mvc.TagHelpers"
 
 @{
     Layout = null;
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml b/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
index e280df1ef7..151dd6b420 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
@@ -5,7 +5,7 @@
     ViewBag.Title = "Home Page";
 }
 
-@addtaghelper "TagHelpersWebSite"
+@addtaghelper "*, TagHelpersWebSite"
 
 @section css {
     <style condition="!Model.Approved">