diff --git a/Antiforgery.sln b/Antiforgery.sln
index 48fb0ca448..b25af44097 100644
--- a/Antiforgery.sln
+++ b/Antiforgery.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", "{71D070C4-B32
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EDD8B57-4DE8-4246-A6A3-47ECD92740B4}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Antiforgery", "src\Microsoft.AspNet.Antiforgery\Microsoft.AspNet.Antiforgery.xproj", "{46FB03FB-7A44-4106-BDDE-D6F5417544AB}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Antiforgery", "src\Microsoft.AspNetCore.Antiforgery\Microsoft.AspNetCore.Antiforgery.xproj", "{46FB03FB-7A44-4106-BDDE-D6F5417544AB}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Antiforgery.Test", "test\Microsoft.AspNet.Antiforgery.Test\Microsoft.AspNet.Antiforgery.Test.xproj", "{415E83F8-6002-47E4-AA8E-CD5169C06F28}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Antiforgery.Test", "test\Microsoft.AspNetCore.Antiforgery.Test\Microsoft.AspNetCore.Antiforgery.Test.xproj", "{415E83F8-6002-47E4-AA8E-CD5169C06F28}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{D8C46ADF-E40A-4B48-ADE9-E1FA80466FE3}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AntiforgerySample", "samples\AntiforgerySample\AntiforgerySample.xproj", "{AF9E0784-5EDB-494F-B46C-1A8DA785C49C}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Antiforgery.FunctionalTests", "test\Microsoft.AspNet.Antiforgery.FunctionalTests\Microsoft.AspNet.Antiforgery.FunctionalTests.xproj", "{8B288810-5A96-4AF5-9836-8BA2D2953203}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Antiforgery.FunctionalTests", "test\Microsoft.AspNetCore.Antiforgery.FunctionalTests\Microsoft.AspNetCore.Antiforgery.FunctionalTests.xproj", "{8B288810-5A96-4AF5-9836-8BA2D2953203}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 5627d30493..49fcb32a52 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -9,7 +9,7 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.AspNet.Antiforgery": { }
+            "Microsoft.AspNetCore.Antiforgery": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.
diff --git a/samples/AntiforgerySample/Startup.cs b/samples/AntiforgerySample/Startup.cs
index e2f548fc75..171fe66e81 100644
--- a/samples/AntiforgerySample/Startup.cs
+++ b/samples/AntiforgerySample/Startup.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.Antiforgery;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Routing;
+using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
diff --git a/samples/AntiforgerySample/hosting.json b/samples/AntiforgerySample/hosting.json
index f8ef14574d..6a93dbafa8 100644
--- a/samples/AntiforgerySample/hosting.json
+++ b/samples/AntiforgerySample/hosting.json
@@ -1,3 +1,3 @@
-{
-  "server": "Microsoft.AspNet.Server.Kestrel"
+{
+  "server": "Microsoft.AspNetCore.Server.Kestrel"
 }
diff --git a/samples/AntiforgerySample/project.json b/samples/AntiforgerySample/project.json
index 819ff29f70..dc978175bc 100644
--- a/samples/AntiforgerySample/project.json
+++ b/samples/AntiforgerySample/project.json
@@ -2,13 +2,13 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "Microsoft.AspNet.Antiforgery": "1.0.0-*",
-    "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
-    "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
-    "Microsoft.AspNet.Routing.Extensions": "1.0.0-*",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-*",
+    "Microsoft.AspNetCore.Antiforgery": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
+    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Routing.Extensions": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
     "Newtonsoft.Json": "7.0.1"
   },
 
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryContext.cs b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryContext.cs
index ded759255c..3615fc25b1 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryContext.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryContext.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.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// Used as a per request state.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptions.cs b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptions.cs
index 49656dd068..e59b6aecd9 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptions.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptions.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// Provides programmatic configuration for the antiforgery token system.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptionsSetup.cs b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptionsSetup.cs
index c8dca4d39d..c397845599 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptionsSetup.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryOptionsSetup.cs
@@ -4,11 +4,11 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using Microsoft.AspNet.DataProtection;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class AntiforgeryOptionsSetup : ConfigureOptions<AntiforgeryOptions>
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryToken.cs b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryToken.cs
index 233c5c51cd..bf9ba5e9bf 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryToken.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryToken.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.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public sealed class AntiforgeryToken
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryTokenSet.cs b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryTokenSet.cs
index 8fabd782ee..9446cba3c6 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryTokenSet.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryTokenSet.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// The antiforgery token pair (cookie and request token) for a request.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryValidationException.cs b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryValidationException.cs
index d5ea22e52b..b2fb6e9618 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryValidationException.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/AntiforgeryValidationException.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.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// The <see cref="Exception"/> that is thrown when the antiforgery token validation fails.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/BinaryBlob.cs b/src/Microsoft.AspNetCore.Antiforgery/BinaryBlob.cs
index e0faebed0a..9cb78296b5 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/BinaryBlob.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/BinaryBlob.cs
@@ -8,7 +8,7 @@ using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     // Represents a binary blob (token) that contains random data.
     // Useful for binary data inside a serialized stream.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgery.cs b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgery.cs
index b17c3edb4c..9239609498 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgery.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgery.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Html;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// Provides access to the antiforgery system, which provides protection against
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryAdditionalDataProvider.cs b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryAdditionalDataProvider.cs
index 2d5967f368..e0797d2696 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryAdditionalDataProvider.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryAdditionalDataProvider.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.Http;
+using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// A default <see cref="IAntiforgeryAdditionalDataProvider"/> implementation.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryContextAccessor.cs b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryContextAccessor.cs
index c19eb312e2..7dd27634e6 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryContextAccessor.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryContextAccessor.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.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultAntiforgeryContextAccessor : IAntiforgeryContextAccessor
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenGenerator.cs b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenGenerator.cs
index ae43f846b6..27e82d9a96 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenGenerator.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenGenerator.cs
@@ -5,9 +5,9 @@ using System;
 using System.Diagnostics;
 using System.Security.Claims;
 using System.Security.Principal;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultAntiforgeryTokenGenerator : IAntiforgeryTokenGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenSerializer.cs b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenSerializer.cs
index e1ecd406e8..7c48a9d3d3 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenSerializer.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenSerializer.cs
@@ -3,14 +3,14 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.DataProtection;
-using Microsoft.AspNet.WebUtilities;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.WebUtilities;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultAntiforgeryTokenSerializer : IAntiforgeryTokenSerializer
     {
-        private static readonly string Purpose = "Microsoft.AspNet.Antiforgery.AntiforgeryToken.v1";
+        private static readonly string Purpose = "Microsoft.AspNetCore.Antiforgery.AntiforgeryToken.v1";
 
         private readonly IDataProtector _cryptoSystem;
         private const byte TokenVersion = 0x01;
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenStore.cs b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenStore.cs
index ee677af059..5d9328f031 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenStore.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/DefaultAntiforgeryTokenStore.cs
@@ -4,12 +4,12 @@
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultAntiforgeryTokenStore : IAntiforgeryTokenStore
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/DefaultClaimUidExtractor.cs b/src/Microsoft.AspNetCore.Antiforgery/DefaultClaimUidExtractor.cs
index 7c033547cc..8220cbf166 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/DefaultClaimUidExtractor.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/DefaultClaimUidExtractor.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Security.Claims;
 using System.Security.Cryptography;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// Default implementation of <see cref="IClaimUidExtractor"/>.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgery.cs b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgery.cs
index 1944b02622..ca2d8341ae 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgery.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgery.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.Threading.Tasks;
-using Microsoft.AspNet.Html;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// Provides access to the antiforgery system, which provides protection against
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryAdditionalDataProvider.cs b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryAdditionalDataProvider.cs
index b652619dd9..d66b6245db 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryAdditionalDataProvider.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryAdditionalDataProvider.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.Http;
+using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// Allows providing or validating additional custom data for antiforgery tokens.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryContextAccessor.cs b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryContextAccessor.cs
index ac2c5e023f..7b0146dbd9 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryContextAccessor.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryContextAccessor.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.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public interface IAntiforgeryContextAccessor
     {
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenGenerator.cs b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenGenerator.cs
index 47b701817c..79fc447a45 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenGenerator.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenGenerator.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.Http;
+using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// Generates and validates antiforgery tokens.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenSerializer.cs b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenSerializer.cs
index 1864906983..badc897309 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenSerializer.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenSerializer.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.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     // Abstracts out the serialization process for an antiforgery token
     public interface IAntiforgeryTokenSerializer
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenStore.cs b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenStore.cs
index 15ea992cb8..9d14ac79b3 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenStore.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/IAntiforgeryTokenStore.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.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     // Provides an abstraction around how tokens are persisted and retrieved for a request
     public interface IAntiforgeryTokenStore
diff --git a/src/Microsoft.AspNetCore.Antiforgery/IClaimUidExtractor.cs b/src/Microsoft.AspNetCore.Antiforgery/IClaimUidExtractor.cs
index c7b0af04c9..b78cbc863a 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/IClaimUidExtractor.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/IClaimUidExtractor.cs
@@ -3,7 +3,7 @@
 
 using System.Security.Claims;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     /// <summary>
     /// This interface can extract unique identifers for a claims-based identity.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.xproj b/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.xproj
index b920ab0e7b..c616520381 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.xproj
+++ b/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -8,7 +8,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>46fb03fb-7a44-4106-bdde-d6f5417544ab</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.Antiforgery</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.Antiforgery</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs
index 20d72d904c..e30b53b634 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Properties/AssemblyInfo.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.
 
 using System.Reflection;
@@ -6,6 +6,6 @@ using System.Resources;
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
-[assembly: InternalsVisibleTo("Microsoft.AspNet.Antiforgery.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Antiforgery.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: NeutralResourcesLanguage("en-us")]
diff --git a/src/Microsoft.AspNetCore.Antiforgery/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Antiforgery/Properties/Resources.Designer.cs
index df958a3454..87e05dabab 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/Properties/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Antiforgery
     internal static class Resources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNet.Antiforgery.Resources", typeof(Resources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.AspNetCore.Antiforgery.Resources", typeof(Resources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// The provided identity of type '{0}' is marked {1} = {2} but does not have a value for {3}. By default, the antiforgery system requires that all authenticated identities have a unique {3}. If it is not possible to provide a unique {3} for this identity, consider extending {4} by overriding the {5} or a custom type that can provide some form of unique identifier for the current user.
diff --git a/src/Microsoft.AspNetCore.Antiforgery/ServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Antiforgery/ServiceCollectionExtensions.cs
index 556647b56a..26839b935f 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/ServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.Antiforgery/ServiceCollectionExtensions.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;
-using Microsoft.AspNet.Antiforgery;
+using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
diff --git a/src/Microsoft.AspNetCore.Antiforgery/project.json b/src/Microsoft.AspNetCore.Antiforgery/project.json
index 9222a0c515..37585292cb 100644
--- a/src/Microsoft.AspNetCore.Antiforgery/project.json
+++ b/src/Microsoft.AspNetCore.Antiforgery/project.json
@@ -10,10 +10,10 @@
     "url": "git://github.com/aspnet/antiforgery"
   },
   "dependencies": {
-    "Microsoft.AspNet.DataProtection": "1.0.0-*",
-    "Microsoft.AspNet.Html.Abstractions": "1.0.0-*",
-    "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
-    "Microsoft.AspNet.WebUtilities": "1.0.0-*"
+    "Microsoft.AspNetCore.DataProtection": "1.0.0-*",
+    "Microsoft.AspNetCore.Html.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.WebUtilities": "1.0.0-*"
   },
   "frameworks": {
     "dotnet5.4": { },
diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiForgerySampleTestFixture.cs b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiForgerySampleTestFixture.cs
index fbdb3e0ea9..ad4514519e 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiForgerySampleTestFixture.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiForgerySampleTestFixture.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Configuration;
 
-namespace Microsoft.AspNet.Antiforgery.FunctionalTests
+namespace Microsoft.AspNetCore.Antiforgery.FunctionalTests
 {
     public class AntiForgerySampleTestFixture : IDisposable
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiforgerySampleTest.cs b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiforgerySampleTest.cs
index 72926809ad..9fd2a497b9 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiforgerySampleTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/AntiforgerySampleTest.cs
@@ -9,7 +9,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery.FunctionalTests
+namespace Microsoft.AspNetCore.Antiforgery.FunctionalTests
 {
     public class AntiforgerySampleTests : IClassFixture<AntiForgerySampleTestFixture>
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json
index 572352d718..705dc877d8 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Antiforgery.FunctionalTests/project.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "AntiforgerySample": "1.0.0-*",
-    "Microsoft.AspNet.TestHost": "1.0.0-*",
-    "Microsoft.AspNet.Testing": "1.0.0-*"
+    "Microsoft.AspNetCore.TestHost": "1.0.0-*",
+    "Microsoft.AspNetCore.Testing": "1.0.0-*"
   },
   "testRunner": "xunit",
   "commands": {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs
index 5211a6b383..7822afb4d3 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryOptionsSetupTest.cs
@@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class AntiforgeryOptionsSetupTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryTokenTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryTokenTest.cs
index c56055bee7..1980043b8b 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryTokenTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/AntiforgeryTokenTest.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class AntiforgeryTokenTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/BinaryBlobTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/BinaryBlobTest.cs
index c27b12986d..c49a055724 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/BinaryBlobTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/BinaryBlobTest.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class BinaryBlobTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTest.cs
index b5283bef2e..ddb190a256 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTest.cs
@@ -5,15 +5,15 @@ using System;
 using System.IO;
 using System.Security.Claims;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Html;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.WebEncoders.Testing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultAntiforgeryTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenGeneratorTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenGeneratorTest.cs
index 005f00f10c..fbbd6a50e4 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenGeneratorTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenGeneratorTest.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Security.Claims;
 using System.Security.Cryptography;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultAntiforgeryTokenGeneratorProviderTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenSerializerTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenSerializerTest.cs
index a6012bcbe7..519bc85f8b 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenSerializerTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenSerializerTest.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.DataProtection;
+using Microsoft.AspNetCore.DataProtection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultAntiforgeryTokenSerializerTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs
index 61660652ab..de71ea9cf1 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultAntiforgeryTokenStoreTest.cs
@@ -4,15 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.DataProtection;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Primitives;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultAntiforgeryTokenStoreTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultClaimUidExtractorTest.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultClaimUidExtractorTest.cs
index 25704e4b96..1516ed86f5 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultClaimUidExtractorTest.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/DefaultClaimUidExtractorTest.cs
@@ -7,7 +7,7 @@ using System.Security.Claims;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class DefaultClaimUidExtractorTest
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.xproj b/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.xproj
index efe8ba14f1..d97cfa0d9e 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.xproj
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.xproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>415e83f8-6002-47e4-aa8e-cd5169c06f28</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.Antiforgery.Test</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.Antiforgery.Test</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/TestOptionsManager.cs b/test/Microsoft.AspNetCore.Antiforgery.Test/TestOptionsManager.cs
index 0aea27a9d9..7a6b3d7739 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/TestOptionsManager.cs
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/TestOptionsManager.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Antiforgery
+namespace Microsoft.AspNetCore.Antiforgery
 {
     public class TestOptionsManager : IOptions<AntiforgeryOptions>
     {
diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json b/test/Microsoft.AspNetCore.Antiforgery.Test/project.json
index 2669aae1e5..a8e16f08a1 100644
--- a/test/Microsoft.AspNetCore.Antiforgery.Test/project.json
+++ b/test/Microsoft.AspNetCore.Antiforgery.Test/project.json
@@ -4,8 +4,8 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "Microsoft.AspNet.Antiforgery": "1.0.0-*",
-    "Microsoft.AspNet.Http": "1.0.0-*",
+    "Microsoft.AspNetCore.Antiforgery": "1.0.0-*",
+    "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
     "Microsoft.Extensions.WebEncoders": "1.0.0-*",
     "xunit": "2.1.0-*"