diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 1a56610772..b3196c341d 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -9,8 +9,8 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.AspNet.Razor": { },
-            "Microsoft.AspNet.Razor.Runtime": { }
+            "Microsoft.AspNetCore.Razor": { },
+            "Microsoft.AspNetCore.Razor.Runtime": { }
         }
     },
     "adx-nonshipping": { // Packages written by the ADX team but that don't ship on NuGet.org (thus, no need to scan anything in them)
@@ -18,7 +18,7 @@
             // Don't run any rules for packages the ADX team creates but doesn't ship.
         ],
         "packages": {
-            "Microsoft.AspNet.Razor.Test.Sources": { }
+            "Microsoft.AspNetCore.Razor.Test.Sources": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.
diff --git a/Razor.sln b/Razor.sln
index 4f84447468..9edc90c924 100644
--- a/Razor.sln
+++ b/Razor.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
@@ -7,15 +7,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C0D6505-79B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{92463391-81BE-462B-AC3C-78C6C760741F}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Razor", "src\Microsoft.AspNet.Razor\Microsoft.AspNet.Razor.xproj", "{EDA30434-C567-44DC-B8B6-2566A7F77163}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Razor", "src\Microsoft.AspNetCore.Razor\Microsoft.AspNetCore.Razor.xproj", "{EDA30434-C567-44DC-B8B6-2566A7F77163}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Razor.Test", "test\Microsoft.AspNet.Razor.Test\Microsoft.AspNet.Razor.Test.xproj", "{87C7338B-0C06-4C7B-BE75-A2368AE26797}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Razor.Test", "test\Microsoft.AspNetCore.Razor.Test\Microsoft.AspNetCore.Razor.Test.xproj", "{87C7338B-0C06-4C7B-BE75-A2368AE26797}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Razor.Runtime", "src\Microsoft.AspNet.Razor.Runtime\Microsoft.AspNet.Razor.Runtime.xproj", "{D0196096-1B01-4133-AACE-1A10A0F7247C}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Razor.Runtime", "src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.xproj", "{D0196096-1B01-4133-AACE-1A10A0F7247C}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Razor.Runtime.Test", "test\Microsoft.AspNet.Razor.Runtime.Test\Microsoft.AspNet.Razor.Runtime.Test.xproj", "{0535998A-E32C-4D1A-80D1-0B15A513C471}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Razor.Runtime.Test", "test\Microsoft.AspNetCore.Razor.Runtime.Test\Microsoft.AspNetCore.Razor.Runtime.Test.xproj", "{0535998A-E32C-4D1A-80D1-0B15A513C471}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Razor.Test.Sources", "src\Microsoft.AspNet.Razor.Test.Sources\Microsoft.AspNet.Razor.Test.Sources.xproj", "{E3A2A305-634D-4BA6-95DB-AA06D6C442B0}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Razor.Test.Sources", "src\Microsoft.AspNetCore.Razor.Test.Sources\Microsoft.AspNetCore.Razor.Test.Sources.xproj", "{E3A2A305-634D-4BA6-95DB-AA06D6C442B0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs
index d39b410d86..22bcc4fa62 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs
@@ -6,5 +6,5 @@ using System.Resources;
 using System.Runtime.CompilerServices;
 
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: InternalsVisibleTo("Microsoft.AspNet.Razor.Runtime.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Runtime.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: NeutralResourcesLanguage("en-us")]
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs
index 5dfc9ee0e4..3b10a1fd0b 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.AspNet.Razor.Runtime
+namespace Microsoft.AspNetCore.Razor.Runtime
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Razor.Runtime
     internal static class Resources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNet.Razor.Runtime.Resources", typeof(Resources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.AspNetCore.Razor.Runtime.Resources", typeof(Resources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// Invalid tag helper directive look up text '{0}'. The correct look up text format is: "typeName, assemblyName".
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/Constants.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/Constants.cs
index 34710fe909..3004c2d729 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/Constants.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/Constants.cs
@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     internal static class Constants
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs
index a007dc7f10..677363c108 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs
@@ -7,11 +7,11 @@ using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     /// <summary>
     /// Factory for <see cref="TagHelperDescriptor"/>s from <see cref="Type"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs
index 4ce9231994..b209c45a20 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     /// <summary>
     /// Used to resolve <see cref="TagHelperDescriptor"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs
index dfcd3fbff4..925ed7340c 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs
@@ -9,11 +9,11 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     /// <summary>
     /// Factory for providing <see cref="TagHelperDesignTimeDescriptor"/>s from <see cref="Type"/>s and
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
index d344756e22..f17a1536a2 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
@@ -5,9 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     /// <summary>
     /// Class used to store information about a <see cref="ITagHelper"/>'s execution lifetime.
@@ -238,7 +238,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
         /// </param>
         /// <param name="encoder">
         /// The <see cref="HtmlEncoder"/> to use when the page handles
-        /// non-<see cref="Microsoft.AspNet.Html.IHtmlContent"/> C# expressions. If <c>null</c>, executes children with
+        /// non-<see cref="Microsoft.AspNetCore.Html.IHtmlContent"/> C# expressions. If <c>null</c>, executes children with
         /// the page's current <see cref="HtmlEncoder"/>.
         /// </param>
         /// <returns>A <see cref="Task"/> that on completion returns the rendered child content.</returns>
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs
index a2e814c23b..91f3057525 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     /// <summary>
     /// A class used to run <see cref="ITagHelper"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs
index 9716b05cf2..80fa37cdbc 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     /// <summary>
     /// Class that manages <see cref="TagHelperExecutionContext"/> scopes.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs
index 0bbd83831b..4db643497f 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs
@@ -5,9 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     /// <summary>
     /// Class that locates valid <see cref="ITagHelper"/>s within an assembly.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs
index e7c236af9e..57161a9876 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs
@@ -9,7 +9,7 @@ using System.Reflection;
 using System.Text;
 using System.Xml.Linq;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     /// <summary>
     /// Extracts summary and remarks XML documentation from an XML documentation file.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
index e1e0936f61..11602916ec 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
@@ -7,9 +7,9 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Text.Encodings.Web;
-using Microsoft.AspNet.Html;
+using Microsoft.AspNetCore.Html;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Default concrete <see cref="TagHelperContent"/>.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs
index 597aa0a88e..aca16610b0 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Used to override an <see cref="ITagHelper"/> property's HTML attribute name.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs
index 15421d0736..9d23480abd 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Indicates the associated <see cref="ITagHelper"/> property should not be bound to HTML attributes.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs
index 7a3f789e4f..d9657e0f56 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Provides an <see cref="ITagHelper"/>'s target.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs
index 5b7148b80c..f7883299b8 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// A read-only HTML tag helper attribute.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ITagHelper.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ITagHelper.cs
index 5cb6151f22..7d97dcb266 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ITagHelper.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ITagHelper.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Contract used to filter matching HTML elements.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/NullHtmlEncoder.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/NullHtmlEncoder.cs
index f3b0637e4b..9c7c6c3284 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/NullHtmlEncoder.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/NullHtmlEncoder.cs
@@ -1,11 +1,11 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 System.IO;
 using System.Text.Encodings.Web;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// A <see cref="HtmlEncoder"/> that does not encode. Should not be used when writing directly to a response
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs
index a7cae8fd69..a97b5ef9ab 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Provides a hint of the <see cref="ITagHelper"/>'s output element.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs
index 161309a46f..bf4ad973fd 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// A read-only collection of <typeparamref name="TAttribute"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs
index 7f0626c134..bc4f6bac35 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs
@@ -1,10 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Restricts children of the <see cref="ITagHelper"/>'s element.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs
index 267a243deb..df82eb3797 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Class used to filter matching HTML elements.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttribute.cs
index 9262bbe790..a96d1086b9 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttribute.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttribute.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// An HTML tag helper attribute.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs
index f6cd6807e7..419e92c87a 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Runtime;
+using Microsoft.AspNetCore.Razor.Runtime;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// A collection of <see cref="TagHelperAttribute"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContent.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContent.cs
index 75e83ad7bd..45a8160444 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContent.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContent.cs
@@ -4,9 +4,9 @@
 using System;
 using System.IO;
 using System.Text.Encodings.Web;
-using Microsoft.AspNet.Html;
+using Microsoft.AspNetCore.Html;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Abstract class used to buffer content returned by <see cref="ITagHelper"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContext.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContext.cs
index 76faafd8bc..5f7d590e5d 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContext.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContext.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Contains information related to the execution of <see cref="ITagHelper"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperOutput.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperOutput.cs
index 35fcdd2780..8eaa47bfe6 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperOutput.cs
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperOutput.cs
@@ -5,9 +5,9 @@ using System;
 using System.IO;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Html;
+using Microsoft.AspNetCore.Html;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// Class used to represent the output of an <see cref="ITagHelper"/>.
@@ -184,7 +184,7 @@ namespace Microsoft.AspNet.Razor.TagHelpers
         /// </summary>
         /// <remarks>
         /// MVC will HTML encode <see cref="string"/> values when generating the start tag. It will not HTML encode
-        /// a <c>Microsoft.AspNet.Mvc.Rendering.HtmlString</c> instance. MVC converts most other types to a
+        /// a <c>Microsoft.AspNetCore.Mvc.Rendering.HtmlString</c> instance. MVC converts most other types to a
         /// <see cref="string"/>, then HTML encodes the result.
         /// </remarks>
         public TagHelperAttributeList Attributes { get; }
diff --git a/src/Microsoft.AspNetCore.Razor.Runtime/project.json b/src/Microsoft.AspNetCore.Razor.Runtime/project.json
index 5979656201..b438901938 100644
--- a/src/Microsoft.AspNetCore.Razor.Runtime/project.json
+++ b/src/Microsoft.AspNetCore.Razor.Runtime/project.json
@@ -11,8 +11,8 @@
     "url": "git://github.com/aspnet/razor"
   },
   "dependencies": {
-    "Microsoft.AspNet.Html.Abstractions": "1.0.0-*",
-    "Microsoft.AspNet.Razor": "4.0.0-*",
+    "Microsoft.AspNetCore.Html.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Razor": "4.0.0-*",
     "Microsoft.Extensions.ClosedGenericMatcher.Sources": {
       "type": "build",
       "version": "1.0.0-*"
diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs
index 245610ade6..a412f7197c 100644
--- a/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs
+++ b/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.Test.Internal
 {
     internal class CaseSensitiveTagHelperDescriptorComparer : TagHelperDescriptorComparer
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs
index da2a4ab9c3..66711b3a41 100644
--- a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs
+++ b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.Test.Internal
 {
     internal class TagHelperAttributeDescriptorComparer : IEqualityComparer<TagHelperAttributeDescriptor>
     {
diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs
index 3ef5d91194..6f9f401efa 100644
--- a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs
+++ b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.Test.Internal
 {
     internal class TagHelperAttributeDesignTimeDescriptorComparer :
         IEqualityComparer<TagHelperAttributeDesignTimeDescriptor>
diff --git a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs
index 142bc88507..6fbfc16499 100644
--- a/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs
+++ b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Razor.Test.Internal
 {
     internal class TagHelperDesignTimeDescriptorComparer : IEqualityComparer<TagHelperDesignTimeDescriptor>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CSharpRazorCodeLanguage.cs b/src/Microsoft.AspNetCore.Razor/CSharpRazorCodeLanguage.cs
index 7c48b45c85..dc9c0f5eb2 100644
--- a/src/Microsoft.AspNetCore.Razor/CSharpRazorCodeLanguage.cs
+++ b/src/Microsoft.AspNetCore.Razor/CSharpRazorCodeLanguage.cs
@@ -1,14 +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 Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
 #if NET451
 
 #endif
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// Defines the C# Code Language for Razor
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/AddTagHelperChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/AddTagHelperChunk.cs
index cd10865d85..86f9bbed8f 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/AddTagHelperChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/AddTagHelperChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     /// <summary>
     /// A <see cref="Chunk"/> used to look up <see cref="Compilation.TagHelpers.TagHelperDescriptor"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Chunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Chunk.cs
index b63733bc99..8d6840328b 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Chunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Chunk.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class Chunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTree.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTree.cs
index 9f497d7284..d7aa853afc 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTree.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTree.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class ChunkTree : ParentChunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTreeBuilder.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTreeBuilder.cs
index 594e6c9184..bdcbe142a4 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTreeBuilder.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTreeBuilder.cs
@@ -3,9 +3,9 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class ChunkTreeBuilder
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/CodeAttributeChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/CodeAttributeChunk.cs
index cecd46ce19..ba31b234a3 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/CodeAttributeChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/CodeAttributeChunk.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class CodeAttributeChunk : ParentChunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/DynamicCodeAttributeChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/DynamicCodeAttributeChunk.cs
index 54c0092c02..97833d746a 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/DynamicCodeAttributeChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/DynamicCodeAttributeChunk.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class DynamicCodeAttributeChunk : ParentChunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionBlockChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionBlockChunk.cs
index dc6dc0bc8a..2ef28150b5 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionBlockChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionBlockChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class ExpressionBlockChunk : ParentChunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionChunk.cs
index c783151248..93cb225ac7 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class ExpressionChunk : Chunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddImportChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddImportChunkGenerator.cs
index 27d1ba712a..a9e028d562 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddImportChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddImportChunkGenerator.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class AddImportChunkGenerator : SpanChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddTagHelperChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddTagHelperChunkGenerator.cs
index 52959aa03b..eaa37af67b 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddTagHelperChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddTagHelperChunkGenerator.cs
@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     /// <summary>
     /// A <see cref="SpanChunkGenerator"/> responsible for generating <see cref="AddTagHelperChunk"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs
index 9469fb35b1..4971a66406 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Globalization;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class AttributeBlockChunkGenerator : ParentChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ChunkGeneratorContext.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ChunkGeneratorContext.cs
index 95ff4493f8..2adf230986 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ChunkGeneratorContext.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ChunkGeneratorContext.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 Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class ChunkGeneratorContext
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/DynamicAttributeBlockChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/DynamicAttributeBlockChunkGenerator.cs
index 05879b6da2..6056c96674 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/DynamicAttributeBlockChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/DynamicAttributeBlockChunkGenerator.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Globalization;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class DynamicAttributeBlockChunkGenerator : ParentChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ExpressionChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ExpressionChunkGenerator.cs
index adfee65da3..809fcdb10a 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ExpressionChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ExpressionChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class ExpressionChunkGenerator : ISpanChunkGenerator, IParentChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/IParentChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/IParentChunkGenerator.cs
index d4a300ba82..f5ae9c9aa8 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/IParentChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/IParentChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public interface IParentChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ISpanChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ISpanChunkGenerator.cs
index 48fcf0faad..ab7dcde8d3 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ISpanChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ISpanChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public interface ISpanChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs
index 71b1b93ef6..a9a03fff12 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Globalization;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class LiteralAttributeChunkGenerator : SpanChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/MarkupChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/MarkupChunkGenerator.cs
index 26267b29be..48d897dd32 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/MarkupChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/MarkupChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class MarkupChunkGenerator : SpanChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ParentChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ParentChunkGenerator.cs
index 6a03a24e10..e05ff9d1a6 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ParentChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ParentChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public abstract class ParentChunkGenerator : IParentChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorChunkGenerator.cs
index a6d057f3b1..5dfb12c856 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorChunkGenerator.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class RazorChunkGenerator : ParserVisitor
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorCommentChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorCommentChunkGenerator.cs
index ba0d202987..4b12955a11 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorCommentChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorCommentChunkGenerator.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class RazorCommentChunkGenerator : ParentChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RemoveTagHelperChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RemoveTagHelperChunkGenerator.cs
index c4ddf59566..3817d32dcd 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RemoveTagHelperChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RemoveTagHelperChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     /// <summary>
     /// A <see cref="SpanChunkGenerator"/> responsible for generating <see cref="RemoveTagHelperChunk"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SectionChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SectionChunkGenerator.cs
index 4ed679c982..917ba33b1e 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SectionChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SectionChunkGenerator.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class SectionChunkGenerator : ParentChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SetBaseTypeChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SetBaseTypeChunkGenerator.cs
index 4b4384ea38..b0d0648ab8 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SetBaseTypeChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SetBaseTypeChunkGenerator.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class SetBaseTypeChunkGenerator : SpanChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SpanChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SpanChunkGenerator.cs
index c315232f7e..75870a8104 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SpanChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SpanChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public abstract class SpanChunkGenerator : ISpanChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/StatementChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/StatementChunkGenerator.cs
index 7504fefc7e..fe17f5d566 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/StatementChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/StatementChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class StatementChunkGenerator : SpanChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperChunkGenerator.cs
index 2617565b86..b59baafc18 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperChunkGenerator.cs
@@ -4,11 +4,11 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Parser.TagHelpers;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     /// <summary>
     /// A <see cref="ParentChunkGenerator"/> that is responsible for generating valid <see cref="TagHelperChunk"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperPrefixDirectiveChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperPrefixDirectiveChunkGenerator.cs
index 1face04617..ff1faeaf61 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperPrefixDirectiveChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperPrefixDirectiveChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     /// <summary>
     /// A <see cref="SpanChunkGenerator"/> responsible for generating
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TemplateBlockChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TemplateBlockChunkGenerator.cs
index 6874c7b37d..d52e7c0d44 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TemplateBlockChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TemplateBlockChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class TemplateBlockChunkGenerator : ParentChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TypeMemberChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TypeMemberChunkGenerator.cs
index cfda1aa1ed..2a2cd1359e 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TypeMemberChunkGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TypeMemberChunkGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class TypeMemberChunkGenerator : SpanChunkGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/LiteralChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/LiteralChunk.cs
index 756e131ee2..769de11adc 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/LiteralChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/LiteralChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class LiteralChunk : Chunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/LiteralCodeAttributeChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/LiteralCodeAttributeChunk.cs
index dce9c0d5c6..4915745a88 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/LiteralCodeAttributeChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/LiteralCodeAttributeChunk.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class LiteralCodeAttributeChunk : ParentChunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/ParentChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ParentChunk.cs
index da88454827..6230a62482 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/ParentChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/ParentChunk.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class ParentChunk : Chunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/ParentLiteralChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ParentLiteralChunk.cs
index 83f5858f97..fe9fabcf3d 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/ParentLiteralChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/ParentLiteralChunk.cs
@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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.Text;
 
-namespace Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class ParentLiteralChunk : ParentChunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/RemoveTagHelperChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/RemoveTagHelperChunk.cs
index 6de311905b..f924f9c2ab 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/RemoveTagHelperChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/RemoveTagHelperChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     /// <summary>
     /// A <see cref="Chunk"/> used to look up <see cref="Compilation.TagHelpers.TagHelperDescriptor"/>s that should be ignored
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/SectionChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/SectionChunk.cs
index 6262484a22..c266bdd940 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/SectionChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/SectionChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class SectionChunk : ParentChunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/SetBaseTypeChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/SetBaseTypeChunk.cs
index 06d9e270d7..c33e75e228 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/SetBaseTypeChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/SetBaseTypeChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class SetBaseTypeChunk : Chunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/StatementChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/StatementChunk.cs
index 49e40dc6fa..0f1a47f704 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/StatementChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/StatementChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class StatementChunk : Chunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperChunk.cs
index 3e0a700685..87564839ac 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperChunk.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     /// <summary>
     /// A <see cref="ParentChunk"/> that represents a special HTML tag.
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperPrefixDirectiveChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperPrefixDirectiveChunk.cs
index a935f2b60a..43e8230582 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperPrefixDirectiveChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperPrefixDirectiveChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     /// <summary>
     /// A <see cref="Chunk"/> for the <c>@tagHelperPrefix</c> directive.
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/TemplateChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/TemplateChunk.cs
index 4089f96245..68a8336964 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/TemplateChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/TemplateChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class TemplateChunk : ParentChunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/TypeMemberChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/TypeMemberChunk.cs
index 394ce2a399..b89e5ea8b1 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/TypeMemberChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/TypeMemberChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class TypeMemberChunk : Chunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Chunks/UsingChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/UsingChunk.cs
index 60902ac7c1..9a95091c7a 100644
--- a/src/Microsoft.AspNetCore.Razor/Chunks/UsingChunk.cs
+++ b/src/Microsoft.AspNetCore.Razor/Chunks/UsingChunk.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 Microsoft.AspNet.Razor.Chunks
+namespace Microsoft.AspNetCore.Razor.Chunks
 {
     public class UsingChunk : Chunk
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeGenerator.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeGenerator.cs
index bad134b7f8..c2d0198ef3 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeGenerator.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.Chunks;
-using Microsoft.AspNet.Razor.CodeGenerators.Visitors;
+using Microsoft.AspNetCore.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.CodeGenerators.Visitors;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CSharpCodeGenerator : CodeGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWriter.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWriter.cs
index 2112fc110c..d8ed65bae6 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWriter.cs
@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CSharpCodeWriter : CodeWriter
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWritingScope.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWritingScope.cs
index 4e64c00d74..9b6ec1342a 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWritingScope.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWritingScope.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public struct CSharpCodeWritingScope : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpDisableWarningScope.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpDisableWarningScope.cs
index 3c319c5f12..9215af74d6 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpDisableWarningScope.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpDisableWarningScope.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public struct CSharpDisableWarningScope : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpLineMappingWriter.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpLineMappingWriter.cs
index 989ef7e812..9b703b8e05 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpLineMappingWriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpLineMappingWriter.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CSharpLineMappingWriter : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpPaddingBuilder.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpPaddingBuilder.cs
index 43fbcb2d48..a13071f18e 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpPaddingBuilder.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpPaddingBuilder.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CSharpPaddingBuilder
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs
index a11eb7790d..aa10345f4f 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs
@@ -6,12 +6,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks;
-using Microsoft.AspNet.Razor.CodeGenerators.Visitors;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.CodeGenerators.Visitors;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     /// <summary>
     /// Renders tag helper rendering code.
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGenerator.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGenerator.cs
index e4930f42cb..fba661d227 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGenerator.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGenerator.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 Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public abstract class CodeGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorContext.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorContext.cs
index b3dc00fcdc..ff8f38ddda 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorContext.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorContext.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     /// <summary>
     /// Context object with information used to generate a Razor page.
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorResult.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorResult.cs
index 2d03a5fd4f..8e03030791 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorResult.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorResult.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CodeGeneratorResult
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeWriter.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeWriter.cs
index 0a4043ebe6..6feb966e04 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeWriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeWriter.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Text;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CodeWriter : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/ExpressionRenderingMode.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/ExpressionRenderingMode.cs
index d580d375f1..6793a23429 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/ExpressionRenderingMode.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/ExpressionRenderingMode.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 Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public enum ExpressionRenderingMode
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedClassContext.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedClassContext.cs
index 71eba9c828..2705597fad 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedClassContext.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedClassContext.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public struct GeneratedClassContext
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedTagHelperContext.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedTagHelperContext.cs
index 3bdffb843b..c2181b6237 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedTagHelperContext.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedTagHelperContext.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 Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     /// <summary>
     /// Contains necessary information for the tag helper code generation process.
@@ -29,10 +29,10 @@ namespace Microsoft.AspNet.Razor.CodeGenerators
             MarkAsHtmlEncodedMethodName = "Html.Raw";
             StartTagHelperWritingScopeMethodName = "StartTagHelperWritingScope";
             EndTagHelperWritingScopeMethodName = "EndTagHelperWritingScope";
-            RunnerTypeName = "Microsoft.AspNet.Razor.Runtime.TagHelperRunner";
-            ScopeManagerTypeName = "Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager";
-            ExecutionContextTypeName = "Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext";
-            TagHelperContentTypeName = "Microsoft.AspNet.Razor.TagHelperContent";
+            RunnerTypeName = "Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner";
+            ScopeManagerTypeName = "Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager";
+            ExecutionContextTypeName = "Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext";
+            TagHelperContentTypeName = "Microsoft.AspNetCore.Razor.TagHelperContent";
             TagHelperContentGetContentMethodName = "GetContent";
             HtmlEncoderPropertyName = "HtmlEncoder";
             TagHelperOutputIsContentModifiedPropertyName = "IsContentModified";
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratorResults.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratorResults.cs
index c9094c1948..053b78c630 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratorResults.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratorResults.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     /// <summary>
     /// The results of parsing and generating code for a Razor document.
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMapping.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMapping.cs
index 39a7e7d2c8..337c04d45c 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMapping.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMapping.cs
@@ -4,7 +4,7 @@
 using System.Globalization;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class LineMapping
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMappingManager.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMappingManager.cs
index 584a83111a..ff8c920b4b 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMappingManager.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMappingManager.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class LineMappingManager
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/MappingLocation.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/MappingLocation.cs
index 235974058a..03af0e5f13 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/MappingLocation.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/MappingLocation.cs
@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class MappingLocation
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/TagHelperAttributeValueCodeRenderer.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/TagHelperAttributeValueCodeRenderer.cs
index 7af38de6b3..c16bb0eb57 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/TagHelperAttributeValueCodeRenderer.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/TagHelperAttributeValueCodeRenderer.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     /// <summary>
     /// Renders code for tag helper property initialization.
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpBaseTypeVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpBaseTypeVisitor.cs
index 9bd5178000..1d5c2b6853 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpBaseTypeVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpBaseTypeVisitor.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Chunks;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public class CSharpBaseTypeVisitor : CodeVisitor<CSharpCodeWriter>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpCodeVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpCodeVisitor.cs
index 75e76be6cb..2317168d9c 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpCodeVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpCodeVisitor.cs
@@ -5,10 +5,10 @@ using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public class CSharpCodeVisitor : CodeVisitor<CSharpCodeWriter>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpDesignTimeCodeVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpDesignTimeCodeVisitor.cs
index 88a1d32129..f9d050dbb2 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpDesignTimeCodeVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpDesignTimeCodeVisitor.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using Microsoft.AspNet.Razor.Chunks;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public class CSharpDesignTimeCodeVisitor : CodeVisitor<CSharpCodeWriter>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperAttributeValueVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperAttributeValueVisitor.cs
index 3798708a8b..7af7c51b26 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperAttributeValueVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperAttributeValueVisitor.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     /// <summary>
     /// <see cref="CodeVisitor{CSharpCodeWriter}"/> that writes code for a non-<see langword="string"/> tag helper
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs
index 4ff1c9d595..956e2c86ce 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Chunks;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public class CSharpTagHelperFieldDeclarationVisitor : CodeVisitor<CSharpCodeWriter>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs
index 9c8afd5dd5..7712116efc 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Chunks;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     /// <summary>
     /// The <see cref="CodeVisitor{T}"/> that generates the code to initialize the TagHelperRunner.
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTypeMemberVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTypeMemberVisitor.cs
index 77656f9aa5..386e4b3289 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTypeMemberVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTypeMemberVisitor.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Chunks;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public class CSharpTypeMemberVisitor : CodeVisitor<CSharpCodeWriter>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs
index e37103f1af..d1bc7db4c0 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public class CSharpUsingVisitor : CodeVisitor<CSharpCodeWriter>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/ChunkVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/ChunkVisitor.cs
index 1c678bbc64..30d919e69b 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/ChunkVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/ChunkVisitor.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Chunks;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public abstract class ChunkVisitor<TWriter> : IChunkVisitor
         where TWriter : CodeWriter
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CodeVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CodeVisitor.cs
index 4eb07c977a..93ff94a122 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CodeVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CodeVisitor.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Chunks;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public class CodeVisitor<TWriter> : ChunkVisitor<TWriter>
         where TWriter : CodeWriter
diff --git a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/IChunkVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/IChunkVisitor.cs
index f7b84c6da8..489b83bc5a 100644
--- a/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/IChunkVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/IChunkVisitor.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Chunks;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators.Visitors
+namespace Microsoft.AspNetCore.Razor.CodeGenerators.Visitors
 {
     public interface IChunkVisitor
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/ITagHelperDescriptorResolver.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/ITagHelperDescriptorResolver.cs
index 7bf86b1f25..46616487f1 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/ITagHelperDescriptorResolver.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/ITagHelperDescriptorResolver.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// Contract used to resolve <see cref="TagHelperDescriptor"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDescriptor.cs
index 3b8baa30e0..ccb9a77feb 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDescriptor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDescriptor.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Reflection;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// A metadata class describing a tag helper attribute.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDesignTimeDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDesignTimeDescriptor.cs
index 29298cac99..69be466b0b 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDesignTimeDescriptor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDesignTimeDescriptor.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 Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// A metadata class containing information about tag helper use.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
index 1a98a9a18f..ef7bf64b83 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// A metadata class describing a tag helper.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorComparer.cs
index 62f57d9e9f..1497e440e0 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorComparer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorComparer.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// An <see cref="IEqualityComparer{TagHelperDescriptor}"/> used to check equality between
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorProvider.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorProvider.cs
index f50a63f007..d034da740a 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorProvider.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorProvider.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// Enables retrieval of <see cref="TagHelperDescriptor"/>'s.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorResolutionContext.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorResolutionContext.cs
index 880f6c937e..0f983b5c1a 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorResolutionContext.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorResolutionContext.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// Contains information needed to resolve <see cref="TagHelperDescriptor"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDesignTimeDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDesignTimeDescriptor.cs
index 5cdff88a41..1bfd99c078 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDesignTimeDescriptor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDesignTimeDescriptor.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 Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// A metadata class containing design time information about a tag helper.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveDescriptor.cs
index b372457b03..ef59e2951c 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveDescriptor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveDescriptor.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// Contains information needed to resolve <see cref="TagHelperDescriptor"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveType.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveType.cs
index d2cec61c63..c062d0f626 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveType.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveType.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 Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// The type of tag helper directive.
diff --git a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
index d89e54ad7b..473cf1bdac 100644
--- a/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     /// <summary>
     /// An <see cref="IEqualityComparer{TagHelperDescriptor}"/> that checks equality between two
diff --git a/src/Microsoft.AspNetCore.Razor/DocumentParseCompleteEventArgs.cs b/src/Microsoft.AspNetCore.Razor/DocumentParseCompleteEventArgs.cs
index 898d7b0828..17b18b67a0 100644
--- a/src/Microsoft.AspNetCore.Razor/DocumentParseCompleteEventArgs.cs
+++ b/src/Microsoft.AspNetCore.Razor/DocumentParseCompleteEventArgs.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// Arguments for the DocumentParseComplete event in RazorEditorParser
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs
index f236bf49a5..4be3782243 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public class AutoCompleteEditHandler : SpanEditHandler
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs b/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs
index 9ae3dbd651..7fdea369a3 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs
@@ -8,12 +8,12 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Utils;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Utils;
 
-namespace Microsoft.AspNet.Razor.Editor
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     internal class BackgroundParser : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/EditResult.cs b/src/Microsoft.AspNetCore.Razor/Editor/EditResult.cs
index f491f3ddf4..fddaf473e5 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/EditResult.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/EditResult.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Editor
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     public class EditResult
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/EditorHints.cs b/src/Microsoft.AspNetCore.Razor/Editor/EditorHints.cs
index 53f8c63982..a32b383980 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/EditorHints.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/EditorHints.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.Editor
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     /// <summary>
     /// Used within <see cref="F:SpanEditHandler.EditorHints"/>.
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs
index f78d0346c4..41f8cc9a9f 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs
@@ -7,13 +7,13 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Editor
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     public class ImplicitExpressionEditHandler : SpanEditHandler
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/RazorEditorTrace.cs b/src/Microsoft.AspNetCore.Razor/Editor/RazorEditorTrace.cs
index 80fa645819..d093ee3701 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/RazorEditorTrace.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/RazorEditorTrace.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Globalization;
 #endif
 
-namespace Microsoft.AspNet.Razor.Editor
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     internal static class RazorEditorTrace
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/SingleLineMarkupEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/SingleLineMarkupEditHandler.cs
index baf9bb72c2..94da1293f6 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/SingleLineMarkupEditHandler.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/SingleLineMarkupEditHandler.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Editor
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     public class SingleLineMarkupEditHandler : SpanEditHandler
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/SpanEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/SpanEditHandler.cs
index 0ae29b1937..b160962caa 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/SpanEditHandler.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/SpanEditHandler.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Editor
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     // Manages edits to a span
     public class SpanEditHandler
diff --git a/src/Microsoft.AspNetCore.Razor/ErrorSink.cs b/src/Microsoft.AspNetCore.Razor/ErrorSink.cs
index 8177f6ccaf..6aa3e4a4a5 100644
--- a/src/Microsoft.AspNetCore.Razor/ErrorSink.cs
+++ b/src/Microsoft.AspNetCore.Razor/ErrorSink.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// Used to manage <see cref="RazorError"/>s encountered during the Razor parsing phase.
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/BalancingModes.cs b/src/Microsoft.AspNetCore.Razor/Parser/BalancingModes.cs
index ab2b13dbc4..93b9475664 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/BalancingModes.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/BalancingModes.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     [Flags]
     public enum BalancingModes
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs
index 76ec54c0f9..d1a5a3fb4c 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class CSharpCodeParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs
index 656f6c37e7..c3caf67343 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class CSharpCodeParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
index 03dbbb5213..c60ef809a4 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
@@ -5,11 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class CSharpCodeParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
index 9d2d64a978..58f08045e8 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
@@ -4,13 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class CSharpCodeParser : TokenizerBackedParser<CSharpTokenizer, CSharpSymbol, CSharpSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs
index e65210643c..f0f99c837e 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs
@@ -3,11 +3,11 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public class CSharpLanguageCharacteristics : LanguageCharacteristics<CSharpTokenizer, CSharpSymbol, CSharpSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs b/src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs
index 68081e1dcc..b89e0ebef9 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Threading;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public class CallbackVisitor : ParserVisitor
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs b/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs
index e13349de26..0969bc33ce 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     internal class ConditionalAttributeCollapser : MarkupRewriter
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs
index e3b5d5b90d..690cacc1c8 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public class HtmlLanguageCharacteristics : LanguageCharacteristics<HtmlTokenizer, HtmlSymbol, HtmlSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs
index 0f6a6d52d3..5792fbde85 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs
@@ -5,13 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class HtmlMarkupParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs
index 5a49f7c5ee..94bac68dd5 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class HtmlMarkupParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs
index 99ae05ce8f..5806b92cae 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class HtmlMarkupParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs
index 4eaa59cf0a..3b5c52f5dd 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer, HtmlSymbol, HtmlSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ISyntaxTreeRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/ISyntaxTreeRewriter.cs
index 5437d442be..d6404d678e 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ISyntaxTreeRewriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ISyntaxTreeRewriter.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     /// <summary>
     /// Contract for rewriting a syntax tree.
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/LanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/LanguageCharacteristics.cs
index 1ff17e16af..48ca838678 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/LanguageCharacteristics.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/LanguageCharacteristics.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public abstract class LanguageCharacteristics<TTokenizer, TSymbol, TSymbolType>
         where TSymbolType : struct
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs b/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs
index 96a59a9842..8d75b1f0e4 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     internal class MarkupCollapser : MarkupRewriter
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/MarkupRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/MarkupRewriter.cs
index bff770d22c..4dc93ab9d6 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/MarkupRewriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/MarkupRewriter.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     internal abstract class MarkupRewriter : ParserVisitor, ISyntaxTreeRewriter
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ParserBase.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserBase.cs
index 80f6654063..bc46d0e726 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ParserBase.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ParserBase.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public abstract class ParserBase
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs
index 3aefbd2465..b430f0abd8 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs
@@ -7,12 +7,12 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Utils;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public partial class ParserContext
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ParserHelpers.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserHelpers.cs
index 0dcfc1cce1..1e096f3651 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ParserHelpers.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ParserHelpers.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public static class ParserHelpers
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitor.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitor.cs
index e950273e2f..e9f6c431fb 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitor.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Threading;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public abstract class ParserVisitor
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitorExtensions.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitorExtensions.cs
index 1a35aa2900..096e70bde0 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitorExtensions.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitorExtensions.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public static class ParserVisitorExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs
index e6e9e4b761..dbb48d726c 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs
@@ -7,13 +7,13 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Parser.TagHelpers;
-using Microsoft.AspNet.Razor.Parser.TagHelpers.Internal;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public class RazorParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/RewritingContext.cs b/src/Microsoft.AspNetCore.Razor/Parser/RewritingContext.cs
index f0163f5abf..4fc2cbe86e 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/RewritingContext.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/RewritingContext.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     /// <summary>
     /// Informational class for rewriting a syntax tree.
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxConstants.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxConstants.cs
index 5498727925..02b6b2f75f 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxConstants.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxConstants.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 Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public static class SyntaxConstants
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/AcceptedCharacters.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/AcceptedCharacters.cs
index d5c8a25aef..23865d963b 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/AcceptedCharacters.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/AcceptedCharacters.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     [Flags]
     public enum AcceptedCharacters
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Block.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Block.cs
index 395816401d..4b282627d4 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Block.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Block.cs
@@ -5,11 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public class Block : SyntaxTreeNode
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockBuilder.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockBuilder.cs
index bff26cb3c0..18a45f40fa 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockBuilder.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockBuilder.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public class BlockBuilder
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockType.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockType.cs
index 9a2a5e9dbd..5c947ea05a 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockType.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockType.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 Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public enum BlockType
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/EquivalenceComparer.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/EquivalenceComparer.cs
index 2a861963b8..72d322d06d 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/EquivalenceComparer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/EquivalenceComparer.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     internal class EquivalenceComparer : IEqualityComparer<SyntaxTreeNode>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Span.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Span.cs
index 87065dabd5..605bcd2074 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Span.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Span.cs
@@ -6,12 +6,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public class Span : SyntaxTreeNode
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanBuilder.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanBuilder.cs
index 1884f61d73..463269ba6e 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanBuilder.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanBuilder.cs
@@ -3,12 +3,12 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public class SpanBuilder
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanKind.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanKind.cs
index dc7443801d..c042b615e7 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanKind.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanKind.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 Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public enum SpanKind
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SyntaxTreeNode.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SyntaxTreeNode.cs
index 150b8558f9..0e73dafb95 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SyntaxTreeNode.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SyntaxTreeNode.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 Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public abstract class SyntaxTreeNode
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlock.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlock.cs
index ab7ab36063..bb81f252c3 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlock.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlock.cs
@@ -5,12 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Parser.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers
 {
     /// <summary>
     /// A <see cref="Block"/> that reprents a special HTML element.
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs
index 52e9faea20..ee7ff29f12 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockBuilder.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.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Parser.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers
 {
     /// <summary>
     /// A <see cref="BlockBuilder"/> used to create <see cref="TagHelperBlock"/>s.
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs
index e6a410b355..015f8fc608 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs
@@ -1,17 +1,17 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser.TagHelpers.Internal
+namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal
 {
     public static class TagHelperBlockRewriter
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs
index 718bc04981..294ef30368 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Parser.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers
 {
     /// <summary>
     /// A <see cref="ParserVisitor"/> that generates <see cref="TagHelperDescriptor"/>s from
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs
index b6f996f6c0..eaed0a61f8 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs
@@ -5,12 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser.TagHelpers.Internal
+namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal
 {
     public class TagHelperParseTreeRewriter : ISyntaxTreeRewriter
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TextReaderExtensions.cs b/src/Microsoft.AspNetCore.Razor/Parser/TextReaderExtensions.cs
index 492b41bc9c..aab744b982 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TextReaderExtensions.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TextReaderExtensions.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     internal static class TextReaderExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs b/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs
index ee0ef0e4ef..483fb79e38 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs
@@ -5,14 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
-using Microsoft.AspNet.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Utils;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public abstract partial class TokenizerBackedParser<TTokenizer, TSymbol, TSymbolType> : ParserBase
         where TSymbolType : struct
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.cs
index 50ccd01530..efd39a2e2c 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     public abstract partial class TokenizerBackedParser<TTokenizer, TSymbol, TSymbolType> : ParserBase
         where TSymbolType : struct
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs
index c94a15d43e..8d6ba73982 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     internal class WhiteSpaceRewriter : MarkupRewriter
     {
diff --git a/src/Microsoft.AspNetCore.Razor/ParserResults.cs b/src/Microsoft.AspNetCore.Razor/ParserResults.cs
index d7822937f1..adf88a84b2 100644
--- a/src/Microsoft.AspNetCore.Razor/ParserResults.cs
+++ b/src/Microsoft.AspNetCore.Razor/ParserResults.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// Represents the results of parsing a Razor document
diff --git a/src/Microsoft.AspNetCore.Razor/PartialParseResult.cs b/src/Microsoft.AspNetCore.Razor/PartialParseResult.cs
index 7d29053e83..9452abab7b 100644
--- a/src/Microsoft.AspNetCore.Razor/PartialParseResult.cs
+++ b/src/Microsoft.AspNetCore.Razor/PartialParseResult.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     // Flags:
     //  Provisional, ContextChanged, Accepted, Rejected
diff --git a/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs
index d97f09becf..47bbf49bae 100644
--- a/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs
@@ -5,6 +5,6 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.AspNet.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: NeutralResourcesLanguage("en-us")]
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Razor/Properties/CommonResources.Designer.cs b/src/Microsoft.AspNetCore.Razor/Properties/CommonResources.Designer.cs
index 1f6d8c3a18..e001026f4c 100644
--- a/src/Microsoft.AspNetCore.Razor/Properties/CommonResources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Properties/CommonResources.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Razor
     internal static class CommonResources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNet.Razor.CommonResources", typeof(CommonResources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.AspNetCore.Razor.CommonResources", typeof(CommonResources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// Value cannot be null or an empty string.
diff --git a/src/Microsoft.AspNetCore.Razor/Properties/RazorResources.Designer.cs b/src/Microsoft.AspNetCore.Razor/Properties/RazorResources.Designer.cs
index d68bbecad6..50f903abc0 100644
--- a/src/Microsoft.AspNetCore.Razor/Properties/RazorResources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Properties/RazorResources.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Razor
     internal static class RazorResources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNet.Razor.RazorResources", typeof(RazorResources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.AspNetCore.Razor.RazorResources", typeof(RazorResources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// The active parser must be the same as either the markup or code parser.
diff --git a/src/Microsoft.AspNetCore.Razor/RazorCodeLanguage.cs b/src/Microsoft.AspNetCore.Razor/RazorCodeLanguage.cs
index f0d2f24deb..f0a75d38b6 100644
--- a/src/Microsoft.AspNetCore.Razor/RazorCodeLanguage.cs
+++ b/src/Microsoft.AspNetCore.Razor/RazorCodeLanguage.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// Represents a code language in Razor.
diff --git a/src/Microsoft.AspNetCore.Razor/RazorDebugHelpers.cs b/src/Microsoft.AspNetCore.Razor/RazorDebugHelpers.cs
index b149d80fca..52377cbc31 100644
--- a/src/Microsoft.AspNetCore.Razor/RazorDebugHelpers.cs
+++ b/src/Microsoft.AspNetCore.Razor/RazorDebugHelpers.cs
@@ -9,10 +9,10 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     internal static class RazorDebugHelpers
     {
diff --git a/src/Microsoft.AspNetCore.Razor/RazorEditorParser.cs b/src/Microsoft.AspNetCore.Razor/RazorEditorParser.cs
index f9140683e2..458b30e61b 100644
--- a/src/Microsoft.AspNetCore.Razor/RazorEditorParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/RazorEditorParser.cs
@@ -5,11 +5,11 @@ using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// Parser used by editors to avoid reparsing the entire document on each text change.
diff --git a/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs b/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs
index d3af628ac0..c9876afe26 100644
--- a/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs
+++ b/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// Defines the environment in which a Razor template will live
diff --git a/src/Microsoft.AspNetCore.Razor/RazorError.cs b/src/Microsoft.AspNetCore.Razor/RazorError.cs
index e1d2af0ae9..0b75b73e34 100644
--- a/src/Microsoft.AspNetCore.Razor/RazorError.cs
+++ b/src/Microsoft.AspNetCore.Razor/RazorError.cs
@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     public class RazorError : IEquatable<RazorError>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/RazorTemplateEngine.cs b/src/Microsoft.AspNetCore.Razor/RazorTemplateEngine.cs
index e2929fc2de..08baf6103c 100644
--- a/src/Microsoft.AspNetCore.Razor/RazorTemplateEngine.cs
+++ b/src/Microsoft.AspNetCore.Razor/RazorTemplateEngine.cs
@@ -7,12 +7,12 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// Entry-point to the Razor Template Engine
diff --git a/src/Microsoft.AspNetCore.Razor/SourceLocation.cs b/src/Microsoft.AspNetCore.Razor/SourceLocation.cs
index 318f6cd1aa..2593fd6d91 100644
--- a/src/Microsoft.AspNetCore.Razor/SourceLocation.cs
+++ b/src/Microsoft.AspNetCore.Razor/SourceLocation.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Globalization;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     /// <summary>
     /// A location in a Razor file.
diff --git a/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs b/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs
index d6c33d4b4e..b9d60a706a 100644
--- a/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs
+++ b/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs
@@ -1,7 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// The mode in which an element should render.
diff --git a/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs b/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs
index 5c801f3e27..370f9372f2 100644
--- a/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs
+++ b/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs
@@ -1,7 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     /// <summary>
     /// The structure the element should be written in.
diff --git a/src/Microsoft.AspNetCore.Razor/Text/BufferingTextReader.cs b/src/Microsoft.AspNetCore.Razor/Text/BufferingTextReader.cs
index b247b416e4..378dd4d5a6 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/BufferingTextReader.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/BufferingTextReader.cs
@@ -5,9 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Microsoft.AspNet.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Utils;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public class BufferingTextReader : LookaheadTextReader
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs b/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs
index 17bc920401..f80104a8bc 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.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 Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public interface ITextBuffer
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/LineTrackingStringBuffer.cs b/src/Microsoft.AspNetCore.Razor/Text/LineTrackingStringBuffer.cs
index ef6e878067..47ab80bef3 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/LineTrackingStringBuffer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/LineTrackingStringBuffer.cs
@@ -5,9 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     internal class LineTrackingStringBuffer
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/LocationTagged.cs b/src/Microsoft.AspNetCore.Razor/Text/LocationTagged.cs
index 5156b7a212..e2916a34c2 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/LocationTagged.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/LocationTagged.cs
@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.Globalization;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     [DebuggerDisplay("({Location})\"{Value}\"")]
     public class LocationTagged<TValue> : IFormattable
diff --git a/src/Microsoft.AspNetCore.Razor/Text/LookaheadTextReader.cs b/src/Microsoft.AspNetCore.Razor/Text/LookaheadTextReader.cs
index 7d84a548a4..ecb8fc04cf 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/LookaheadTextReader.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/LookaheadTextReader.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public abstract class LookaheadTextReader : TextReader
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/LookaheadToken.cs b/src/Microsoft.AspNetCore.Razor/Text/LookaheadToken.cs
index f50e0880dc..375d837b42 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/LookaheadToken.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/LookaheadToken.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public struct LookaheadToken : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/SeekableTextReader.cs b/src/Microsoft.AspNetCore.Razor/Text/SeekableTextReader.cs
index d055eded9e..7b7d13a5dc 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/SeekableTextReader.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/SeekableTextReader.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public class SeekableTextReader : TextReader, ITextDocument
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/SourceLocationTracker.cs b/src/Microsoft.AspNetCore.Razor/Text/SourceLocationTracker.cs
index 280917eae0..54baf62a14 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/SourceLocationTracker.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/SourceLocationTracker.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public class SourceLocationTracker
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/SourceSpan.cs b/src/Microsoft.AspNetCore.Razor/Text/SourceSpan.cs
index 147af1be44..41158ad69d 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/SourceSpan.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/SourceSpan.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 Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public class SourceSpan
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/TextBufferReader.cs b/src/Microsoft.AspNetCore.Razor/Text/TextBufferReader.cs
index 3aa56ffbb4..4669f16acc 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/TextBufferReader.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/TextBufferReader.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Utils;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public class TextBufferReader : LookaheadTextReader
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/TextChange.cs b/src/Microsoft.AspNetCore.Razor/Text/TextChange.cs
index ec432b6a4b..7ea7664d9f 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/TextChange.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/TextChange.cs
@@ -5,10 +5,10 @@ using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.Text;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public struct TextChange
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/TextChangeType.cs b/src/Microsoft.AspNetCore.Razor/Text/TextChangeType.cs
index 84ec14124f..59631b3822 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/TextChangeType.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/TextChangeType.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 Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public enum TextChangeType
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/TextDocumentReader.cs b/src/Microsoft.AspNetCore.Razor/Text/TextDocumentReader.cs
index 1ce682ce2c..f1bfc71f88 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/TextDocumentReader.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/TextDocumentReader.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     public class TextDocumentReader : TextReader, ITextDocument
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/TextExtensions.cs b/src/Microsoft.AspNetCore.Razor/Text/TextExtensions.cs
index b1693445d0..7bc38d858b 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/TextExtensions.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/TextExtensions.cs
@@ -3,7 +3,7 @@
 
 using System.Text;
 
-namespace Microsoft.AspNet.Razor.Text
+namespace Microsoft.AspNetCore.Razor.Text
 {
     internal static class TextExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs
index 44c891ca4e..a2825d2b4f 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Globalization;
 
-namespace Microsoft.AspNet.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer
 {
     public static class CSharpHelpers
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpKeywordDetector.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpKeywordDetector.cs
index 02b7fd8111..2942d4c31a 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpKeywordDetector.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpKeywordDetector.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer
 {
     internal static class CSharpKeywordDetector
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs
index ca500ed351..e9a39f2b11 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer
 {
     public class CSharpTokenizer : Tokenizer<CSharpSymbol, CSharpSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs
index cc07aefb29..b18507885e 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer
 {
     // Tokenizer _loosely_ based on http://dev.w3.org/html5/spec/Overview.html#tokenization
     public class HtmlTokenizer : Tokenizer<HtmlSymbol, HtmlSymbolType>
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/ITokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/ITokenizer.cs
index 00c6f10805..cb56b3ef47 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/ITokenizer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/ITokenizer.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer
 {
     public interface ITokenizer
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpKeyword.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpKeyword.cs
index e5a397ceaf..cfc581853b 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpKeyword.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpKeyword.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 Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     public enum CSharpKeyword
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbol.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbol.cs
index b0b936ed4b..c03031a463 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbol.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbol.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     public class CSharpSymbol : SymbolBase<CSharpSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbolType.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbolType.cs
index b221ccb195..efa673fe46 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbolType.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbolType.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 Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     public enum CSharpSymbolType
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs
index d34c6bda66..327c34b19e 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     public class HtmlSymbol : SymbolBase<HtmlSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
index 27cbd7e590..506743ace3 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     [Flags]
     public enum HtmlSymbolType
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/ISymbol.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/ISymbol.cs
index a2bd22041f..23c26226e0 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/ISymbol.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/ISymbol.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 Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     public interface ISymbol
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/KnownSymbolType.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/KnownSymbolType.cs
index bbcdf842fd..207de8b429 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/KnownSymbolType.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/KnownSymbolType.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 Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     public enum KnownSymbolType
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolBase.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolBase.cs
index 70760014c1..ca66b4fb9e 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolBase.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolBase.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     public abstract class SymbolBase<TType> : ISymbol
         where TType : struct
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs
index 3a4a03c5ab..2809283663 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
 
-namespace Microsoft.AspNet.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
 {
     public static class SymbolExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs
index 5201720383..ece5707233 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs
@@ -8,10 +8,10 @@ using System.Diagnostics;
 using System.Globalization;
 #endif
 using System.Text;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer
 {
     [DebuggerDisplay("{DebugDisplay}")]
     public abstract partial class Tokenizer<TSymbol, TSymbolType> : ITokenizer
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/TokenizerView.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/TokenizerView.cs
index 830957e816..a4f8ae6acc 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/TokenizerView.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/TokenizerView.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Diagnostics;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer
 {
     public class TokenizerView<TTokenizer, TSymbol, TSymbolType>
         where TSymbolType : struct
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/XmlHelpers.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/XmlHelpers.cs
index ae60235628..a94edafeba 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/XmlHelpers.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/XmlHelpers.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-namespace Microsoft.AspNet.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer
 {
     internal static class XmlHelpers
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Utils/CharUtils.cs b/src/Microsoft.AspNetCore.Razor/Utils/CharUtils.cs
index 2d4094ccc0..48467f2b26 100644
--- a/src/Microsoft.AspNetCore.Razor/Utils/CharUtils.cs
+++ b/src/Microsoft.AspNetCore.Razor/Utils/CharUtils.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-namespace Microsoft.AspNet.Razor.Utils
+namespace Microsoft.AspNetCore.Razor.Utils
 {
     internal static class CharUtils
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs b/src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs
index 8ff2f09179..3b13311740 100644
--- a/src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs
+++ b/src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Razor.Utils
+namespace Microsoft.AspNetCore.Razor.Utils
 {
     internal class DisposableAction : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Utils/EnumUtil.cs b/src/Microsoft.AspNetCore.Razor/Utils/EnumUtil.cs
index 7f0474a315..2be9ca7009 100644
--- a/src/Microsoft.AspNetCore.Razor/Utils/EnumUtil.cs
+++ b/src/Microsoft.AspNetCore.Razor/Utils/EnumUtil.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.Utils
+namespace Microsoft.AspNetCore.Razor.Utils
 {
     internal static class EnumUtil
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Utils/EnumeratorExtensions.cs b/src/Microsoft.AspNetCore.Razor/Utils/EnumeratorExtensions.cs
index ad0911da50..17a73911a7 100644
--- a/src/Microsoft.AspNetCore.Razor/Utils/EnumeratorExtensions.cs
+++ b/src/Microsoft.AspNetCore.Razor/Utils/EnumeratorExtensions.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNet.Razor.Utils
+namespace Microsoft.AspNetCore.Razor.Utils
 {
     internal static class EnumeratorExtensions
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs
index 21eee2b3a5..894d2a65c1 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class CaseSensitiveTagHelperAttributeComparer : IEqualityComparer<IReadOnlyTagHelperAttribute>
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs
index fca90b4286..b0f65eb6e6 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs
@@ -5,12 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     public class TagHelperDescriptorFactoryTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs
index bd6563bcb6..7ec76dc2ba 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs
@@ -5,13 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     public class TagHelperDescriptorResolverTest : TagHelperTypeResolverTest
     {
@@ -150,7 +150,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                             },
                             new TagHelperDirectiveDescriptor
                             {
-                                DirectiveText = "Microsoft.AspNet.Razor.TagHelpers.Valid_P*, " + assemblyA,
+                                DirectiveText = "Microsoft.AspNetCore.Razor.TagHelpers.Valid_P*, " + assemblyA,
                                 Location = directiveLocation1,
                                 DirectiveType = TagHelperDirectiveType.AddTagHelper
                             }
@@ -182,7 +182,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                             },
                             new TagHelperDirectiveDescriptor
                             {
-                                DirectiveText = "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
+                                DirectiveText = "Microsoft.AspNetCore.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
                                 Location = directiveLocation1,
                                 DirectiveType = TagHelperDirectiveType.AddTagHelper
                             },
@@ -452,7 +452,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                         {
                             CreateTagHelperDirectiveDescriptor("", TagHelperDirectiveType.TagHelperPrefix),
                             CreateTagHelperDirectiveDescriptor(
-                                "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
+                                "Microsoft.AspNetCore.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
                                 TagHelperDirectiveType.AddTagHelper),
                         },
                         new [] { Valid_PlainTagHelperDescriptor }
@@ -463,7 +463,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                         {
                             CreateTagHelperDirectiveDescriptor("th:", TagHelperDirectiveType.TagHelperPrefix),
                             CreateTagHelperDirectiveDescriptor(
-                                "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
+                                "Microsoft.AspNetCore.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
                                 TagHelperDirectiveType.AddTagHelper),
                         },
                         new [] { CreatePrefixedValidPlainDescriptor("th:") }
@@ -487,10 +487,10 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                         {
                             CreateTagHelperDirectiveDescriptor("th-", TagHelperDirectiveType.TagHelperPrefix),
                             CreateTagHelperDirectiveDescriptor(
-                                "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
+                                "Microsoft.AspNetCore.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
                                 TagHelperDirectiveType.AddTagHelper),
                             CreateTagHelperDirectiveDescriptor(
-                                "Microsoft.AspNet.Razor.TagHelpers.Valid_Inherited*, " + assemblyA,
+                                "Microsoft.AspNetCore.Razor.TagHelpers.Valid_Inherited*, " + assemblyA,
                                 TagHelperDirectiveType.AddTagHelper)
                         },
                         new []
@@ -505,10 +505,10 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                         {
                             CreateTagHelperDirectiveDescriptor("", TagHelperDirectiveType.TagHelperPrefix),
                             CreateTagHelperDirectiveDescriptor(
-                                "Microsoft.AspNet.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
+                                "Microsoft.AspNetCore.Razor.TagHelpers.Valid_Plain*, " + assemblyA,
                                 TagHelperDirectiveType.AddTagHelper),
                             CreateTagHelperDirectiveDescriptor(
-                                "Microsoft.AspNet.Razor.TagHelpers.Valid_Inherited*, " + assemblyA,
+                                "Microsoft.AspNetCore.Razor.TagHelpers.Valid_Inherited*, " + assemblyA,
                                 TagHelperDirectiveType.AddTagHelper)
                         },
                         new [] { Valid_PlainTagHelperDescriptor, Valid_InheritedTagHelperDescriptor }
@@ -1092,13 +1092,13 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
 
             // Act
             var descriptors = tagHelperDescriptorResolver.Resolve(
-                "Microsoft.AspNet.Razor.Runtime.Test.TagHelpers.Invalid_AbstractTagHelper, " + AssemblyName,
-                "Microsoft.AspNet.Razor.Runtime.Test.TagHelpers.Invalid_GenericTagHelper`, " + AssemblyName,
-                "Microsoft.AspNet.Razor.Runtime.Test.TagHelpers.Invalid_NestedPublicTagHelper, " + AssemblyName,
-                "Microsoft.AspNet.Razor.Runtime.Test.TagHelpers.Invalid_NestedInternalTagHelper, " + AssemblyName,
-                "Microsoft.AspNet.Razor.Runtime.Test.TagHelpers.Invalid_PrivateTagHelper, " + AssemblyName,
-                "Microsoft.AspNet.Razor.Runtime.Test.TagHelpers.Invalid_ProtectedTagHelper, " + AssemblyName,
-                "Microsoft.AspNet.Razor.Runtime.Test.TagHelpers.Invalid_InternalTagHelper, " + AssemblyName);
+                "Microsoft.AspNetCore.Razor.Runtime.Test.TagHelpers.Invalid_AbstractTagHelper, " + AssemblyName,
+                "Microsoft.AspNetCore.Razor.Runtime.Test.TagHelpers.Invalid_GenericTagHelper`, " + AssemblyName,
+                "Microsoft.AspNetCore.Razor.Runtime.Test.TagHelpers.Invalid_NestedPublicTagHelper, " + AssemblyName,
+                "Microsoft.AspNetCore.Razor.Runtime.Test.TagHelpers.Invalid_NestedInternalTagHelper, " + AssemblyName,
+                "Microsoft.AspNetCore.Razor.Runtime.Test.TagHelpers.Invalid_PrivateTagHelper, " + AssemblyName,
+                "Microsoft.AspNetCore.Razor.Runtime.Test.TagHelpers.Invalid_ProtectedTagHelper, " + AssemblyName,
+                "Microsoft.AspNetCore.Razor.Runtime.Test.TagHelpers.Invalid_InternalTagHelper, " + AssemblyName);
 
             // Assert
             Assert.Empty(descriptors);
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs
index 15cbb4a0da..2a7388c9f3 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs
@@ -1,33 +1,33 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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.
 
 #if !DNXCORE50
 using System;
 using System.IO;
 using System.Reflection;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Internal;
-using Microsoft.AspNet.Testing;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Internal;
+using Microsoft.AspNetCore.Testing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     public class TagHelperDesignTimeDescriptorFactoryTest
     {
-        private const string TypeSummary = "The summary for <see cref=\"T:Microsoft.AspNet.Razor." +
+        private const string TypeSummary = "The summary for <see cref=\"T:Microsoft.AspNetCore.Razor." +
             "TagHelpers.DocumentedTagHelper\" />.";
-        private const string TypeRemarks = "Inherits from <see cref=\"T:Microsoft.AspNet.Razor." +
+        private const string TypeRemarks = "Inherits from <see cref=\"T:Microsoft.AspNetCore.Razor." +
             "TagHelpers.TagHelper\" />.";
-        private const string PropertySummary = "This <see cref=\"P:Microsoft.AspNet.Razor." +
+        private const string PropertySummary = "This <see cref=\"P:Microsoft.AspNetCore.Razor." +
             "TagHelpers.DocumentedTagHelper.SummaryProperty\" /> is of type <see cref=\"T:System.String\" />.";
-        private const string PropertyRemarks = "The <see cref=\"P:Microsoft.AspNet.Razor." +
+        private const string PropertyRemarks = "The <see cref=\"P:Microsoft.AspNetCore.Razor." +
             "TagHelpers.DocumentedTagHelper.SummaryProperty\" /> may be <c>null</c>.";
         private const string PropertyWithSummaryAndRemarks_Summary = "This is a complex <see cref=\"T:System." +
             "Collections.Generic.IDictionary`2\" />.";
-        private const string PropertyWithSummaryAndRemarks_Remarks = "<see cref=\"P:Microsoft.AspNet.Razor." +
-            "TagHelpers.DocumentedTagHelper.SummaryProperty\" /><see cref=\"P:Microsoft.AspNet.Razor" +
+        private const string PropertyWithSummaryAndRemarks_Remarks = "<see cref=\"P:Microsoft.AspNetCore.Razor." +
+            "TagHelpers.DocumentedTagHelper.SummaryProperty\" /><see cref=\"P:Microsoft.AspNetCore.Razor" +
             ".TagHelpers.DocumentedTagHelper.RemarksProperty\" />";
 
         // These test assemblies don't really exist. They are used to look up corresponding XML for a fake assembly
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
index 4c017fade1..ff0ce1a794 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
@@ -5,11 +5,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.WebEncoders.Testing;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     public class TagHelperExecutionContextTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs
index 3411185438..76a6f53f89 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     public class TagHelperRunnerTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs
index 8253b2527f..408020784d 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs
@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     public class TagHelperScopeManagerTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs
index 734e34806a..d5f2bba238 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs
@@ -6,10 +6,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     public class TagHelperTypeResolverTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs
index e355593951..fb43ae3b71 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class Valid_PlainTagHelper : TagHelper
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
index 08fdc38b8d..918da5479a 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
@@ -1,13 +1,13 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 System.Collections.Generic;
 using System.ComponentModel;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public enum CustomEnum
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs
index 45869d56de..6af95747e4 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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.
 
 #if !DNXCORE50
@@ -6,10 +6,10 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Runtime.TagHelpers
 {
     public class XmlDocumentationProviderTest
     {
@@ -43,12 +43,12 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                 {
                     {
                         $"T:{fullTypeName}",
-                        "The summary for <see cref=\"T:Microsoft.AspNet.Razor.TagHelpers." +
+                        "The summary for <see cref=\"T:Microsoft.AspNetCore.Razor.TagHelpers." +
                         "DocumentedTagHelper\" />."
                     },
                     {
                         $"P:{fullTypeName}.{DocumentedTagHelperSummaryPropertyInfo.Name}",
-                        "This <see cref=\"P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper." +
+                        "This <see cref=\"P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper." +
                         "SummaryProperty\" /> is of type <see cref=\"T:System.String\" />."
                     },
                     {
@@ -88,7 +88,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                 {
                     {
                         $"T:{fullTypeName}",
-                        "Inherits from <see cref=\"T:Microsoft.AspNet.Razor.TagHelpers.TagHelper\" />."
+                        "Inherits from <see cref=\"T:Microsoft.AspNetCore.Razor.TagHelpers.TagHelper\" />."
                     },
                     {
                         $"P:{fullTypeName}.{DocumentedTagHelperSummaryPropertyInfo.Name}",
@@ -96,13 +96,13 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers
                     },
                     {
                         $"P:{fullTypeName}.{DocumentedTagHelperRemarksPropertyInfo.Name}",
-                        "The <see cref=\"P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper." +
+                        "The <see cref=\"P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper." +
                         "SummaryProperty\" /> may be <c>null</c>."
                     },
                     {
                         $"P:{fullTypeName}.{DocumentedTagHelperRemarksSummaryPropertyInfo.Name}",
-                        "<see cref=\"P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper." +
-                        "SummaryProperty\" /><see cref=\"P:Microsoft.AspNet.Razor.TagHelpers." +
+                        "<see cref=\"P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper." +
+                        "SummaryProperty\" /><see cref=\"P:Microsoft.AspNetCore.Razor.TagHelpers." +
                         "DocumentedTagHelper.RemarksProperty\" />"
                     }
                 };
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
index d8e7986138..936c72014a 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
@@ -6,7 +6,7 @@ using System.IO;
 using Microsoft.Extensions.WebEncoders.Testing;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class DefaultTagHelperContentTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/NullHtmlEncoderTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/NullHtmlEncoderTest.cs
index f20509d1cc..b972a83288 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/NullHtmlEncoderTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/NullHtmlEncoderTest.cs
@@ -1,10 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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.IO;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class NullHtmlEncoderTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
index d4e13865aa..db132bfe03 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class ReadOnlyTagHelperAttributeListTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs
index 6ccde11f05..b2b0b069b2 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class TagHelperAttributeListTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs
index ac4fe54288..2f935b3a4f 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs
@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 Xunit;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class TagHelperAttributeTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs
index 537fc343da..1c28af757d 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class TagHelperContextTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
index 2f1cfdbca2..aacd53708d 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Razor.Runtime.TagHelpers;
+using Microsoft.AspNetCore.Razor.Runtime.TagHelpers;
 using Microsoft.Extensions.WebEncoders.Testing;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.TagHelpers
+namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
     public class TagHelperOutputTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml
index 71046041df..c5f199a461 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <doc>
   <assembly>
-    <name>Microsoft.AspNet.Razor.Runtime.Test</name>
+    <name>Microsoft.AspNetCore.Razor.Runtime.Test</name>
   </assembly>
   <members>
-    <member name="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper">
+    <member name="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper">
       <summary>
-        nl-BE: The summary for <see cref="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper" />.
+        nl-BE: The summary for <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper" />.
       </summary>
       <remarks>
-        nl-BE: Inherits from <see cref="T:Microsoft.AspNet.Razor.TagHelpers.TagHelper" />.
+        nl-BE: Inherits from <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.TagHelper" />.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
       <summary>
-        nl-BE: This <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
+        nl-BE: This <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
       </summary>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
       <remarks>
-        nl-BE: The <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
+        nl-BE: The <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
       <summary>
         nl-BE: This is a complex <see cref="T:System.Collections.Generic.IDictionary`2" />.
       </summary>
       <remarks>
-        nl-BE: <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
+        nl-BE: <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
       </remarks>
     </member>
   </members>
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml
index 4e846c8a22..df219362b2 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <doc>
   <assembly>
-    <name>Microsoft.AspNet.Razor.Runtime.Test</name>
+    <name>Microsoft.AspNetCore.Razor.Runtime.Test</name>
   </assembly>
   <members>
-    <member name="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper">
+    <member name="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper">
       <summary>
-        en-GB: The summary for <see cref="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper" />.
+        en-GB: The summary for <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper" />.
       </summary>
       <remarks>
-        en-GB: Inherits from <see cref="T:Microsoft.AspNet.Razor.TagHelpers.TagHelper" />.
+        en-GB: Inherits from <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.TagHelper" />.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
       <summary>
-        en-GB: This <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
+        en-GB: This <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
       </summary>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
       <remarks>
-        en-GB: The <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
+        en-GB: The <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
       <summary>
         en-GB: This is a complex <see cref="T:System.Collections.Generic.IDictionary`2" />.
       </summary>
       <remarks>
-        en-GB: <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
+        en-GB: <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
       </remarks>
     </member>
   </members>
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml
index 28ca4de3b8..f5a55fc592 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <doc>
   <assembly>
-    <name>Microsoft.AspNet.Razor.Runtime.Test</name>
+    <name>Microsoft.AspNetCore.Razor.Runtime.Test</name>
   </assembly>
   <members>
-    <member name="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper">
+    <member name="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper">
       <summary>
-        en: The summary for <see cref="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper" />.
+        en: The summary for <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper" />.
       </summary>
       <remarks>
-        en: Inherits from <see cref="T:Microsoft.AspNet.Razor.TagHelpers.TagHelper" />.
+        en: Inherits from <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.TagHelper" />.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
       <summary>
-        en: This <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
+        en: This <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
       </summary>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
       <remarks>
-        en: The <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
+        en: The <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
       <summary>
         en: This is a complex <see cref="T:System.Collections.Generic.IDictionary`2" />.
       </summary>
       <remarks>
-        en: <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
+        en: <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
       </remarks>
     </member>
   </members>
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml
index 900df3806e..b1142cc7b9 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <doc>
   <assembly>
-    <name>Microsoft.AspNet.Razor.Runtime.Test</name>
+    <name>Microsoft.AspNetCore.Razor.Runtime.Test</name>
   </assembly>
   <members>
-    <member name="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper">
+    <member name="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper">
       <summary>
-        fr-FR: The summary for <see cref="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper" />.
+        fr-FR: The summary for <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper" />.
       </summary>
       <remarks>
-        fr-FR: Inherits from <see cref="T:Microsoft.AspNet.Razor.TagHelpers.TagHelper" />.
+        fr-FR: Inherits from <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.TagHelper" />.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
       <summary>
-        fr-FR: This <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
+        fr-FR: This <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
       </summary>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
       <remarks>
-        fr-FR: The <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
+        fr-FR: The <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
       <summary>
         fr-FR: This is a complex <see cref="T:System.Collections.Generic.IDictionary`2" />.
       </summary>
       <remarks>
-        fr-FR: <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
+        fr-FR: <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
       </remarks>
     </member>
   </members>
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml
index 99a699cc71..b62ad5f7e1 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <doc>
   <assembly>
-    <name>Microsoft.AspNet.Razor.Runtime.Test</name>
+    <name>Microsoft.AspNetCore.Razor.Runtime.Test</name>
   </assembly>
   <members>
-    <member name="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper">
+    <member name="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper">
       <summary>
-        fr: The summary for <see cref="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper" />.
+        fr: The summary for <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper" />.
       </summary>
       <remarks>
-        fr: Inherits from <see cref="T:Microsoft.AspNet.Razor.TagHelpers.TagHelper" />.
+        fr: Inherits from <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.TagHelper" />.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
       <summary>
-        fr: This <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
+        fr: This <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> is of type <see cref="T:System.String" />.
       </summary>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
       <remarks>
-        fr: The <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
+        fr: The <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /> may be <c>null</c>.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
       <summary>
         fr: This is a complex <see cref="T:System.Collections.Generic.IDictionary`2" />.
       </summary>
       <remarks>
-        fr: <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
+        fr: <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty" /><see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty" />
       </remarks>
     </member>
   </members>
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml
index cfdf292e50..92d48cf338 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <doc>
   <assembly>
-    <name>Microsoft.AspNet.Razor.Runtime.Test</name>
+    <name>Microsoft.AspNetCore.Razor.Runtime.Test</name>
   </assembly>
   <members>
-    <member name="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper">
+    <member name="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper">
       <summary>
-        The summary for <see cref="T:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper"/>.
+        The summary for <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper"/>.
       </summary>
       <remarks>
-        Inherits from <see cref="T:Microsoft.AspNet.Razor.TagHelpers.TagHelper"/>.
+        Inherits from <see cref="T:Microsoft.AspNetCore.Razor.TagHelpers.TagHelper"/>.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty">
       <summary>
-        This <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty"/> is of type <see cref="T:System.String"/>.
+        This <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty"/> is of type <see cref="T:System.String"/>.
       </summary>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty">
       <remarks>
-        The <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty"/> may be <c>null</c>.
+        The <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty"/> may be <c>null</c>.
       </remarks>
     </member>
-    <member name="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
+    <member name="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksAndSummaryProperty">
       <summary>
         This is a complex <see cref="T:System.Collections.Generic.IDictionary`2"/>.
       </summary>
       <remarks>
-        <see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty"/><see cref="P:Microsoft.AspNet.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty"/>
+        <see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.SummaryProperty"/><see cref="P:Microsoft.AspNetCore.Razor.TagHelpers.DocumentedTagHelper.RemarksProperty"/>
       </remarks>
     </member>
   </members>
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
index 960d445d14..75101640a8 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
@@ -5,12 +5,12 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "Microsoft.AspNet.Razor.Runtime": "4.0.0-*",
-    "Microsoft.AspNet.Razor.Test.Sources": {
+    "Microsoft.AspNetCore.Razor.Runtime": "4.0.0-*",
+    "Microsoft.AspNetCore.Razor.Test.Sources": {
       "version": "4.0.0-*",
       "type": "build"
     },
-    "Microsoft.AspNet.Testing": "1.0.0-*",
+    "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.Extensions.WebEncoders": "1.0.0-*",
     "xunit": "2.1.0"
   },
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CSharpRazorCodeLanguageTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CSharpRazorCodeLanguageTest.cs
index 4665b8cf1b..085e55595b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CSharpRazorCodeLanguageTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CSharpRazorCodeLanguageTest.cs
@@ -1,12 +1,12 @@
 // 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 Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test
+namespace Microsoft.AspNetCore.Razor.Test
 {
     public class CSharpRazorCodeLanguageTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/AttributeBlockChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/AttributeBlockChunkGeneratorTest.cs
index 34e1122b6a..68ed98933f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/AttributeBlockChunkGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/AttributeBlockChunkGeneratorTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class AttributeBlockChunkGeneratorTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkTreeBuilderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkTreeBuilderTest.cs
index 6acb1d9d0e..cb93ea3601 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkTreeBuilderTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkTreeBuilderTest.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.Linq;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class ChunkTreeBuilderTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkVisitorTests.cs b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkVisitorTests.cs
index 32df8eca28..6027984a40 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkVisitorTests.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkVisitorTests.cs
@@ -1,13 +1,13 @@
 // 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 Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.CodeGenerators.Visitors;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.CodeGenerators.Visitors;
 using Moq;
 using Moq.Protected;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class ChunkVisitorTests
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/AddImportChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/AddImportChunkGeneratorTest.cs
index 66993ef8af..251ab3b7a4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/AddImportChunkGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/AddImportChunkGeneratorTest.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class AddImportChunkGeneratorTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
index 95713d289f..1103d4e4ae 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
@@ -4,14 +4,14 @@
 #if GENERATE_BASELINES
 using System;
 #endif
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test;
-using Microsoft.AspNet.Razor.Test.Generator;
-using Microsoft.AspNet.Razor.Test.Utils;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test;
+using Microsoft.AspNetCore.Razor.Test.Generator;
+using Microsoft.AspNetCore.Razor.Test.Utils;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CSharpCodeGeneratorTest
     {
@@ -56,7 +56,7 @@ namespace Microsoft.AspNet.Razor.CodeGenerators
             if (!string.Equals(expectedOutput, result.Code, StringComparison.Ordinal))
             {
                 BaselineWriter.WriteBaseline(
-                    @"test\Microsoft.AspNet.Razor.Test\TestFiles\CodeGenerator\Output\CSharpCodeGenerator.cs",
+                    @"test\Microsoft.AspNetCore.Razor.Test\TestFiles\CodeGenerator\Output\CSharpCodeGenerator.cs",
                     result.Code);
             }
 #else
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeWriterTest.cs
index cc58513c77..25e9422410 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeWriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeWriterTest.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CSharpCodeWriterTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpLineMappingWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpLineMappingWriterTest.cs
index e348c892a4..b8304ae7dd 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpLineMappingWriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpLineMappingWriterTest.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CSharpLineMappingWriterTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
index 3fa1539859..e837bb0b8f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
@@ -5,12 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class CSharpPaddingBuilderTests
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpRazorChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpRazorChunkGeneratorTest.cs
index 11b1c6cb9a..b71773f3e1 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpRazorChunkGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpRazorChunkGeneratorTest.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class RazorCodeGeneratorTest : RazorCodeGeneratorTest<CSharpRazorCodeLanguage>
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs
index 25482789c8..6f9723d96e 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs
@@ -7,12 +7,12 @@ using System.Linq;
 #if DNXCORE50
 using System.Reflection;
 #endif
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class CSharpTagHelperRenderingTest : TagHelperTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs
index eccec72aad..63b088fdcd 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs
@@ -1,16 +1,16 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.CodeGenerators.Visitors;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Parser.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Chunks;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.CodeGenerators.Visitors;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class CSharpTagHelperRenderingUnitTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestCodeGenerator.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestCodeGenerator.cs
index be1a31bff2..b4463c920a 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestCodeGenerator.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestCodeGenerator.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class CodeGenTestCodeGenerator : CSharpCodeGenerator
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestHost.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestHost.cs
index cb7e1fdd09..fcb8933850 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestHost.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestHost.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class CodeGenTestHost : RazorEngineHost
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeWriterTest.cs
index 210afd00e4..1458e7e1c2 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeWriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeWriterTest.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.CodeGenerators
+namespace Microsoft.AspNetCore.Razor.CodeGenerators
 {
     public class CodeWriterTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/DynamicAttributeBlockChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/DynamicAttributeBlockChunkGeneratorTest.cs
index acc27333f4..f3537499d4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/DynamicAttributeBlockChunkGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/DynamicAttributeBlockChunkGeneratorTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     public class DynamicAttributeBlockChunkGeneratorTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/LineMappingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/LineMappingTest.cs
index 5027a0e2ae..0eef4b4352 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/LineMappingTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/LineMappingTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class LineMappingTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorChunkGeneratorTest.cs
index 00e124eb89..767415aaa1 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorChunkGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorChunkGeneratorTest.cs
@@ -6,12 +6,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Test.Utils;
-using Microsoft.AspNet.Testing;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Test.Utils;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public abstract class RazorCodeGeneratorTest<TLanguage>
         where TLanguage : RazorCodeLanguage, new()
@@ -194,7 +194,7 @@ namespace Microsoft.AspNet.Razor.Test.Generator
             var textOutput = results.GeneratedCode;
 #if GENERATE_BASELINES
             var outputFile = string.Format(
-                @"test\Microsoft.AspNet.Razor.Test\TestFiles\CodeGenerator\Output\{0}.{1}",
+                @"test\Microsoft.AspNetCore.Razor.Test\TestFiles\CodeGenerator\Output\{0}.{1}",
                 baselineName,
                 BaselineExtension);
 
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorCommentChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorCommentChunkGeneratorTest.cs
index 82c3177cd1..c607a4464c 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorCommentChunkGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorCommentChunkGeneratorTest.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Chunks.Generators
+namespace Microsoft.AspNetCore.Razor.Chunks.Generators
 {
     // Really tests underlying ParentChunkGenerator
     public class RazorCommentChunkGeneratorTest
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TabTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TabTest.cs
index 8a10a5c704..cc8568e226 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TabTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TabTest.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     [Flags]
     public enum TabTest
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs
index a6da3a79bc..1d129d1fae 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs
@@ -5,13 +5,13 @@ using System;
 #if DNXCORE50
 using System.Reflection;
 #endif
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.CodeGenerators.Visitors;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.CodeGenerators.Visitors;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class TagHelperAttributeValueCodeRendererTest : TagHelperTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperTestBase.cs
index 0e3f890d96..b598a5f952 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperTestBase.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.CodeGenerators.Visitors;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.CodeGenerators.Visitors;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class TagHelperTestBase : RazorCodeGeneratorTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TestSpan.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TestSpan.cs
index 50ac8500ef..2576878444 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TestSpan.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TestSpan.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Razor.Test.Generator
+namespace Microsoft.AspNetCore.Razor.Test.Generator
 {
     public class TestSpan
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Editor/AutoCompleteEditHandlerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Editor/AutoCompleteEditHandlerTest.cs
index 43a6281a51..2b7caabfd9 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Editor/AutoCompleteEditHandlerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Editor/AutoCompleteEditHandlerTest.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public class AutoCompleteEditHandlerTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Editor/ImplicitExpressionEditHandlerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Editor/ImplicitExpressionEditHandlerTest.cs
index 365e8d0aeb..31ebd8c87e 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Editor/ImplicitExpressionEditHandlerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Editor/ImplicitExpressionEditHandlerTest.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public class ImplicitExpressionEditHandlerTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Editor/RazorEditorParserTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Editor/RazorEditorParserTest.cs
index 169c187600..4709db24b4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Editor/RazorEditorParserTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Editor/RazorEditorParserTest.cs
@@ -4,18 +4,18 @@
 using System;
 using System.Threading;
 using System.Web.WebPages.TestUtils;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Test.Generator;
-using Microsoft.AspNet.Razor.Test.Utils;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Testing;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Test.Generator;
+using Microsoft.AspNetCore.Razor.Test.Utils;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Editor
+namespace Microsoft.AspNetCore.Razor.Test.Editor
 {
     public class RazorEditorParserTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Editor/SpanEditHandlerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Editor/SpanEditHandlerTest.cs
index ec989a7aa9..0c91f59a9f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Editor/SpanEditHandlerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Editor/SpanEditHandlerTest.cs
@@ -3,11 +3,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
 {
     public class SpanEditHandlerTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockExtensions.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockExtensions.cs
index b82788fb90..b756173f4b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockExtensions.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockExtensions.cs
@@ -1,9 +1,9 @@
 // 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public static class BlockExtensions
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockFactory.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockFactory.cs
index cbe4a3a0cd..fa702bd055 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockFactory.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockFactory.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Parser.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public class BlockFactory
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockTypes.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockTypes.cs
index f525f864d1..62bfbaa7ac 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockTypes.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockTypes.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.Collections.Generic;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Parser.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     // The product code doesn't need this, but having subclasses for the block types makes tests much cleaner :)
 
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/CodeParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/CodeParserTestBase.cs
index 5a6b7e09a8..b332618e4b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/CodeParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/CodeParserTestBase.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public abstract class CodeParserTestBase : ParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
index d26e715174..a7bda1d242 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public abstract class CsHtmlCodeParserTestBase : CodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
index 6118700ef4..08bbd5714b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public abstract class CsHtmlMarkupParserTestBase : MarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs
index 6bd8a3aed1..7193c6f95b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Text;
-using Microsoft.AspNet.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Utils;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public class ErrorCollector
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/MarkupParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/MarkupParserTestBase.cs
index cd22234d8c..19c69d91ca 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/MarkupParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/MarkupParserTestBase.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public abstract class MarkupParserTestBase : CodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/ParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/ParserTestBase.cs
index 2cb05a91c2..8c05f43810 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/ParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/ParserTestBase.cs
@@ -6,15 +6,15 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Parser.TagHelpers;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public abstract class ParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/RawTextSymbol.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/RawTextSymbol.cs
index c967ed855e..204c11b418 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/RawTextSymbol.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/RawTextSymbol.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Globalization;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     internal class RawTextSymbol : ISymbol
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs
index 098b70f7f6..ab48b7fb26 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs
@@ -4,15 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Test.Framework
+namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
     public static class SpanFactoryExtensions
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/BlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/BlockTest.cs
index bf065b2d6a..7942637784 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/BlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/BlockTest.cs
@@ -3,13 +3,13 @@
 
 using System.Linq;
 using System.Web.WebPages.TestUtils;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser
+namespace Microsoft.AspNetCore.Razor.Test.Parser
 {
     public class BlockTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
index 0d376bf11c..1fb2b1fd11 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
@@ -2,14 +2,14 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpAutoCompleteTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
index 915f0ac872..5c1c21633a 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
@@ -2,16 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpBlockTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs
index b48803c06a..16d7efb73d 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs
@@ -1,13 +1,13 @@
 // 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 Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpDirectivesTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs
index 7d023220c8..fadf44df45 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.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 Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpErrorTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs
index 95ca36732d..8c22f472d3 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpExplicitExpressionTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs
index d22864ba8e..c2f0d5eab3 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.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 Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpImplicitExpressionTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs
index d622066e95..5e06f7d282 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs
@@ -1,12 +1,12 @@
 // 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 Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpNestedStatementsTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
index 20be1da299..d2210074ba 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
@@ -2,14 +2,14 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpRazorCommentsTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs
index 279948a7dd..2f4653e3d9 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs
@@ -1,12 +1,12 @@
 // 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 Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpReservedWordsTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
index 3738d8d7dc..97f42def50 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
@@ -2,15 +2,15 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpSectionTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs
index 048f58283c..0fdc1956ce 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.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 Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpSpecialBlockTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpStatementTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpStatementTest.cs
index 078ec2ca80..8ba179a850 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpStatementTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpStatementTest.cs
@@ -2,13 +2,13 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     // Basic Tests for C# Statements:
     //  * Basic case for each statement
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
index 7e30f8e3f3..1e0dfc1cd4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
@@ -2,16 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpTemplateTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
index 49adc24001..3504a7c482 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
@@ -2,15 +2,15 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpToMarkupSwitchTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs
index 4860936f1a..3bae2da0e5 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpVerbatimBlockTest : CsHtmlCodeParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
index 37a5f07e44..75a17e6217 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
@@ -2,14 +2,14 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.CSharp
+namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
 {
     public class CSharpWhitespaceHandlingTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs
index 86073f0851..4027d2251d 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs
@@ -3,13 +3,13 @@
 
 using System;
 using System.Threading;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser
+namespace Microsoft.AspNetCore.Razor.Test.Parser
 {
     public class CallbackParserListenerTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs
index 4a5462fd0e..1c3921249a 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs
@@ -3,14 +3,14 @@
 
 using System;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.Html
+namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
 {
     public class HtmlAttributeTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs
index 9649c048e8..ed826639d1 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs
@@ -2,16 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.Html
+namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
 {
     public class HtmlBlockTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs
index eacf1e57df..9d763b1cd6 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs
@@ -2,15 +2,15 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.Html
+namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
 {
     public class HtmlDocumentTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlErrorTest.cs
index c48b23abdf..f4c17490e5 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlErrorTest.cs
@@ -1,13 +1,13 @@
 // 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 Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.Html
+namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
 {
     public class HtmlErrorTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlParserTestUtils.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlParserTestUtils.cs
index 80c1e62cfc..989fa9f9bc 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlParserTestUtils.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlParserTestUtils.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.Html
+namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
 {
     internal class HtmlParserTestUtils
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlTagsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlTagsTest.cs
index 578c97f059..3c02e82065 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlTagsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlTagsTest.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.Html
+namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
 {
     public class HtmlTagsTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
index 5f1ed74197..64f2980f4e 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
@@ -2,16 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Editor;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.Html
+namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
 {
     public class HtmlToCodeSwitchTest : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs
index 9d915ae9bd..ec53cec3c1 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs
@@ -3,15 +3,15 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser
+namespace Microsoft.AspNetCore.Razor.Test.Parser
 {
     public class ParserContextTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserVisitorExtensionsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserVisitorExtensionsTest.cs
index d1f14a9a42..75a201dc44 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserVisitorExtensionsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserVisitorExtensionsTest.cs
@@ -3,13 +3,13 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser
+namespace Microsoft.AspNetCore.Razor.Test.Parser
 {
     public class ParserVisitorExtensionsTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs
index 75d3f001f4..93b2419a7f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs
@@ -3,13 +3,13 @@
 
 using System;
 using System.Web.WebPages.TestUtils;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.PartialParsing
+namespace Microsoft.AspNetCore.Razor.Test.Parser.PartialParsing
 {
     public class CSharpPartialParsingTest : PartialParsingTestBase<CSharpRazorCodeLanguage>
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs
index b3e27e4848..a39b96e63b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs
@@ -4,14 +4,14 @@
 using System;
 using System.Threading;
 using System.Web.WebPages.TestUtils;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Test.Utils;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Test.Utils;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser.PartialParsing
+namespace Microsoft.AspNetCore.Razor.Test.Parser.PartialParsing
 {
     public abstract class PartialParsingTestBase<TLanguage>
         where TLanguage : RazorCodeLanguage, new()
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs
index 4164bf1689..265845a09e 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs
@@ -5,15 +5,15 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Moq;
 using Moq.Protected;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser
+namespace Microsoft.AspNetCore.Razor.Test.Parser
 {
     public class RazorParserTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/TagHelperBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/TagHelperBlockTest.cs
index ba785cf9d0..b6b2df82f4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/TagHelperBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/TagHelperBlockTest.cs
@@ -1,12 +1,12 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Parser.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers
 {
     public class TagHelperBlockTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs
index d421328ddd..2f79ecbb64 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs
@@ -1,11 +1,11 @@
 // 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 Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Parser
+namespace Microsoft.AspNetCore.Razor.Test.Parser
 {
     public class WhitespaceRewriterTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/RazorCodeLanguageTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorCodeLanguageTest.cs
index ea7ea3a1dd..eca16df9a6 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/RazorCodeLanguageTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/RazorCodeLanguageTest.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test
+namespace Microsoft.AspNetCore.Razor.Test
 {
     public class RazorCodeLanguageTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs
index 27566ef0e6..8fb274567c 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs
@@ -1,12 +1,12 @@
 // 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 Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test
+namespace Microsoft.AspNetCore.Razor.Test
 {
     public class RazorEngineHostTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/RazorErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorErrorTest.cs
index f201d2859e..110443dadc 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/RazorErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/RazorErrorTest.cs
@@ -5,7 +5,7 @@ using System;
 using Newtonsoft.Json;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     public class RazorErrorTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs
index 419c637434..d7d454a502 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs
@@ -6,14 +6,14 @@ using System.IO;
 using System.Text;
 using System.Threading;
 using System.Web.WebPages.TestUtils;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.CodeGenerators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Text;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test
+namespace Microsoft.AspNetCore.Razor.Test
 {
     public class RazorTemplateEngineTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/SourceLocationTest.cs b/test/Microsoft.AspNetCore.Razor.Test/SourceLocationTest.cs
index f3e783015e..76c35e776a 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/SourceLocationTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/SourceLocationTest.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Testing;
+using Microsoft.AspNetCore.Testing;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor
+namespace Microsoft.AspNetCore.Razor
 {
     public class SourceLocationTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/StringTextBuffer.cs b/test/Microsoft.AspNetCore.Razor.Test/StringTextBuffer.cs
index 218b77c533..cbbf3bf8b7 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/StringTextBuffer.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/StringTextBuffer.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.
 
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 
 namespace System.Web.WebPages.TestUtils
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs
index 25bade97a5..f59d5b9624 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs
@@ -1,20 +1,20 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Test.TagHelpers;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Test.TagHelpers;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     public class TagHelperBlockRewriterTest : TagHelperRewritingTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs
index 0ae4a3b428..a5faa405eb 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs
@@ -3,11 +3,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     public class TagHelperDescriptorProviderTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs
index 79aff0bc10..408090eab8 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs
@@ -1,14 +1,14 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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 System.Linq;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Internal;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Internal;
 using Newtonsoft.Json;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     public class TagHelperDescriptorTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
index ff107f2148..e61f2d70a7 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
@@ -4,15 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.Parser.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.Extensions.Internal;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Compilation.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Compilation.TagHelpers
 {
     public class TagHelperDirectiveSpanVisitorTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
index 2d04f4f0c3..eea4e14d5f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
@@ -5,16 +5,16 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Razor.Chunks.Generators;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.SyntaxTree;
-using Microsoft.AspNet.Razor.TagHelpers;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Test.TagHelpers
 {
     public class TagHelperParseTreeRewriterTest : TagHelperRewritingTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
index 0163bf9458..ac985ce4c9 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
@@ -1,16 +1,16 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Razor.Parser;
-using Microsoft.AspNet.Razor.Parser.TagHelpers.Internal;
-using Microsoft.AspNet.Razor.Compilation.TagHelpers;
-using Microsoft.AspNet.Razor.Test.Framework;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal;
+using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Test.Framework;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
 
-namespace Microsoft.AspNet.Razor.Test.TagHelpers
+namespace Microsoft.AspNetCore.Razor.Test.TagHelpers
 {
     public class TagHelperRewritingTestBase : CsHtmlMarkupParserTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs
index 0457a21513..35e57056a6 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
@@ -25,15 +25,15 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(28, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(45, 9, true);
                 WriteLiteral("\r\n    <p>");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("strong", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("strong", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                     Instrumentation.BeginContext(76, 5, true);
                     WriteLiteral("Hello");
                     Instrumentation.EndContext();
@@ -54,7 +54,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(90, 62, true);
                 WriteLiteral("<strong>World</strong></p>\r\n    <input checked=\"true\" />\r\n    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -78,7 +78,7 @@ __TestNamespace_InputTagHelper2.Checked = true;
                 Instrumentation.BeginContext(192, 6, true);
                 WriteLiteral("\r\n    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
index eb7c6233f3..65eae94e9f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
@@ -7,11 +7,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
@@ -23,15 +23,15 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(33, 71, true);
             WriteLiteral("\r\n<div data-animation=\"fade\" class=\"randomNonTagHelperAttribute\">\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(145, 10, true);
                 WriteLiteral("\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
@@ -44,7 +44,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(162, 10, true);
                 WriteLiteral("\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -72,7 +72,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(243, 10, true);
                 WriteLiteral("\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs
index 3ecf76cef3..d62629776f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
@@ -24,15 +24,15 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(55, 52, true);
             WriteLiteral("\r\n<THSdiv class=\"randomNonTagHelperAttribute\">\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(133, 56, true);
                 WriteLiteral("\r\n        <p></p>\r\n        <input type=\"text\">\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs
index 5c53c9a0f2..7a2223b1e7 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
@@ -24,15 +24,15 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(33, 71, true);
             WriteLiteral("\r\n<div data-animation=\"fade\" class=\"randomNonTagHelperAttribute\">\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(145, 10, true);
                 WriteLiteral("\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
@@ -45,7 +45,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(162, 10, true);
                 WriteLiteral("\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -73,7 +73,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(243, 10, true);
                 WriteLiteral("\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs
index 67610018c9..3448a6122d 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
@@ -24,7 +24,7 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
@@ -40,7 +40,7 @@ namespace TestOutput
             Instrumentation.BeginContext(82, 55, true);
             WriteLiteral("    <div class=\"randomNonTagHelperAttribute\">\r\n        ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(175, 34, true);
                 WriteLiteral("\r\n            <h1>Set Time:</h1>\r\n");
                 Instrumentation.EndContext();
@@ -60,11 +60,11 @@ namespace TestOutput
                 Instrumentation.BeginContext(249, 16, true);
                 WriteLiteral("                ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                     Instrumentation.BeginContext(268, 10, true);
                     WriteLiteral("New Time: ");
                     Instrumentation.EndContext();
-                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                     }
                     , StartTagHelperWritingScope, EndTagHelperWritingScope);
                     __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -108,11 +108,11 @@ namespace TestOutput
                 Instrumentation.BeginContext(398, 16, true);
                 WriteLiteral("                ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                     Instrumentation.BeginContext(417, 14, true);
                     WriteLiteral("Current Time: ");
                     Instrumentation.EndContext();
-                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                     }
                     , StartTagHelperWritingScope, EndTagHelperWritingScope);
                     __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -156,7 +156,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(472, 18, true);
                 WriteLiteral("\r\n                ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -181,7 +181,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(540, 18, true);
                 WriteLiteral("\r\n                ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -267,7 +267,7 @@ AddHtmlAttributeValue(" ", 159, DateTime.Now, 160, 14, false);
             Instrumentation.BeginContext(668, 10, true);
             WriteLiteral("\r\n        ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(765, 2, true);
                 WriteLiteral("\r\n");
                 Instrumentation.EndContext();
@@ -286,7 +286,7 @@ AddHtmlAttributeValue(" ", 159, DateTime.Now, 160, 14, false);
                 Instrumentation.BeginContext(805, 12, true);
                 WriteLiteral("            ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -331,11 +331,11 @@ __TestNamespace_InputTagHelper2.Checked = (@object);
             Instrumentation.BeginContext(859, 10, true);
             WriteLiteral("\r\n        ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(911, 14, true);
                 WriteLiteral("\r\n            ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -380,11 +380,11 @@ __TestNamespace_PTagHelper.Age = -1970 + @DateTimeOffset.Now.Year;
             Instrumentation.BeginContext(1024, 10, true);
             WriteLiteral("\r\n        ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(1074, 14, true);
                 WriteLiteral("\r\n            ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -427,11 +427,11 @@ __TestNamespace_PTagHelper.Age = DateTimeOffset.Now.Year - 1970;
             Instrumentation.BeginContext(1150, 10, true);
             WriteLiteral("\r\n        ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(1202, 14, true);
                 WriteLiteral("\r\n            ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -477,8 +477,8 @@ __TestNamespace_PTagHelper.Age = ("My age is this long.".Length);
             Instrumentation.BeginContext(1304, 11, false);
 #line 34 "ComplexTagHelpers.cshtml"
    Write(someMethod(item => new Template(async(__razor_template_writer) => {
-    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-        __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+        __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
         }
         , StartTagHelperWritingScope, EndTagHelperWritingScope);
         __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs
index 82cdf20b4b..3112d5c41f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
@@ -24,15 +24,15 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(63, 6, true);
                 WriteLiteral("\r\n    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -51,7 +51,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(108, 6, true);
                 WriteLiteral("\r\n    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs
index aa25bec082..d4cc63f6aa 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null;
         #line hidden
@@ -23,11 +23,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs
index aa2a16236e..06636b2ffb 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         #line hidden
         public DynamicAttributeTagHelpers()
@@ -22,11 +22,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -47,7 +47,7 @@ AddHtmlAttributeValue(" ", 55, DateTime.Now, 56, 14, false);
             Instrumentation.BeginContext(73, 4, true);
             WriteLiteral("\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -98,7 +98,7 @@ WriteTo(__razor_attribute_value_writer, string.Empty);
             Instrumentation.BeginContext(148, 4, true);
             WriteLiteral("\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -131,7 +131,7 @@ AddHtmlAttributeValue(" ", 210, DateTime.Now, 211, 14, false);
             Instrumentation.BeginContext(235, 4, true);
             WriteLiteral("\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -235,7 +235,7 @@ AddHtmlAttributeValue(" ", 404, int.MaxValue, 405, 14, false);
             Instrumentation.BeginContext(422, 4, true);
             WriteLiteral("\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -267,7 +267,7 @@ AddHtmlAttributeValue(" ", 488, int.MaxValue, 489, 14, false);
             Instrumentation.BeginContext(506, 4, true);
             WriteLiteral("\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs
index 1d6d26822a..40a17feebf 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
@@ -24,11 +24,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(25, 13, true);
             WriteLiteral("\r\n<div>\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -53,11 +53,11 @@ __TestNamespace_InputTagHelper2.Checked = ;
             Instrumentation.BeginContext(72, 6, true);
             WriteLiteral("\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(88, 10, true);
                 WriteLiteral("\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs
index a9a9b455f3..f0a6b7550c 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs
@@ -48,19 +48,19 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #line 9 "EnumTagHelpers.cshtml"
-__TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue;
+__TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue;
 
 #line default
 #line hidden
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
 #line 10 "EnumTagHelpers.cshtml"
-__TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MySecondValue;
+__TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MySecondValue;
 
 #line default
 #line hidden
 #line 10 "EnumTagHelpers.cshtml"
-__TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue;
+__TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue;
 
 #line default
 #line hidden
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs
index 3bf6639c14..374dfc480c 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null;
         #line hidden
@@ -23,7 +23,7 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
@@ -37,7 +37,7 @@ namespace TestOutput
             Instrumentation.BeginContext(77, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -58,7 +58,7 @@ __TestNamespace_InputTagHelper.Value = MyEnum.MyValue;
             Instrumentation.BeginContext(112, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -80,7 +80,7 @@ AddHtmlAttributeValue("", 128, MyEnum.MySecondValue, 128, 21, false);
             Instrumentation.BeginContext(153, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -88,7 +88,7 @@ AddHtmlAttributeValue("", 128, MyEnum.MySecondValue, 128, 21, false);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
             __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
 #line 9 "EnumTagHelpers.cshtml"
-__TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue;
+__TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue;
 
 #line default
 #line hidden
@@ -101,7 +101,7 @@ __TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyE
             Instrumentation.BeginContext(180, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -109,13 +109,13 @@ __TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyE
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
             __tagHelperExecutionContext.Add(__TestNamespace_CatchAllTagHelper);
 #line 10 "EnumTagHelpers.cshtml"
-__TestNamespace_InputTagHelper.Value = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MySecondValue;
+__TestNamespace_InputTagHelper.Value = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MySecondValue;
 
 #line default
 #line hidden
             __tagHelperExecutionContext.AddTagHelperAttribute("value", __TestNamespace_InputTagHelper.Value);
 #line 10 "EnumTagHelpers.cshtml"
-__TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNet.Razor.Test.Generator.MyEnum.MyValue;
+__TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNetCore.Razor.Test.Generator.MyEnum.MyValue;
 
 #line default
 #line hidden
@@ -128,7 +128,7 @@ __TestNamespace_CatchAllTagHelper.CatchAll = Microsoft.AspNet.Razor.Test.Generat
             Instrumentation.BeginContext(232, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs
index 90d8aaf0b8..f400f4d3d6 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
         #line hidden
@@ -23,7 +23,7 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(25, 72, true);
             WriteLiteral("\r\n<div class=\"randomNonTagHelperAttribute\">\r\n    <p class=\"Hello World\" ");
             Instrumentation.EndContext();
@@ -37,7 +37,7 @@ namespace TestOutput
             Instrumentation.BeginContext(112, 69, true);
             WriteLiteral(">\r\n        <input type=\"text\" />\r\n        <em>Not a TagHelper: </em> ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs
index 54f79bbc7c..ed2663d9d5 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         #line hidden
         public IncompleteTagHelper()
@@ -22,11 +22,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs
index 163b126bb8..5c7f8f0429 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         #line hidden
@@ -23,15 +23,15 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(62, 34, true);
                 WriteLiteral("\r\n    <input nottaghelper />\r\n    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
@@ -46,7 +46,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(155, 6, true);
                 WriteLiteral("\r\n    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -66,7 +66,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(280, 6, true);
                 WriteLiteral("\r\n    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -88,7 +88,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(462, 6, true);
                 WriteLiteral("\r\n    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs
index efca9ee960..430b9a9659 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
@@ -24,11 +24,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 106, true);
             WriteLiteral("\r\n<script type=\"text/html\">\r\n    <div data-animation=\"fade\" class=\"randomNonTagHelperAttribute\">\r\n        ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(178, 2, true);
                 WriteLiteral("\r\n");
                 Instrumentation.EndContext();
@@ -47,7 +47,7 @@ namespace TestOutput
                 Instrumentation.BeginContext(223, 84, true);
                 WriteLiteral("                <script id=\"nestedScriptTag\" type=\"text/html\">\r\n                    ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagOnly, "test", async() => {
                 }
                 , StartTagHelperWritingScope, EndTagHelperWritingScope);
                 __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs
index 46dbf6b84b..a450403d4b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
         private global::TestNamespace.InputTagHelper1 __TestNamespace_InputTagHelper1 = null;
         #line hidden
@@ -23,7 +23,7 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
@@ -45,7 +45,7 @@ namespace TestOutput
             Instrumentation.BeginContext(280, 49, true);
             WriteLiteral("\r\n<div class=\"randomNonTagHelperAttribute\">\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
@@ -75,7 +75,7 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty = intDictionary;
             Instrumentation.BeginContext(421, 6, true);
             WriteLiteral("\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
@@ -120,7 +120,7 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty = intDictionary;
             Instrumentation.BeginContext(530, 6, true);
             WriteLiteral("\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
@@ -192,7 +192,7 @@ __TestNamespace_InputTagHelper2.IntDictionaryProperty["salt"] = 37;
             Instrumentation.BeginContext(793, 6, true);
             WriteLiteral("\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper2 = CreateTagHelper<global::TestNamespace.InputTagHelper2>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs
index 265401b5dd..f7ff9b02c4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.InputTagHelper1 __TestNamespace_InputTagHelper1 = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
         #line hidden
@@ -23,7 +23,7 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
@@ -45,7 +45,7 @@ namespace TestOutput
             Instrumentation.BeginContext(280, 49, true);
             WriteLiteral("\r\n<div class=\"randomNonTagHelperAttribute\">\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
@@ -75,7 +75,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
             Instrumentation.BeginContext(421, 6, true);
             WriteLiteral("\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
@@ -120,7 +120,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty = intDictionary;
             Instrumentation.BeginContext(530, 6, true);
             WriteLiteral("\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
@@ -192,7 +192,7 @@ __TestNamespace_InputTagHelper1.IntDictionaryProperty["salt"] = 37;
             Instrumentation.BeginContext(793, 6, true);
             WriteLiteral("\r\n    ");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper1 = CreateTagHelper<global::TestNamespace.InputTagHelper1>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs
index 70a00020df..431c81754d 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         #line hidden
         public SingleTagHelper()
@@ -22,11 +22,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(67, 11, true);
                 WriteLiteral("Body of Tag");
                 Instrumentation.EndContext();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs
index 0dbcdc4ec8..7cdcef8bb4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         #line hidden
         public SingleTagHelperWithNewlineBeforeAttributes()
@@ -22,11 +22,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(71, 11, true);
                 WriteLiteral("Body of Tag");
                 Instrumentation.EndContext();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs
index 583c80f0dd..1036d98311 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.CatchAllTagHelper __TestNamespace_CatchAllTagHelper = null;
         #line hidden
         public SymbolBoundAttributes()
@@ -22,11 +22,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(23, 253, true);
             WriteLiteral("\r\n<ul [item]=\"items\"></ul>\r\n<ul [(item)]=\"items\"></ul>\r\n<button (click)=\"doSomething()\">Click Me</button>\r\n<button (^click)=\"doSomething()\">Click Me</button>\r\n<template *something=\"value\">\r\n</template>\r\n<div #local></div>\r\n<div #local=\"value\"></div>\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("ul", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("ul", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
@@ -47,7 +47,7 @@ __TestNamespace_CatchAllTagHelper.ListItems = items;
             Instrumentation.BeginContext(321, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("ul", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("ul", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
@@ -68,7 +68,7 @@ __TestNamespace_CatchAllTagHelper.ArrayItems = items;
             Instrumentation.BeginContext(372, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("button", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("button", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(436, 8, true);
                 WriteLiteral("Click Me");
                 Instrumentation.EndContext();
@@ -96,7 +96,7 @@ __TestNamespace_CatchAllTagHelper.Event1 = doSomething();
             Instrumentation.BeginContext(453, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("button", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("button", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(519, 8, true);
                 WriteLiteral("Click Me");
                 Instrumentation.EndContext();
@@ -124,7 +124,7 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething();
             Instrumentation.BeginContext(536, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("template", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("template", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(592, 2, true);
                 WriteLiteral("\r\n");
                 Instrumentation.EndContext();
@@ -148,7 +148,7 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething();
             Instrumentation.BeginContext(605, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
@@ -163,7 +163,7 @@ __TestNamespace_CatchAllTagHelper.Event2 = doSomething();
             Instrumentation.BeginContext(640, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_CatchAllTagHelper = CreateTagHelper<global::TestNamespace.CatchAllTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs
index 6a38385dcd..666d7c0ddc 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.MyTagHelper __TestNamespace_MyTagHelper = null;
         private global::TestNamespace.NestedTagHelper __TestNamespace_NestedTagHelper = null;
         #line hidden
@@ -23,7 +23,7 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
@@ -41,11 +41,11 @@ namespace TestOutput
                 Instrumentation.BeginContext(91, 21, true);
                 WriteLiteralTo(__razor_template_writer, "\r\n    <div>\r\n        ");
                 Instrumentation.EndContext();
-                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("mytaghelper", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                __tagHelperExecutionContext = __tagHelperScopeManager.Begin("mytaghelper", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                     Instrumentation.BeginContext(215, 52, true);
                     WriteLiteral("\r\n            In None ContentBehavior.\r\n            ");
                     Instrumentation.EndContext();
-                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("nestedtaghelper", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+                    __tagHelperExecutionContext = __tagHelperScopeManager.Begin("nestedtaghelper", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                         Instrumentation.BeginContext(284, 26, true);
                         WriteLiteral("Some buffered values with ");
                         Instrumentation.EndContext();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs
index 284a47d1d6..06f07100c5 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         private global::TestNamespace.InputTagHelper __TestNamespace_InputTagHelper = null;
         private global::TestNamespace.InputTagHelper2 __TestNamespace_InputTagHelper2 = null;
@@ -24,11 +24,11 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
             Instrumentation.BeginContext(31, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(103, 11, true);
                 WriteLiteral("Body of Tag");
                 Instrumentation.EndContext();
@@ -63,7 +63,7 @@ __TestNamespace_PTagHelper.Age = 1337;
             Instrumentation.BeginContext(118, 4, true);
             WriteLiteral("\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
@@ -82,7 +82,7 @@ __TestNamespace_PTagHelper.Age = 1337;
             Instrumentation.BeginContext(169, 4, true);
             WriteLiteral("\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
@@ -102,7 +102,7 @@ __TestNamespace_PTagHelper.Age = 1234;
             Instrumentation.BeginContext(219, 4, true);
             WriteLiteral("\r\n\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_InputTagHelper = CreateTagHelper<global::TestNamespace.InputTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs
index 3e0d6e9121..8ff14ec61c 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs
@@ -8,11 +8,11 @@ namespace TestOutput
     {
         #line hidden
         #pragma warning disable 0414
-        private global::Microsoft.AspNet.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
+        private global::Microsoft.AspNetCore.Razor.TagHelperContent __tagHelperStringValueBuffer = null;
         #pragma warning restore 0414
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
-        private global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNet.Razor.Runtime.TagHelperScopeManager();
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperExecutionContext __tagHelperExecutionContext = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner __tagHelperRunner = null;
+        private global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager __tagHelperScopeManager = new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperScopeManager();
         private global::TestNamespace.PTagHelper __TestNamespace_PTagHelper = null;
         #line hidden
         public TransitionsInTagHelperAttributes()
@@ -22,7 +22,7 @@ namespace TestOutput
         #pragma warning disable 1998
         public override async Task ExecuteAsync()
         {
-            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNet.Razor.Runtime.TagHelperRunner();
+            __tagHelperRunner = __tagHelperRunner ?? new global::Microsoft.AspNetCore.Razor.Runtime.TagHelperRunner();
 #line 2 "TransitionsInTagHelperAttributes.cshtml"
    
     var @class = "container-fluid";
@@ -34,7 +34,7 @@ namespace TestOutput
             Instrumentation.BeginContext(95, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
                 Instrumentation.BeginContext(126, 11, true);
                 WriteLiteral("Body of Tag");
                 Instrumentation.EndContext();
@@ -65,7 +65,7 @@ __TestNamespace_PTagHelper.Age = 1337;
             Instrumentation.BeginContext(141, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
@@ -91,7 +91,7 @@ __TestNamespace_PTagHelper.Age = 42;
             Instrumentation.BeginContext(177, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
@@ -111,7 +111,7 @@ __TestNamespace_PTagHelper.Age = 42 + @int;
             Instrumentation.BeginContext(215, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
@@ -131,7 +131,7 @@ __TestNamespace_PTagHelper.Age = int;
             Instrumentation.BeginContext(248, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
@@ -151,7 +151,7 @@ __TestNamespace_PTagHelper.Age = (@int);
             Instrumentation.BeginContext(284, 2, true);
             WriteLiteral("\r\n");
             Instrumentation.EndContext();
-            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNet.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
+            __tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             , StartTagHelperWritingScope, EndTagHelperWritingScope);
             __TestNamespace_PTagHelper = CreateTagHelper<global::TestNamespace.PTagHelper>();
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs
index c310b93bba..134f0fd276 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Text
+namespace Microsoft.AspNetCore.Razor.Test.Text
 {
     public class BufferingTextReaderTest : LookaheadTextReaderTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/LineTrackingStringBufferTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/LineTrackingStringBufferTest.cs
index f38396f6ee..5a70a70870 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Text/LineTrackingStringBufferTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Text/LineTrackingStringBufferTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Text
+namespace Microsoft.AspNetCore.Razor.Test.Text
 {
     public class LineTrackingStringBufferTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/LookaheadTextReaderTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/LookaheadTextReaderTestBase.cs
index 98f7e76001..08d94d1c7a 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Text/LookaheadTextReaderTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Text/LookaheadTextReaderTestBase.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Text;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Text
+namespace Microsoft.AspNetCore.Razor.Test.Text
 {
     public abstract class LookaheadTextReaderTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/SourceLocationTrackerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/SourceLocationTrackerTest.cs
index 737c511059..45bc7804a9 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Text/SourceLocationTrackerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Text/SourceLocationTrackerTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Text
+namespace Microsoft.AspNetCore.Razor.Test.Text
 {
     public class SourceLocationTrackerTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs
index 93fcf70ff8..a04e47c901 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Web.WebPages.TestUtils;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Text
+namespace Microsoft.AspNetCore.Razor.Test.Text
 {
     public class TextBufferReaderTest : LookaheadTextReaderTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/TextChangeTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/TextChangeTest.cs
index 11172bcbd5..c9abc11373 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Text/TextChangeTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Text/TextChangeTest.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Web.WebPages.TestUtils;
-using Microsoft.AspNet.Razor.Text;
+using Microsoft.AspNetCore.Razor.Text;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Text
+namespace Microsoft.AspNetCore.Razor.Test.Text
 {
     public class TextChangeTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs
index 7d91423397..042eae0217 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Text
+namespace Microsoft.AspNetCore.Razor.Test.Text
 {
     public class TextReaderExtensionsTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs
index 4195bddd39..0dff1fa68b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public class CSharpTokenizerCommentTest : CSharpTokenizerTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs
index 1244fe44bc..5d169c0f41 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public class CSharpTokenizerIdentifierTest : CSharpTokenizerTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs
index aef10c43d0..407d90172f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public class CSharpTokenizerLiteralTest : CSharpTokenizerTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs
index 05741aa88a..a98e7a62f8 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public class CSharpTokenizerOperatorsTest : CSharpTokenizerTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTest.cs
index 182468fe87..cdf7be2c9e 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public class CSharpTokenizerTest : CSharpTokenizerTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
index 22cfa445f4..a5c789bf85 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
@@ -1,11 +1,11 @@
 // 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 Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public abstract class CSharpTokenizerTestBase : TokenizerTestBase<CSharpSymbol, CSharpSymbolType>
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
index 73890a0d0f..80269a683c 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
@@ -1,10 +1,10 @@
 // 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 Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public class HtmlTokenizerTest : HtmlTokenizerTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
index 1805494780..5e7af81caf 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
@@ -1,11 +1,11 @@
 // 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 Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public abstract class HtmlTokenizerTestBase : TokenizerTestBase<HtmlSymbol, HtmlSymbolType>
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
index bdfe3bae30..757668abdb 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
@@ -5,12 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public class TokenizerLookaheadTest : HtmlTokenizerTestBase
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerTestBase.cs
index e9e7bb3ad9..fd7165700b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerTestBase.cs
@@ -5,12 +5,12 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
-using Microsoft.AspNet.Razor.Text;
-using Microsoft.AspNet.Razor.Tokenizer;
-using Microsoft.AspNet.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Text;
+using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
     public abstract class TokenizerTestBase<TSymbol, TSymbolType>
         where TSymbolType : struct
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Utils/BaselineWriter.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/BaselineWriter.cs
index 9caf811ed1..189cb82ba6 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Utils/BaselineWriter.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Utils/BaselineWriter.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.IO;
 
-namespace Microsoft.AspNet.Razor.Test.Utils
+namespace Microsoft.AspNetCore.Razor.Test.Utils
 {
     public static class BaselineWriter
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs
index 9eea704f5a..e952394be2 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs
@@ -2,10 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 
-using Microsoft.AspNet.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Utils;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Utils
+namespace Microsoft.AspNetCore.Razor.Test.Utils
 {
     public class DisposableActionTest
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Utils/ExceptionHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/ExceptionHelpers.cs
index 064d8eb64c..b15f886fcc 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Utils/ExceptionHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Utils/ExceptionHelpers.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test
+namespace Microsoft.AspNetCore.Razor.Test
 {
     public static class ExceptionHelpers
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Utils/MiscUtils.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/MiscUtils.cs
index e9de06e70f..73f3b87ecd 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Utils/MiscUtils.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Utils/MiscUtils.cs
@@ -8,7 +8,7 @@ using System.Threading;
 #endif
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test.Utils
+namespace Microsoft.AspNetCore.Razor.Test.Utils
 {
     class MiscUtils
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Utils/TestFile.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/TestFile.cs
index df40ac6bb2..a24b675835 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Utils/TestFile.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Utils/TestFile.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Reflection;
 using Xunit;
 
-namespace Microsoft.AspNet.Razor.Test
+namespace Microsoft.AspNetCore.Razor.Test
 {
     public class TestFile
     {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/project.json b/test/Microsoft.AspNetCore.Razor.Test/project.json
index a0696638aa..95d655be7d 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/project.json
+++ b/test/Microsoft.AspNetCore.Razor.Test/project.json
@@ -2,12 +2,12 @@
   "version": "1.0.0",
   "resource": "TestFiles/**/*",
   "dependencies": {
-    "Microsoft.AspNet.Razor": "4.0.0-*",
-    "Microsoft.AspNet.Razor.Test.Sources": {
+    "Microsoft.AspNetCore.Razor": "4.0.0-*",
+    "Microsoft.AspNetCore.Razor.Test.Sources": {
       "version": "4.0.0-*",
       "type": "build"
     },
-    "Microsoft.AspNet.Testing": "1.0.0-*",
+    "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "xunit": "2.1.0"
   },
   "testRunner": "xunit",