diff --git a/BasicMiddleware.sln b/BasicMiddleware.sln
index a3fc740b7b..5dcf6b1d8f 100644
--- a/BasicMiddleware.sln
+++ b/BasicMiddleware.sln
@@ -1,24 +1,24 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.HttpOverrides", "src\Microsoft.AspNet.HttpOverrides\Microsoft.AspNet.HttpOverrides.xproj", "{517308C3-B477-4B01-B461-CAB9C10B6928}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.HttpOverrides", "src\Microsoft.AspNetCore.HttpOverrides\Microsoft.AspNetCore.HttpOverrides.xproj", "{517308C3-B477-4B01-B461-CAB9C10B6928}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5076D28-FA7E-4606-9410-FEDD0D603527}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8437B0F3-3894-4828-A945-A9187F37631D}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.HttpOverrides.Tests", "test\Microsoft.AspNet.HttpOverrides.Tests\Microsoft.AspNet.HttpOverrides.Tests.xproj", "{D6341B92-3416-4F11-8DF4-CB274296175F}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.HttpOverrides.Tests", "test\Microsoft.AspNetCore.HttpOverrides.Tests\Microsoft.AspNetCore.HttpOverrides.Tests.xproj", "{D6341B92-3416-4F11-8DF4-CB274296175F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{99B72A07-32D6-434D-B44D-D064E3C13E08}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Buffering", "src\Microsoft.AspNet.Buffering\Microsoft.AspNet.Buffering.xproj", "{2363D0DD-A3BF-437E-9B64-B33AE132D875}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Buffering", "src\Microsoft.AspNetCore.Buffering\Microsoft.AspNetCore.Buffering.xproj", "{2363D0DD-A3BF-437E-9B64-B33AE132D875}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Buffering.Tests", "test\Microsoft.AspNet.Buffering.Tests\Microsoft.AspNet.Buffering.Tests.xproj", "{F5F1D123-9C81-4A9E-8644-AA46B8E578FB}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Buffering.Tests", "test\Microsoft.AspNetCore.Buffering.Tests\Microsoft.AspNetCore.Buffering.Tests.xproj", "{F5F1D123-9C81-4A9E-8644-AA46B8E578FB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9587FE9F-5A17-42C4-8021-E87F59CECB98}"
 EndProject
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index f9d3834ce9..9cc45712f0 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -9,8 +9,8 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.AspNet.Buffering": { },
-            "Microsoft.AspNet.HttpOverrides": { }
+            "Microsoft.AspNetCore.Buffering": { },
+            "Microsoft.AspNetCore.HttpOverrides": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.
diff --git a/samples/HttpOverridesSample/Startup.cs b/samples/HttpOverridesSample/Startup.cs
index 606fd20163..473a978a55 100644
--- a/samples/HttpOverridesSample/Startup.cs
+++ b/samples/HttpOverridesSample/Startup.cs
@@ -1,7 +1,7 @@
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.HttpOverrides;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.HttpOverrides;
 
 namespace HttpOverridesSample
 {
diff --git a/samples/HttpOverridesSample/hosting.json b/samples/HttpOverridesSample/hosting.json
index f8ef14574d..6a93dbafa8 100644
--- a/samples/HttpOverridesSample/hosting.json
+++ b/samples/HttpOverridesSample/hosting.json
@@ -1,3 +1,3 @@
-{
-  "server": "Microsoft.AspNet.Server.Kestrel"
+{
+  "server": "Microsoft.AspNetCore.Server.Kestrel"
 }
diff --git a/samples/HttpOverridesSample/project.json b/samples/HttpOverridesSample/project.json
index 007668ab4b..c6c5a3bb1d 100644
--- a/samples/HttpOverridesSample/project.json
+++ b/samples/HttpOverridesSample/project.json
@@ -1,12 +1,12 @@
-{
+{
   "version": "1.0.0-*",
   "compilationOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
-    "Microsoft.AspNet.HttpOverrides": "1.0.0-*"
+    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNetCore.HttpOverrides": "1.0.0-*"
   },
   "commands": {
     "web": "HttpOverridesSample"
diff --git a/samples/ResponseBufferingSample/Startup.cs b/samples/ResponseBufferingSample/Startup.cs
index 035c499bc6..5679fe7566 100644
--- a/samples/ResponseBufferingSample/Startup.cs
+++ b/samples/ResponseBufferingSample/Startup.cs
@@ -1,6 +1,6 @@
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ResponseBufferingSample
diff --git a/samples/ResponseBufferingSample/hosting.json b/samples/ResponseBufferingSample/hosting.json
index f8ef14574d..6a93dbafa8 100644
--- a/samples/ResponseBufferingSample/hosting.json
+++ b/samples/ResponseBufferingSample/hosting.json
@@ -1,3 +1,3 @@
-{
-  "server": "Microsoft.AspNet.Server.Kestrel"
+{
+  "server": "Microsoft.AspNetCore.Server.Kestrel"
 }
diff --git a/samples/ResponseBufferingSample/project.json b/samples/ResponseBufferingSample/project.json
index 8e84112993..97d7c2dc97 100644
--- a/samples/ResponseBufferingSample/project.json
+++ b/samples/ResponseBufferingSample/project.json
@@ -1,9 +1,9 @@
-{
+{
   "version": "1.0.0-*",
   "dependencies": {
-    "Microsoft.AspNet.Buffering": "1.0.0-*",
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
+    "Microsoft.AspNetCore.Buffering": "1.0.0-*",
+    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "compilationOptions": {
     "emitEntryPoint": true
diff --git a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
index c848b61767..999e05088e 100644
--- a/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
+++ b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.Buffering
+namespace Microsoft.AspNetCore.Buffering
 {
     internal class BufferingWriteStream : Stream
     {
diff --git a/src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.cs b/src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.cs
index 785f73e4e5..746712f5c8 100644
--- a/src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.cs
+++ b/src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.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.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.Buffering
+namespace Microsoft.AspNetCore.Buffering
 {
     internal class HttpBufferingFeature : IHttpBufferingFeature
     {
diff --git a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.xproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.xproj
index bc40210bfc..b74126ea03 100644
--- a/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.xproj
+++ b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.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>2363d0dd-a3bf-437e-9b64-b33ae132d875</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.Buffering</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.Buffering</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.cs b/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.cs
index 21e56a0ee2..bd5b8e1515 100644
--- a/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.cs
+++ b/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.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.Threading.Tasks;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.Buffering
+namespace Microsoft.AspNetCore.Buffering
 {
     public class ResponseBufferingMiddleware
     {
diff --git a/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.cs
index 77a37d1658..5092dba3c4 100644
--- a/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.cs
+++ b/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.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.Buffering;
+using Microsoft.AspNetCore.Buffering;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     public static class ResponseBufferingMiddlewareExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.cs b/src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.cs
index e3daff187f..346173e315 100644
--- a/src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.cs
+++ b/src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.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.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.Buffering
+namespace Microsoft.AspNetCore.Buffering
 {
     internal class SendFileFeatureWrapper : IHttpSendFileFeature
     {
diff --git a/src/Microsoft.AspNetCore.Buffering/project.json b/src/Microsoft.AspNetCore.Buffering/project.json
index 7d1964e378..ef4628c8c5 100644
--- a/src/Microsoft.AspNetCore.Buffering/project.json
+++ b/src/Microsoft.AspNetCore.Buffering/project.json
@@ -10,7 +10,7 @@
     "url": "git://github.com/aspnet/basicmiddleware"
   },
   "dependencies": {
-    "Microsoft.AspNet.Http.Abstractions": "1.0.0-*"
+    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*"
   },
   "frameworks": {
     "net451": { },
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeaders.cs b/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeaders.cs
index 5b5916212e..f161c3aee7 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeaders.cs
+++ b/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeaders.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.HttpOverrides
+namespace Microsoft.AspNetCore.HttpOverrides
 {
     [Flags]
     public enum ForwardedHeaders
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideExtensions.cs b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideExtensions.cs
index be2502dde1..7ad3ecf31a 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideExtensions.cs
+++ b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideExtensions.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 Microsoft.AspNet.HttpOverrides;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     public static class HttpMethodOverrideExtensions
     {
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideMiddleware.cs b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideMiddleware.cs
index 804e44d5f7..60965e50b1 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideMiddleware.cs
+++ b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideMiddleware.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.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.HttpOverrides
+namespace Microsoft.AspNetCore.HttpOverrides
 {
     public class HttpMethodOverrideMiddleware
     {
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideOptions.cs b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideOptions.cs
index e6ade4a274..8bfb82790f 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideOptions.cs
+++ b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideOptions.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.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     public class HttpMethodOverrideOptions
     {
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/IPEndPointParser.cs b/src/Microsoft.AspNetCore.HttpOverrides/IPEndPointParser.cs
index b303c0d2c6..9bdd0a66cf 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/IPEndPointParser.cs
+++ b/src/Microsoft.AspNetCore.HttpOverrides/IPEndPointParser.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.Net;
 
-namespace Microsoft.AspNet.HttpOverrides
+namespace Microsoft.AspNetCore.HttpOverrides
 {
     public static class IPEndPointParser
     {
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderExtensions.cs b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderExtensions.cs
index e22e4af34d..8925c4bb68 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderExtensions.cs
+++ b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderExtensions.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 Microsoft.AspNet.HttpOverrides;
+using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     public static class OverrideHeaderExtensions
     {
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderMiddleware.cs b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderMiddleware.cs
index 9eb8564c11..e23a883031 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderMiddleware.cs
+++ b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderMiddleware.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.HttpOverrides
+namespace Microsoft.AspNetCore.HttpOverrides
 {
     public class OverrideHeaderMiddleware
     {
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderOptions.cs b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderOptions.cs
index eb63f71b58..011c564813 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderOptions.cs
+++ b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderOptions.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.HttpOverrides;
+using Microsoft.AspNetCore.HttpOverrides;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     public class OverrideHeaderOptions
     {
diff --git a/src/Microsoft.AspNetCore.HttpOverrides/project.json b/src/Microsoft.AspNetCore.HttpOverrides/project.json
index 01612e537c..ec8f9fd667 100644
--- a/src/Microsoft.AspNetCore.HttpOverrides/project.json
+++ b/src/Microsoft.AspNetCore.HttpOverrides/project.json
@@ -10,7 +10,7 @@
     "url": "git://github.com/aspnet/basicmiddleware"
   },
   "dependencies": {
-    "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
     "Microsoft.Extensions.Options": "1.0.0-*"
   },
   "frameworks": {
diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.xproj b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.xproj
index a047e54513..322999a908 100644
--- a/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.xproj
+++ b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.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>f5f1d123-9c81-4a9e-8644-aa46b8e578fb</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.Buffering.Tests</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.Buffering.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.cs b/test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
index e2cc8da5e5..81aa993e98 100644
--- a/test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.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;
@@ -6,14 +6,14 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.TestHost;
 using Xunit;
 
-namespace Microsoft.AspNet.Buffering.Tests
+namespace Microsoft.AspNetCore.Buffering.Tests
 {
     public class ResponseBufferingMiddlewareTests
     {
diff --git a/test/Microsoft.AspNetCore.Buffering.Tests/project.json b/test/Microsoft.AspNetCore.Buffering.Tests/project.json
index 560600e505..1d139baac7 100644
--- a/test/Microsoft.AspNetCore.Buffering.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Buffering.Tests/project.json
@@ -1,11 +1,11 @@
-{
+{
   "version": "1.0.0-*",
   "compilationOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
-    "Microsoft.AspNet.Buffering": "1.0.0-*",
-    "Microsoft.AspNet.TestHost": "1.0.0-*",
+    "Microsoft.AspNetCore.Buffering": "1.0.0-*",
+    "Microsoft.AspNetCore.TestHost": "1.0.0-*",
     "xunit": "2.1.0"
   },
   "frameworks": {
diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs b/test/Microsoft.AspNetCore.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
index 5c4108ddfc..fcd47da8ba 100644
--- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
@@ -1,15 +1,15 @@
-// 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.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
 using Xunit;
 
-namespace Microsoft.AspNet.HttpOverrides
+namespace Microsoft.AspNetCore.HttpOverrides
 {
     public class HttpMethodOverrideMiddlewareTest
     {
diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs b/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs
index 9970dd8610..0ba8e134ee 100644
--- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs
+++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.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.Net;
 using Xunit;
 
-namespace Microsoft.AspNet.HttpOverrides
+namespace Microsoft.AspNetCore.HttpOverrides
 {
     public class IPEndPointParserTests
     {
diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs b/test/Microsoft.AspNetCore.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs
index 1dd86d3bcd..b66e57e2cd 100644
--- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs
+++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.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.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
 using Xunit;
 
-namespace Microsoft.AspNet.HttpOverrides
+namespace Microsoft.AspNetCore.HttpOverrides
 {
     public class OverrideMiddlewareHeaderTests
     {
diff --git a/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json b/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json
index 8502eb3c9b..f58a6f2b3b 100644
--- a/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json
+++ b/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json
@@ -4,8 +4,8 @@
     "warningsAsErrors": true
   },
   "dependencies": {
-    "Microsoft.AspNet.HttpOverrides": "1.0.0-*",
-    "Microsoft.AspNet.TestHost": "1.0.0-*",
+    "Microsoft.AspNetCore.HttpOverrides": "1.0.0-*",
+    "Microsoft.AspNetCore.TestHost": "1.0.0-*",
     "Microsoft.Extensions.Logging.Testing": "1.0.0-*",
     "xunit": "2.1.0"
   },