diff --git a/CORS.sln b/CORS.sln
index a0d8647301..9f3b2ba560 100644
--- a/CORS.sln
+++ b/CORS.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
@@ -12,9 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F32074C7-087C-46CC-A913-422BFD2D6E0A}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Cors", "src\Microsoft.AspNet.Cors\Microsoft.AspNet.Cors.xproj", "{41349FCD-D1C4-47A6-82D0-D16D00A8D59D}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Cors", "src\Microsoft.AspNetCore.Cors\Microsoft.AspNetCore.Cors.xproj", "{41349FCD-D1C4-47A6-82D0-D16D00A8D59D}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Cors.Test", "test\Microsoft.AspNet.Cors.Test\Microsoft.AspNet.Cors.Test.xproj", "{F05BE96F-F869-4408-A480-96935B4835EE}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Cors.Test", "test\Microsoft.AspNetCore.Cors.Test\Microsoft.AspNetCore.Cors.Test.xproj", "{F05BE96F-F869-4408-A480-96935B4835EE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{538380BF-0D4C-4E30-8F41-E75C4B1C01FA}"
 EndProject
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 86ea14ef19..cd22de67e9 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -9,7 +9,7 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.AspNet.Cors": { }
+            "Microsoft.AspNetCore.Cors": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsConstants.cs b/src/Microsoft.AspNetCore.Cors/CorsConstants.cs
index b777a80e6a..602f381ae5 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsConstants.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsConstants.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.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// CORS-related constants.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsMiddleware.cs b/src/Microsoft.AspNetCore.Cors/CorsMiddleware.cs
index f8d3042277..cae0bbab1c 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsMiddleware.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsMiddleware.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// An ASP.NET middleware for handling CORS.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.Cors/CorsMiddlewareExtensions.cs
index d3acfa0065..aae7ca4602 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsMiddlewareExtensions.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsMiddlewareExtensions.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.Cors.Infrastructure;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// The <see cref="IApplicationBuilder"/> extensions for adding CORS middleware support.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsOptions.cs b/src/Microsoft.AspNetCore.Cors/CorsOptions.cs
index bab1c2e68d..10b046000d 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsOptions.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsOptions.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// Provides programmatic configuration for Cors.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsPolicy.cs b/src/Microsoft.AspNetCore.Cors/CorsPolicy.cs
index 3be8589b5b..b1fc25a939 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsPolicy.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsPolicy.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// Defines the policy for Cross-Origin requests based on the CORS specifications.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsPolicyBuilder.cs b/src/Microsoft.AspNetCore.Cors/CorsPolicyBuilder.cs
index d018b92a68..ed20996e5e 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsPolicyBuilder.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsPolicyBuilder.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Linq;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// Exposes methods to build a policy.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsResult.cs b/src/Microsoft.AspNetCore.Cors/CorsResult.cs
index bb5e458dd3..99d38b9fd1 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsResult.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsResult.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// Results returned by <see cref="ICorsService"/>.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsService.cs b/src/Microsoft.AspNetCore.Cors/CorsService.cs
index 5ec194e575..7e45c6b7ce 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsService.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsService.cs
@@ -5,11 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// Default implementation of <see cref="ICorsService"/>.
diff --git a/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs
index 3a683d03d2..6bb7c79d85 100644
--- a/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNetCore.Cors/CorsServiceCollectionExtensions.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.Cors.Infrastructure;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.Extensions.DependencyInjection
diff --git a/src/Microsoft.AspNetCore.Cors/DefaultCorsPolicyProvider.cs b/src/Microsoft.AspNetCore.Cors/DefaultCorsPolicyProvider.cs
index b0887a9315..4841d60f75 100644
--- a/src/Microsoft.AspNetCore.Cors/DefaultCorsPolicyProvider.cs
+++ b/src/Microsoft.AspNetCore.Cors/DefaultCorsPolicyProvider.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <inheritdoc />
     public class DefaultCorsPolicyProvider : ICorsPolicyProvider
diff --git a/src/Microsoft.AspNetCore.Cors/DisableCorsAttribute.cs b/src/Microsoft.AspNetCore.Cors/DisableCorsAttribute.cs
index 5727b98d52..ab4c755066 100644
--- a/src/Microsoft.AspNetCore.Cors/DisableCorsAttribute.cs
+++ b/src/Microsoft.AspNetCore.Cors/DisableCorsAttribute.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.Cors.Infrastructure;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 
-namespace Microsoft.AspNet.Cors
+namespace Microsoft.AspNetCore.Cors
 {
     /// <inheritdoc />
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
diff --git a/src/Microsoft.AspNetCore.Cors/EnableCorsAttribute.cs b/src/Microsoft.AspNetCore.Cors/EnableCorsAttribute.cs
index 23b2b5443f..34bd269d96 100644
--- a/src/Microsoft.AspNetCore.Cors/EnableCorsAttribute.cs
+++ b/src/Microsoft.AspNetCore.Cors/EnableCorsAttribute.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.Cors.Infrastructure;
+using Microsoft.AspNetCore.Cors.Infrastructure;
 
-namespace Microsoft.AspNet.Cors
+namespace Microsoft.AspNetCore.Cors
 {
     /// <inheritdoc />
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
diff --git a/src/Microsoft.AspNetCore.Cors/ICorsPolicyProvider.cs b/src/Microsoft.AspNetCore.Cors/ICorsPolicyProvider.cs
index a69df524e9..7785e3de9c 100644
--- a/src/Microsoft.AspNetCore.Cors/ICorsPolicyProvider.cs
+++ b/src/Microsoft.AspNetCore.Cors/ICorsPolicyProvider.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.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// A type which can provide a <see cref="CorsPolicy"/> for a particular <see cref="HttpContext"/>.
diff --git a/src/Microsoft.AspNetCore.Cors/ICorsService.cs b/src/Microsoft.AspNetCore.Cors/ICorsService.cs
index faabc5867c..ab8176a961 100644
--- a/src/Microsoft.AspNetCore.Cors/ICorsService.cs
+++ b/src/Microsoft.AspNetCore.Cors/ICorsService.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.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// A type which can evaluate a policy for a particular <see cref="HttpContext"/>.
diff --git a/src/Microsoft.AspNetCore.Cors/IDisableCorsAttribute.cs b/src/Microsoft.AspNetCore.Cors/IDisableCorsAttribute.cs
index 63e2e5c5a9..1e69ba3da3 100644
--- a/src/Microsoft.AspNetCore.Cors/IDisableCorsAttribute.cs
+++ b/src/Microsoft.AspNetCore.Cors/IDisableCorsAttribute.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.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// An interface which can be used to identify a type which provides metdata to disable cors for a resource.
diff --git a/src/Microsoft.AspNetCore.Cors/IEnableCorsAttribute.cs b/src/Microsoft.AspNetCore.Cors/IEnableCorsAttribute.cs
index 724f3a0e0f..c58e2a1d96 100644
--- a/src/Microsoft.AspNetCore.Cors/IEnableCorsAttribute.cs
+++ b/src/Microsoft.AspNetCore.Cors/IEnableCorsAttribute.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.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     /// <summary>
     /// An interface which can be used to identify a type which provides metadata needed for enabling CORS support.
diff --git a/src/Microsoft.AspNetCore.Cors/Resources.Designer.cs b/src/Microsoft.AspNetCore.Cors/Resources.Designer.cs
index 72b39342e9..0bc258074c 100644
--- a/src/Microsoft.AspNetCore.Cors/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.Cors/Resources.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.AspNet.Cors {
+namespace Microsoft.AspNetCore.Cors {
     using System;
     using System.Reflection;
     
@@ -38,7 +38,7 @@ namespace Microsoft.AspNet.Cors {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNet.Cors.Resources", typeof(Resources).GetTypeInfo().Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.AspNetCore.Cors.Resources", typeof(Resources).GetTypeInfo().Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/src/Microsoft.AspNetCore.Cors/project.json b/src/Microsoft.AspNetCore.Cors/project.json
index 17732ed627..7127952712 100644
--- a/src/Microsoft.AspNetCore.Cors/project.json
+++ b/src/Microsoft.AspNetCore.Cors/project.json
@@ -9,7 +9,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.Options": "1.0.0-*"
diff --git a/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareFunctionalTest.cs b/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareFunctionalTest.cs
index 6be83fed21..008a4926d9 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareFunctionalTest.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareFunctionalTest.cs
@@ -7,7 +7,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class CorsMiddlewareFunctionalTests : IClassFixture<CorsTestFixture<CorsMiddlewareWebSite.Startup>>
     {
diff --git a/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareTests.cs b/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareTests.cs
index 0e8e718232..93e5ace09b 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/CorsMiddlewareTests.cs
@@ -4,16 +4,16 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Internal;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class CorsMiddlewareTests
     {
diff --git a/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyBuilderTests.cs b/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyBuilderTests.cs
index 5f9f6fe737..0ee3b7e524 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyBuilderTests.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class CorsPolicyBuilderTests
     {
diff --git a/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyTests.cs b/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyTests.cs
index a4b1d772a3..4264164ed0 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyTests.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/CorsPolicyTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class CorsPolicyTest
     {
diff --git a/test/Microsoft.AspNetCore.Cors.Test/CorsResultTests.cs b/test/Microsoft.AspNetCore.Cors.Test/CorsResultTests.cs
index 949c10854a..bc6e4a2d3a 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/CorsResultTests.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/CorsResultTests.cs
@@ -4,7 +4,7 @@
 using System;
 using Xunit;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class CorsResultTest
     {
diff --git a/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs b/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs
index 1efc473407..a14c1548a7 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/CorsServiceTests.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.Http;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class CorsServiceTests
     {
diff --git a/test/Microsoft.AspNetCore.Cors.Test/CorsTestFixtureOfT.cs b/test/Microsoft.AspNetCore.Cors.Test/CorsTestFixtureOfT.cs
index f3c11d50b0..aa698c62f2 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/CorsTestFixtureOfT.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/CorsTestFixtureOfT.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 System;
 using System.Net.Http;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class CorsTestFixture<TStartup> : IDisposable
         where TStartup : class
diff --git a/test/Microsoft.AspNetCore.Cors.Test/DefaultCorsPolicyProviderTests.cs b/test/Microsoft.AspNetCore.Cors.Test/DefaultCorsPolicyProviderTests.cs
index 83a08bec24..1fc86b6d06 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/DefaultCorsPolicyProviderTests.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/DefaultCorsPolicyProviderTests.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.Http.Internal;
+using Microsoft.AspNetCore.Http.Internal;
 using Xunit;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class DefaultPolicyProviderTests
     {
diff --git a/test/Microsoft.AspNetCore.Cors.Test/TestCorsOptions.cs b/test/Microsoft.AspNetCore.Cors.Test/TestCorsOptions.cs
index e7630f9a8f..782ebb2db7 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/TestCorsOptions.cs
+++ b/test/Microsoft.AspNetCore.Cors.Test/TestCorsOptions.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Cors.Infrastructure
+namespace Microsoft.AspNetCore.Cors.Infrastructure
 {
     public class TestCorsOptions : IOptions<CorsOptions>
     {
diff --git a/test/Microsoft.AspNetCore.Cors.Test/project.json b/test/Microsoft.AspNetCore.Cors.Test/project.json
index 54ce584dfc..9247927800 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/project.json
+++ b/test/Microsoft.AspNetCore.Cors.Test/project.json
@@ -2,8 +2,8 @@
   "version": "1.0.0-*",
   "dependencies": {
     "CorsMiddlewareWebSite": "1.0.0-*",
-    "Microsoft.AspNet.Cors": "6.0.0-*",
-    "Microsoft.AspNet.TestHost": "1.0.0-*",
+    "Microsoft.AspNetCore.Cors": "6.0.0-*",
+    "Microsoft.AspNetCore.TestHost": "1.0.0-*",
     "Microsoft.Extensions.Logging.Testing": "1.0.0-*",
     "xunit": "2.1.0"
   },
diff --git a/test/WebSites/CorsMiddlewareWebSite/EchoMiddleware.cs b/test/WebSites/CorsMiddlewareWebSite/EchoMiddleware.cs
index fbc07dacde..9036b33bf6 100644
--- a/test/WebSites/CorsMiddlewareWebSite/EchoMiddleware.cs
+++ b/test/WebSites/CorsMiddlewareWebSite/EchoMiddleware.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.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 
 namespace CorsMiddlewareWebSite
 {
diff --git a/test/WebSites/CorsMiddlewareWebSite/Startup.cs b/test/WebSites/CorsMiddlewareWebSite/Startup.cs
index 436b8cd788..984809db08 100644
--- a/test/WebSites/CorsMiddlewareWebSite/Startup.cs
+++ b/test/WebSites/CorsMiddlewareWebSite/Startup.cs
@@ -1,8 +1,8 @@
 // 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.Builder;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace CorsMiddlewareWebSite
diff --git a/test/WebSites/CorsMiddlewareWebSite/hosting.json b/test/WebSites/CorsMiddlewareWebSite/hosting.json
index f8ef14574d..6a93dbafa8 100644
--- a/test/WebSites/CorsMiddlewareWebSite/hosting.json
+++ b/test/WebSites/CorsMiddlewareWebSite/hosting.json
@@ -1,3 +1,3 @@
-{
-  "server": "Microsoft.AspNet.Server.Kestrel"
+{
+  "server": "Microsoft.AspNetCore.Server.Kestrel"
 }
diff --git a/test/WebSites/CorsMiddlewareWebSite/project.json b/test/WebSites/CorsMiddlewareWebSite/project.json
index 2214e8fa01..c83f576ed2 100644
--- a/test/WebSites/CorsMiddlewareWebSite/project.json
+++ b/test/WebSites/CorsMiddlewareWebSite/project.json
@@ -1,4 +1,4 @@
-{
+{
   "compilationOptions": {
     "emitEntryPoint": true
   },
@@ -6,9 +6,9 @@
     "web": "CorsMiddlewareWebSite"
   },
   "dependencies": {
-    "Microsoft.AspNet.Cors": "6.0.0-*",
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
+    "Microsoft.AspNetCore.Cors": "6.0.0-*",
+    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": { },