diff --git a/Hosting.sln b/Hosting.sln
index ea81db18f9..a4330f5c38 100644
--- a/Hosting.sln
+++ b/Hosting.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.24720.0
@@ -7,30 +7,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E0497F39-AFF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FEB39027-9158-4DE2-997F-7ADAEF8188D0}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.TestHost.Tests", "test\Microsoft.AspNet.TestHost.Tests\Microsoft.AspNet.TestHost.Tests.xproj", "{0ACB2719-9484-49B5-B8E3-117091192511}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.TestHost.Tests", "test\Microsoft.AspNetCore.TestHost.Tests\Microsoft.AspNetCore.TestHost.Tests.xproj", "{0ACB2719-9484-49B5-B8E3-117091192511}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.TestHost", "src\Microsoft.AspNet.TestHost\Microsoft.AspNet.TestHost.xproj", "{1A415A3F-1081-45DB-809B-EE19CEA02DC0}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.TestHost", "src\Microsoft.AspNetCore.TestHost\Microsoft.AspNetCore.TestHost.xproj", "{1A415A3F-1081-45DB-809B-EE19CEA02DC0}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting", "src\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.xproj", "{3944F036-7E75-47E8-AA52-C4B89A64EC3A}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting", "src\Microsoft.AspNetCore.Hosting\Microsoft.AspNetCore.Hosting.xproj", "{3944F036-7E75-47E8-AA52-C4B89A64EC3A}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.Tests", "test\Microsoft.AspNet.Hosting.Tests\Microsoft.AspNet.Hosting.Tests.xproj", "{D4F18D58-52B1-435D-A012-10F2CDF158C4}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.Tests", "test\Microsoft.AspNetCore.Hosting.Tests\Microsoft.AspNetCore.Hosting.Tests.xproj", "{D4F18D58-52B1-435D-A012-10F2CDF158C4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A66E3673-3976-4152-B902-2D0EC1428EA2}"
 	ProjectSection(SolutionItems) = preProject
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.Abstractions", "src\Microsoft.AspNet.Hosting.Abstractions\Microsoft.AspNet.Hosting.Abstractions.xproj", "{BB780FBB-7842-4759-8DE7-96FA2E5571C1}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.Abstractions", "src\Microsoft.AspNetCore.Hosting.Abstractions\Microsoft.AspNetCore.Hosting.Abstractions.xproj", "{BB780FBB-7842-4759-8DE7-96FA2E5571C1}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.Server.Abstractions", "src\Microsoft.AspNet.Hosting.Server.Abstractions\Microsoft.AspNet.Hosting.Server.Abstractions.xproj", "{FDBBA081-5248-4FC0-9E08-B46BEF3FA438}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "src\Microsoft.AspNetCore.Hosting.Server.Abstractions\Microsoft.AspNetCore.Hosting.Server.Abstractions.xproj", "{FDBBA081-5248-4FC0-9E08-B46BEF3FA438}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Testing", "src\Microsoft.AspNet.Server.Testing\Microsoft.AspNet.Server.Testing.xproj", "{3DA89347-6731-4366-80C4-548F24E8607B}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.Testing", "src\Microsoft.AspNetCore.Server.Testing\Microsoft.AspNetCore.Server.Testing.xproj", "{3DA89347-6731-4366-80C4-548F24E8607B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9C7520A0-F2EB-411C-8BB2-80B39C937217}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleStartups", "samples\SampleStartups\SampleStartups.xproj", "{485B6745-7648-400A-A969-F68FCF194E46}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.WindowsServices", "src\Microsoft.AspNet.Hosting.WindowsServices\Microsoft.AspNet.Hosting.WindowsServices.xproj", "{03148731-EA95-40A2-BAE8-A12315EA1748}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.WindowsServices", "src\Microsoft.AspNetCore.Hosting.WindowsServices\Microsoft.AspNetCore.Hosting.WindowsServices.xproj", "{03148731-EA95-40A2-BAE8-A12315EA1748}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index c599e23fea..a41c932dae 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -9,11 +9,11 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.AspNet.Hosting": { },
-            "Microsoft.AspNet.Hosting.Abstractions": { },
-            "Microsoft.AspNet.Hosting.Server.Abstractions": { },
-            "Microsoft.AspNet.Server.Testing": { },
-            "Microsoft.AspNet.TestHost": { }
+            "Microsoft.AspNetCore.Hosting": { },
+            "Microsoft.AspNetCore.Hosting.Abstractions": { },
+            "Microsoft.AspNetCore.Hosting.Server.Abstractions": { },
+            "Microsoft.AspNetCore.Server.Testing": { },
+            "Microsoft.AspNetCore.TestHost": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.
diff --git a/samples/SampleStartups/StartupBlockingOnStart.cs b/samples/SampleStartups/StartupBlockingOnStart.cs
index 40d914f379..2f7b3bc6ee 100644
--- a/samples/SampleStartups/StartupBlockingOnStart.cs
+++ b/samples/SampleStartups/StartupBlockingOnStart.cs
@@ -1,7 +1,7 @@
-using System;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
+using System;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 
 // Note that this sample will not run. It is only here to illustrate usage patterns.
diff --git a/samples/SampleStartups/StartupConfigureAddresses.cs b/samples/SampleStartups/StartupConfigureAddresses.cs
index 31a9a38a43..418e611691 100644
--- a/samples/SampleStartups/StartupConfigureAddresses.cs
+++ b/samples/SampleStartups/StartupConfigureAddresses.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;
 
 // Note that this sample will not run. It is only here to illustrate usage patterns.
diff --git a/samples/SampleStartups/StartupExternallyControlled.cs b/samples/SampleStartups/StartupExternallyControlled.cs
index b024ede322..e0301d865c 100644
--- a/samples/SampleStartups/StartupExternallyControlled.cs
+++ b/samples/SampleStartups/StartupExternallyControlled.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
-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;
 
 // Note that this sample will not run. It is only here to illustrate usage patterns.
diff --git a/samples/SampleStartups/StartupFullControl.cs b/samples/SampleStartups/StartupFullControl.cs
index 6445a77bc4..838aa74ce7 100644
--- a/samples/SampleStartups/StartupFullControl.cs
+++ b/samples/SampleStartups/StartupFullControl.cs
@@ -1,7 +1,7 @@
-using System;
+using System;
 using System.IO;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
@@ -14,7 +14,7 @@ namespace SampleStartups
         public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
-                .UseServer("Microsoft.AspNet.Server.Kestrel") // Set the server manually
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel") // Set the server manually
                 .UseApplicationBasePath(Directory.GetCurrentDirectory()) // Override the application base with the current directory
                 .UseUrls("http://*:1000", "https://*:902")
                 .UseEnvironment("Development")
diff --git a/samples/SampleStartups/StartupHelloWorld.cs b/samples/SampleStartups/StartupHelloWorld.cs
index 7a76ca4563..0c9d56632b 100644
--- a/samples/SampleStartups/StartupHelloWorld.cs
+++ b/samples/SampleStartups/StartupHelloWorld.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;
 
 // Note that this sample will not run. It is only here to illustrate usage patterns.
diff --git a/samples/SampleStartups/project.json b/samples/SampleStartups/project.json
index 4fb88a1477..f26e655e65 100644
--- a/samples/SampleStartups/project.json
+++ b/samples/SampleStartups/project.json
@@ -1,7 +1,7 @@
-{
+{
   "version": "1.0.0-*",
   "dependencies": {
-    "Microsoft.AspNet.Hosting": "1.0.0-*"
+    "Microsoft.AspNetCore.Hosting": "1.0.0-*"
   },
   "frameworks": {
     "dnx451": { },
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/EnvironmentName.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/EnvironmentName.cs
index 6ab7b945c1..d5522d1124 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/EnvironmentName.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/EnvironmentName.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.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     /// <summary>
     /// Commonly used environment names.
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/HostingEnvironmentExtensions.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/HostingEnvironmentExtensions.cs
index 05cf2c9ceb..742001c2c9 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/HostingEnvironmentExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/HostingEnvironmentExtensions.cs
@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     /// <summary>
     /// Extension methods for <see cref="IHostingEnvironment"/>.
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/IApplicationLifetime.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IApplicationLifetime.cs
index 3dd7bcf8aa..c3e4336521 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/IApplicationLifetime.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/IApplicationLifetime.cs
@@ -3,7 +3,7 @@
 
 using System.Threading;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     /// <summary>
     /// Allows consumers to perform cleanup during a graceful shutdown.
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/IHostingEnvironment.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IHostingEnvironment.cs
index 5878bd489c..ba1ef3db98 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/IHostingEnvironment.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/IHostingEnvironment.cs
@@ -4,7 +4,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     /// <summary>
     /// Provides information about the web hosting environment an application is running in.
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/IStartupFilter.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IStartupFilter.cs
index f89fba525c..2f0a3cf39d 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/IStartupFilter.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/IStartupFilter.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.Builder;
+using Microsoft.AspNetCore.Builder;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     public interface IStartupFilter
     {
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHost.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHost.cs
index 45522b6b4c..dbf80ea53a 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHost.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHost.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 Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     /// <summary>
     /// Represents a configured web host
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs
index 60017adb17..35f9950567 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.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.Collections.Generic;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting.Server;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     /// <summary>
     /// A builder for <see cref="IWebHost"/>
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/WebHostDefaults.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/WebHostDefaults.cs
index c87cff6476..9a4cfca8ce 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/WebHostDefaults.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/WebHostDefaults.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.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     public static class WebHostDefaults
     {
diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
index e23808c2f1..b777403585 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
@@ -10,8 +10,8 @@
     "url": "git://github.com/aspnet/hosting"
   },
   "dependencies": {
-    "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
-    "Microsoft.AspNet.Hosting.Server.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Hosting.Server.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.FileProviders.Abstractions": "1.0.0-*"
diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IHttpApplication.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IHttpApplication.cs
index 07cbe53f82..e35d4b6d56 100644
--- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IHttpApplication.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IHttpApplication.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.Threading.Tasks;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.Hosting.Server
+namespace Microsoft.AspNetCore.Hosting.Server
 {
     /// <summary>
     /// Represents an HttpApplication.
diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServer.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServer.cs
index cc1a88d519..529ca34427 100644
--- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServer.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServer.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 Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.Hosting.Server
+namespace Microsoft.AspNetCore.Hosting.Server
 {
     /// <summary>
     /// Represents a server.
diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerAddressesFeature.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerAddressesFeature.cs
index 1afbfe7c92..5a464cb75c 100644
--- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerAddressesFeature.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerAddressesFeature.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.Collections.Generic;
 
-namespace Microsoft.AspNet.Server.Features
+namespace Microsoft.AspNetCore.Server.Features
 {
     public interface IServerAddressesFeature
     {
diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerFactory.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerFactory.cs
index 163d39f1c0..1f28b5bacf 100644
--- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerFactory.cs
+++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerFactory.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Configuration;
 
-namespace Microsoft.AspNet.Hosting.Server
+namespace Microsoft.AspNetCore.Hosting.Server
 {
     /// <summary>
     /// Represents a factory for creating servers.
diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
index 8e443d8c77..b329bc3cd5 100644
--- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
@@ -10,7 +10,7 @@
     "url": "git://github.com/aspnet/hosting"
   },
   "dependencies": {
-    "Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*"
   },
   "frameworks": {
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.xproj b/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.xproj
index 8131586c81..ef34852e4d 100644
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.xproj
+++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.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>03148731-ea95-40a2-bae8-a12315ea1748</ProjectGuid>
-    <RootNamespace>Microsoft.AspNet.Hosting.WindowsServices</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.Hosting.WindowsServices</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs
index 590f54cc63..5e15137ebf 100644
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs
+++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.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.ServiceProcess;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.WindowsServices
+namespace Microsoft.AspNetCore.Hosting.WindowsServices
 {
     /// <summary>
     ///     Provides an implementation of a Windows service that hosts ASP.NET.
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs
index 4034c5976f..a54cc59961 100644
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.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.ServiceProcess;
 
-namespace Microsoft.AspNet.Hosting.WindowsServices
+namespace Microsoft.AspNetCore.Hosting.WindowsServices
 {
     /// <summary>
     ///     Extensions to <see cref="IWebHost" for hosting inside a Windows service. />
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json b/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
index 91b2eb21c2..0c21602221 100644
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
@@ -1,4 +1,4 @@
-{
+{
     "version": "1.0.0-*",
     "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications running within a Windows service.",
     "repository": {
@@ -10,7 +10,7 @@
         "keyFile": "../../tools/Key.snk"
     },
     "dependencies": {
-        "Microsoft.AspNet.Hosting": "1.0.0-*"
+        "Microsoft.AspNetCore.Hosting": "1.0.0-*"
     },
     "frameworks": {
         "net451": {
diff --git a/src/Microsoft.AspNetCore.Hosting/Builder/ApplicationBuilderFactory.cs b/src/Microsoft.AspNetCore.Hosting/Builder/ApplicationBuilderFactory.cs
index eaf8d178d4..e188c0b7fd 100644
--- a/src/Microsoft.AspNetCore.Hosting/Builder/ApplicationBuilderFactory.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Builder/ApplicationBuilderFactory.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.Builder;
-using Microsoft.AspNet.Builder.Internal;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder.Internal;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.Hosting.Builder
+namespace Microsoft.AspNetCore.Hosting.Builder
 {
     public class ApplicationBuilderFactory : IApplicationBuilderFactory
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Builder/IApplicationBuilderFactory.cs b/src/Microsoft.AspNetCore.Hosting/Builder/IApplicationBuilderFactory.cs
index 00e64a0a2c..d44398fb69 100644
--- a/src/Microsoft.AspNetCore.Hosting/Builder/IApplicationBuilderFactory.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Builder/IApplicationBuilderFactory.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.Builder;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNet.Hosting.Builder
+namespace Microsoft.AspNetCore.Hosting.Builder
 {
     public interface IApplicationBuilderFactory
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/ApplicationLifetime.cs b/src/Microsoft.AspNetCore.Hosting/Internal/ApplicationLifetime.cs
index 8955cf8d1e..5f3e7cc960 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/ApplicationLifetime.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/ApplicationLifetime.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     /// <summary>
     /// Allows consumers to perform cleanup during a graceful shutdown.
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/AutoRequestServicesStartupFilter.cs b/src/Microsoft.AspNetCore.Hosting/Internal/AutoRequestServicesStartupFilter.cs
index 2ae344670e..daca6b2674 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/AutoRequestServicesStartupFilter.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/AutoRequestServicesStartupFilter.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.Builder;
-using Microsoft.AspNet.Hosting.Startup;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting.Startup;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     public class AutoRequestServicesStartupFilter : IStartupFilter
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/HostingApplication.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingApplication.cs
index 7b77757e7f..c70c319b4c 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/HostingApplication.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/HostingApplication.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;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     public class HostingApplication : IHttpApplication<HostingApplication.Context>
     {
@@ -33,14 +33,14 @@ namespace Microsoft.AspNet.Hosting.Internal
         public Context CreateContext(IFeatureCollection contextFeatures)
         {
             var httpContext = _httpContextFactory.Create(contextFeatures);
-            var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNet.Hosting.BeginRequest");
+            var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNetCore.Hosting.BeginRequest");
             var startTimestamp = (diagnoticsEnabled || _logger.IsEnabled(LogLevel.Information)) ? Stopwatch.GetTimestamp() : 0;
 
             var scope = _logger.RequestScope(httpContext);
             _logger.RequestStarting(httpContext);
             if (diagnoticsEnabled)
             {
-                _diagnosticSource.Write("Microsoft.AspNet.Hosting.BeginRequest", new { httpContext = httpContext, timestamp = startTimestamp });
+                _diagnosticSource.Write("Microsoft.AspNetCore.Hosting.BeginRequest", new { httpContext = httpContext, timestamp = startTimestamp });
             }
 
             return new Context
@@ -57,26 +57,26 @@ namespace Microsoft.AspNet.Hosting.Internal
 
             if (exception == null)
             {
-                var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNet.Hosting.EndRequest");
+                var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNetCore.Hosting.EndRequest");
                 var currentTimestamp = (diagnoticsEnabled || context.StartTimestamp != 0) ? Stopwatch.GetTimestamp() : 0;
 
                 _logger.RequestFinished(httpContext, context.StartTimestamp, currentTimestamp);
 
                 if (diagnoticsEnabled)
                 {
-                    _diagnosticSource.Write("Microsoft.AspNet.Hosting.EndRequest", new { httpContext = httpContext, timestamp = currentTimestamp });
+                    _diagnosticSource.Write("Microsoft.AspNetCore.Hosting.EndRequest", new { httpContext = httpContext, timestamp = currentTimestamp });
                 }
             }
             else
             {
-                var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNet.Hosting.UnhandledException");
+                var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNetCore.Hosting.UnhandledException");
                 var currentTimestamp = (diagnoticsEnabled || context.StartTimestamp != 0) ? Stopwatch.GetTimestamp() : 0;
 
                 _logger.RequestFinished(httpContext, context.StartTimestamp, currentTimestamp);
 
                 if (diagnoticsEnabled)
                 {
-                    _diagnosticSource.Write("Microsoft.AspNet.Hosting.UnhandledException", new { httpContext = httpContext, timestamp = currentTimestamp, exception = exception });
+                    _diagnosticSource.Write("Microsoft.AspNetCore.Hosting.UnhandledException", new { httpContext = httpContext, timestamp = currentTimestamp, exception = exception });
                 }
             }
 
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironment.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironment.cs
index ac87b19b94..e69682ea89 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironment.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironment.cs
@@ -4,11 +4,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     public class HostingEnvironment : IHostingEnvironment
     {
-        public string EnvironmentName { get; set; } = Microsoft.AspNet.Hosting.EnvironmentName.Production;
+        public string EnvironmentName { get; set; } = Microsoft.AspNetCore.Hosting.EnvironmentName.Production;
 
         public string WebRootPath { get; set; }
 
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
index d491a4fef7..189d64f0d8 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.Hosting.Internal;
+using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     public static class HostingEnvironmentExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/HostingLoggerExtensions.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingLoggerExtensions.cs
index 0fdf122848..50d5b01079 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/HostingLoggerExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/HostingLoggerExtensions.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.Diagnostics;
 using System.Collections.Generic;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     internal static class HostingLoggerExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/LoggerEventIds.cs b/src/Microsoft.AspNetCore.Hosting/Internal/LoggerEventIds.cs
index 0b23c81e2a..f2978b0d20 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/LoggerEventIds.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/LoggerEventIds.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.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     internal static class LoggerEventIds
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/NullFileProvider.cs b/src/Microsoft.AspNetCore.Hosting/Internal/NullFileProvider.cs
index 5448e6a5ec..6e27bba6f8 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/NullFileProvider.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/NullFileProvider.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;
@@ -8,7 +8,7 @@ using System.IO;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     internal class NullFileProvider : IFileProvider
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.cs b/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.cs
index 455be554b4..7b21dd3ce6 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.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.Http.Features.Internal;
+using Microsoft.AspNetCore.Http.Features.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     public class RequestServicesFeature : IServiceProvidersFeature, IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerMiddleware.cs b/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerMiddleware.cs
index 8cf659227e..fffbd88a56 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerMiddleware.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerMiddleware.cs
@@ -3,13 +3,13 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Http.Features.Internal;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.Features.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     public class RequestServicesContainerMiddleware
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
index d68d6604b7..0af6943995 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
@@ -6,18 +6,18 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
-using Microsoft.AspNet.Hosting.Builder;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Hosting.Startup;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Server.Features;
+using Microsoft.AspNetCore.Hosting.Builder;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Startup;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Server.Features;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.PlatformAbstractions;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     public class WebHost : IWebHost
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/WebHostOptions.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHostOptions.cs
index a5e6ffeec3..53a8f5eb64 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/WebHostOptions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/WebHostOptions.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 Microsoft.Extensions.Configuration;
 
-namespace Microsoft.AspNet.Hosting.Internal
+namespace Microsoft.AspNetCore.Hosting.Internal
 {
     public class WebHostOptions
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Hosting/Properties/AssemblyInfo.cs
index 4f51e0868a..303723511f 100644
--- a/src/Microsoft.AspNetCore.Hosting/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Properties/AssemblyInfo.cs
@@ -6,5 +6,5 @@ using System.Resources;
 using System.Runtime.CompilerServices;
 
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: InternalsVisibleTo("Microsoft.AspNet.Hosting.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Hosting.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: NeutralResourcesLanguage("en-us")]
diff --git a/src/Microsoft.AspNetCore.Hosting/Server/IServerLoader.cs b/src/Microsoft.AspNetCore.Hosting/Server/IServerLoader.cs
index 3902135cab..a6afea0aea 100644
--- a/src/Microsoft.AspNetCore.Hosting/Server/IServerLoader.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Server/IServerLoader.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.Hosting.Server
+namespace Microsoft.AspNetCore.Hosting.Server
 {
     public interface IServerLoader
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Server/ServerLoader.cs b/src/Microsoft.AspNetCore.Hosting/Server/ServerLoader.cs
index 4f3b5fe4f0..3868cc1373 100644
--- a/src/Microsoft.AspNetCore.Hosting/Server/ServerLoader.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Server/ServerLoader.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Server
+namespace Microsoft.AspNetCore.Hosting.Server
 {
     public class ServerLoader : IServerLoader
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs b/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs
index da39fa6d3c..156707c277 100644
--- a/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs
@@ -3,10 +3,10 @@
 
 using System;
 using System.Reflection;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Startup
+namespace Microsoft.AspNetCore.Hosting.Startup
 {
     // TODO: replace all Action<IApplicationBuilder> eventually with this
     public delegate void ConfigureDelegate(IApplicationBuilder builder);
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs b/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs
index f5eaea5aed..ffa606b6da 100644
--- a/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Startup
+namespace Microsoft.AspNetCore.Hosting.Startup
 {
     public class ConfigureServicesBuilder
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/IStartupLoader.cs b/src/Microsoft.AspNetCore.Hosting/Startup/IStartupLoader.cs
index ee1db50c8e..9c7ee34eed 100644
--- a/src/Microsoft.AspNetCore.Hosting/Startup/IStartupLoader.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Startup/IStartupLoader.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNet.Hosting.Startup
+namespace Microsoft.AspNetCore.Hosting.Startup
 {
     public interface IStartupLoader
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs b/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
index bed39a6241..8750199eba 100644
--- a/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
@@ -15,7 +15,7 @@ using System.Text.Encodings.Web;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.PlatformAbstractions;
 
-namespace Microsoft.AspNet.Hosting.Startup
+namespace Microsoft.AspNetCore.Hosting.Startup
 {
     internal static class StartupExceptionPage
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/StartupLoader.cs b/src/Microsoft.AspNetCore.Hosting/Startup/StartupLoader.cs
index c77cbced34..2b7a641a10 100644
--- a/src/Microsoft.AspNetCore.Hosting/Startup/StartupLoader.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Startup/StartupLoader.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Startup
+namespace Microsoft.AspNetCore.Hosting.Startup
 {
     public class StartupLoader : IStartupLoader
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/StartupMethods.cs b/src/Microsoft.AspNetCore.Hosting/Startup/StartupMethods.cs
index b62dae27f7..d019a6aa24 100644
--- a/src/Microsoft.AspNetCore.Hosting/Startup/StartupMethods.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Startup/StartupMethods.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.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Startup
+namespace Microsoft.AspNetCore.Hosting.Startup
 {
     public class StartupMethods
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
index 0f385a8ac6..46ebe789fd 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
@@ -5,20 +5,20 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.Versioning;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting.Builder;
-using Microsoft.AspNet.Hosting.Internal;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Hosting.Startup;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting.Builder;
+using Microsoft.AspNetCore.Hosting.Internal;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Startup;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.PlatformAbstractions;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     /// <summary>
     /// A builder for <see cref="IWebHost"/>
@@ -210,7 +210,7 @@ namespace Microsoft.AspNet.Hosting
             services.AddLogging();
             services.AddOptions();
 
-            var diagnosticSource = new DiagnosticListener("Microsoft.AspNet");
+            var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
             services.AddSingleton<DiagnosticSource>(diagnosticSource);
             services.AddSingleton<DiagnosticListener>(diagnosticSource);
 
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
index db10bdd6d1..93a00ccd68 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.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.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.Extensions.Configuration;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     public static class WebHostBuilderExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostConfiguration.cs b/src/Microsoft.AspNetCore.Hosting/WebHostConfiguration.cs
index dc331e9adb..3a6cd02a4e 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostConfiguration.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostConfiguration.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.Collections.Generic;
 using Microsoft.Extensions.Configuration;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     public class WebHostConfiguration
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs b/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs
index 0e2f6480fe..2efdfb273f 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.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.Threading;
-using Microsoft.AspNet.Server.Features;
+using Microsoft.AspNetCore.Server.Features;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     public static class WebHostExtensions
     {
diff --git a/src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Footer.html b/src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Footer.html
index 54042e8bf9..4a30ed8e1f 100644
--- a/src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Footer.html
+++ b/src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Footer.html
@@ -1,3 +1,3 @@
-<footer>
-    .NET Framework {0} version {1}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;DNX {2} version {3}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNet.Hosting version {4}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;{5} {6}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="http://go.microsoft.com/fwlink/?LinkId=517394">Need help?</a>
+<footer>
+    .NET Framework {0} version {1}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;DNX {2} version {3}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNetCore.Hosting version {4}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;{5} {6}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="http://go.microsoft.com/fwlink/?LinkId=517394">Need help?</a>
 </footer>
diff --git a/src/Microsoft.AspNetCore.Hosting/project.json b/src/Microsoft.AspNetCore.Hosting/project.json
index 7677512471..1d5266894a 100644
--- a/src/Microsoft.AspNetCore.Hosting/project.json
+++ b/src/Microsoft.AspNetCore.Hosting/project.json
@@ -10,10 +10,10 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*",
-    "Microsoft.AspNet.Hosting.Server.Abstractions": "1.0.0-*",
-    "Microsoft.AspNet.Http": "1.0.0-*",
-    "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
+    "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Hosting.Server.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Http": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
     "Microsoft.Extensions.FileProviders.Physical": "1.0.0-*",
     "Microsoft.Extensions.Options": "1.0.0-*",
     "Microsoft.Extensions.Configuration": "1.0.0-*",
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs
index 83dfa962e0..4c7386403f 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Parameters to control application deployment.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs
index 8266234522..b140cd0131 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs
@@ -3,7 +3,7 @@
 
 using System.Threading;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Result of a deployment.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetArchitecture.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetArchitecture.cs
index 483a4569bb..e43f230705 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetArchitecture.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetArchitecture.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.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     public enum RuntimeArchitecture
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetFlavor.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetFlavor.cs
index 5b67b5d24c..dec116a81a 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetFlavor.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetFlavor.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.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     public enum RuntimeFlavor
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
index 6ece35a2db..1ab7075a66 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     public class RetryHelper
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs
index eca333942e..e54e8f99f6 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.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.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     public enum ServerType
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs
index d64101f713..d561f79196 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.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.Net;
 using System.Net.Sockets;
 
-namespace Microsoft.AspNet.Server.Testing.Common
+namespace Microsoft.AspNetCore.Server.Testing.Common
 {
     public static class TestUriHelper
     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
index 868f3a6e60..82f6f6fa00 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
-using Microsoft.AspNet.Testing;
+using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.PlatformAbstractions;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Abstract base class of all deployers with implementation of some of the common helpers.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs
index 0b5776b8b4..0f2492648c 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Factory to create an appropriate deployer based on <see cref="DeploymentParameters"/>.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs
index 85467bccb1..b8cb7708d2 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Common operations on an application deployer.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs
index 0c167587a5..ca1c498625 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs
@@ -6,11 +6,11 @@
 using System;
 using System.Linq;
 using System.Threading;
-using Microsoft.AspNet.Server.Testing.Common;
+using Microsoft.AspNetCore.Server.Testing.Common;
 using Microsoft.Extensions.Logging;
 using Microsoft.Web.Administration;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Deployer for IIS.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs
index f7441bf9e0..9cce8c8120 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs
@@ -6,9 +6,9 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using Microsoft.Extensions.Logging;
-using Microsoft.AspNet.Server.Testing.Common;
+using Microsoft.AspNetCore.Server.Testing.Common;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Deployment helper for IISExpress.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs
index 144a9b3a8a..2ae3f8e679 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs
@@ -6,9 +6,9 @@ using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using Microsoft.Extensions.Logging;
-using Microsoft.AspNet.Server.Testing.Common;
+using Microsoft.AspNetCore.Server.Testing.Common;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Deployer for WebListener and Kestrel.
@@ -58,7 +58,7 @@ namespace Microsoft.AspNet.Server.Testing
             var dnxPath = Path.Combine(TargetRuntimeBinPath, DnxCommandName);
             var dnxArgs = $"-p \"{DeploymentParameters.ApplicationPath}\" {commandName} " +
                           $"--server.urls {uri} " +
-                          $"--server {(DeploymentParameters.ServerType == ServerType.WebListener ? "Microsoft.AspNet.Server.WebListener" : "Microsoft.AspNet.Server.Kestrel")}";
+                          $"--server {(DeploymentParameters.ServerType == ServerType.WebListener ? "Microsoft.AspNetCore.Server.WebListener" : "Microsoft.AspNetCore.Server.Kestrel")}";
 
             Logger.LogInformation($"Executing {dnxPath} {dnxArgs}");
 
diff --git a/src/Microsoft.AspNetCore.Server.Testing/project.json b/src/Microsoft.AspNetCore.Server.Testing/project.json
index cfa8859965..33015bb134 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/project.json
+++ b/src/Microsoft.AspNetCore.Server.Testing/project.json
@@ -10,7 +10,7 @@
     "url": "git://github.com/aspnet/hosting"
   },
   "dependencies": {
-    "Microsoft.AspNet.Testing": "1.0.0-*",
+    "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
   },
diff --git a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs
index 3afee2f2fa..927c6e6e59 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.Diagnostics;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Skips a test if the DNX used to run the test is CoreClr.
diff --git a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.cs b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.cs
index a6d26fe3b6..2150a43c61 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.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.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Skip test if IIS variations are not enabled. To enable set environment variable 
diff --git a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs
index a04349bcc2..2b5f29ad0d 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs
@@ -3,9 +3,9 @@
 
 using System;
 using System.IO;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Testing.xunit;
 
-namespace Microsoft.AspNet.Server.Testing
+namespace Microsoft.AspNetCore.Server.Testing
 {
     /// <summary>
     /// Skips a 64 bit test if the current Windows OS is 32-bit.
diff --git a/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs b/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs
index 9f3a9f0fbb..75f2b5798f 100644
--- a/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs
+++ b/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs
@@ -10,12 +10,12 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Context = Microsoft.AspNet.Hosting.Internal.HostingApplication.Context;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Context = Microsoft.AspNetCore.Hosting.Internal.HostingApplication.Context;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     /// <summary>
     /// This adapts HttpRequestMessages to ASP.NET requests, dispatches them through the pipeline, and returns the
diff --git a/src/Microsoft.AspNetCore.TestHost/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.TestHost/Properties/AssemblyInfo.cs
index 23d1e15e16..fdd016720c 100644
--- a/src/Microsoft.AspNetCore.TestHost/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.TestHost/Properties/AssemblyInfo.cs
@@ -23,10 +23,10 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Microsoft.AspNet.TestHost")]
+[assembly: AssemblyTitle("Microsoft.AspNetCore.TestHost")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Microsoft.AspNet.TestHost")]
+[assembly: AssemblyProduct("Microsoft.AspNetCore.TestHost")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -36,7 +36,7 @@ using System.Runtime.InteropServices;
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("12A3EDBB-65B6-4D47-98FC-2B80CEC71E51")]
 
-[assembly: InternalsVisibleTo("Microsoft.AspNet.TestHost.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.TestHost.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: NeutralResourcesLanguage("en-us")]
 
diff --git a/src/Microsoft.AspNetCore.TestHost/RequestBuilder.cs b/src/Microsoft.AspNetCore.TestHost/RequestBuilder.cs
index 51b93fade0..c770ec75ba 100644
--- a/src/Microsoft.AspNetCore.TestHost/RequestBuilder.cs
+++ b/src/Microsoft.AspNetCore.TestHost/RequestBuilder.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     /// <summary>
     /// Used to construct a HttpRequestMessage object.
diff --git a/src/Microsoft.AspNetCore.TestHost/RequestFeature.cs b/src/Microsoft.AspNetCore.TestHost/RequestFeature.cs
index 7f63957663..0faaccafda 100644
--- a/src/Microsoft.AspNetCore.TestHost/RequestFeature.cs
+++ b/src/Microsoft.AspNetCore.TestHost/RequestFeature.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.IO;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.Internal;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     internal class RequestFeature : IHttpRequestFeature
     {
diff --git a/src/Microsoft.AspNetCore.TestHost/ResponseFeature.cs b/src/Microsoft.AspNetCore.TestHost/ResponseFeature.cs
index c0744d9239..836a63614c 100644
--- a/src/Microsoft.AspNetCore.TestHost/ResponseFeature.cs
+++ b/src/Microsoft.AspNetCore.TestHost/ResponseFeature.cs
@@ -4,11 +4,11 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.Internal;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     internal class ResponseFeature : IHttpResponseFeature
     {
diff --git a/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs b/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs
index 55b318309a..9c225ca4a8 100644
--- a/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs
+++ b/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs
@@ -8,7 +8,7 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     // This steam accepts writes from the server/app, buffers them internally, and returns the data via Reads
     // when requested by the client.
diff --git a/src/Microsoft.AspNetCore.TestHost/TestServer.cs b/src/Microsoft.AspNetCore.TestHost/TestServer.cs
index 1e85bf96cb..2b5e6e42f2 100644
--- a/src/Microsoft.AspNetCore.TestHost/TestServer.cs
+++ b/src/Microsoft.AspNetCore.TestHost/TestServer.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;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Context = Microsoft.AspNet.Hosting.Internal.HostingApplication.Context;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Context = Microsoft.AspNetCore.Hosting.Internal.HostingApplication.Context;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     public class TestServer : IServer
     {
diff --git a/src/Microsoft.AspNetCore.TestHost/TestWebSocket.cs b/src/Microsoft.AspNetCore.TestHost/TestWebSocket.cs
index f028d8f053..d1a77e5af6 100644
--- a/src/Microsoft.AspNetCore.TestHost/TestWebSocket.cs
+++ b/src/Microsoft.AspNetCore.TestHost/TestWebSocket.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;
@@ -8,7 +8,7 @@ using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     internal class TestWebSocket : WebSocket
     {
diff --git a/src/Microsoft.AspNetCore.TestHost/WebSocketClient.cs b/src/Microsoft.AspNetCore.TestHost/WebSocketClient.cs
index b26a1a4223..206c5a6980 100644
--- a/src/Microsoft.AspNetCore.TestHost/WebSocketClient.cs
+++ b/src/Microsoft.AspNetCore.TestHost/WebSocketClient.cs
@@ -8,12 +8,12 @@ using System.Net.WebSockets;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Context = Microsoft.AspNet.Hosting.Internal.HostingApplication.Context;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Context = Microsoft.AspNetCore.Hosting.Internal.HostingApplication.Context;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     public class WebSocketClient
     {
diff --git a/src/Microsoft.AspNetCore.TestHost/project.json b/src/Microsoft.AspNetCore.TestHost/project.json
index bdadfda68b..e8d5193122 100644
--- a/src/Microsoft.AspNetCore.TestHost/project.json
+++ b/src/Microsoft.AspNetCore.TestHost/project.json
@@ -10,7 +10,7 @@
     "url": "git://github.com/aspnet/hosting"
   },
   "dependencies": {
-    "Microsoft.AspNet.Hosting": "1.0.0-*"
+    "Microsoft.AspNetCore.Hosting": "1.0.0-*"
   },
   "frameworks": {
     "net451": {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeOptions.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeOptions.cs
index d18fdd9e42..c4ffaa799d 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeOptions.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeOptions.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class FakeOptions
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeService.cs
index 8f90f3899b..3bf3e6ce38 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeService.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeService.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class FakeService : IFakeEveryService, IDisposable
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFactoryService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFactoryService.cs
index c0a60c9364..5b78e046e1 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFactoryService.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFactoryService.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public interface IFactoryService
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeEveryService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeEveryService.cs
index da9f00507f..2cc7a00701 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeEveryService.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeEveryService.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     interface IFakeEveryService :
             IFakeScopedService,
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeScopedService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeScopedService.cs
index f5586003a6..77c53e596b 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeScopedService.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeScopedService.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public interface IFakeScopedService : IFakeService
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeService.cs
index dc08bcbe64..73fca3bab1 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeService.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeService.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public interface IFakeService { }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeServiceInstance.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeServiceInstance.cs
index 6dd1313072..0225a6789f 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeServiceInstance.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeServiceInstance.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     interface IFakeServiceInstance : IFakeService
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeSingletonService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeSingletonService.cs
index aca376a3fa..9387305999 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeSingletonService.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeSingletonService.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     interface IFakeSingletonService : IFakeService
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeStartupCallback.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeStartupCallback.cs
index e804deee82..8e345a1020 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeStartupCallback.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeStartupCallback.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public interface IFakeStartupCallback
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/INonexistentService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/INonexistentService.cs
index d71be552c2..5090051fd6 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/INonexistentService.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/INonexistentService.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public interface INonexistentService
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/RuntimeEnvironment.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/RuntimeEnvironment.cs
index c7cdd3f997..05cdeea772 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/RuntimeEnvironment.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/RuntimeEnvironment.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.Extensions.PlatformAbstractions;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class RuntimeEnvironment : IRuntimeEnvironment
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/Startup.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/Startup.cs
index d3fd5bb8bf..2abe4a4b22 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/Startup.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/Startup.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.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class Startup : StartupBase
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBase.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBase.cs
index 90edd4e1cc..82dd2c7cb6 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBase.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBase.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupBase
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBoom.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBoom.cs
index cfef8b9060..2b629896bc 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBoom.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBoom.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.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupBoom
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs
index f3c19ac07d..895fa654e9 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureServicesThrows.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.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupConfigureServicesThrows
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureThrows.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureThrows.cs
index 55db505105..1d9fa8ef37 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureThrows.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureThrows.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.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupConfigureThrows
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupCtorThrows.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupCtorThrows.cs
index b0a88f3a85..b7c1f223d3 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupCtorThrows.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupCtorThrows.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.Builder;
+using Microsoft.AspNetCore.Builder;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupCtorThrows
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupNoServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupNoServices.cs
index e32663d293..fddbc04052 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupNoServices.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupNoServices.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.Builder;
+using Microsoft.AspNetCore.Builder;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupNoServices
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupPrivateConfigure.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupPrivateConfigure.cs
index b06efe81da..e421ba08c7 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupPrivateConfigure.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupPrivateConfigure.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 Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupPrivateConfigure
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupStaticCtorThrows.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupStaticCtorThrows.cs
index cd90f5181d..c9164fa98f 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupStaticCtorThrows.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupStaticCtorThrows.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.Builder;
+using Microsoft.AspNetCore.Builder;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupStaticCtorThrows
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupThrowTypeLoadException.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupThrowTypeLoadException.cs
index fdfbc6a24e..b3cbd60225 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupThrowTypeLoadException.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupThrowTypeLoadException.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.Reflection;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupThrowTypeLoadException
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigureServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigureServices.cs
index 335dd4eaa8..e7c1be78f9 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigureServices.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigureServices.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.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupTwoConfigureServices
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigures.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigures.cs
index a97d679ac1..ce4132ac13 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigures.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigures.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.Builder;
+using Microsoft.AspNetCore.Builder;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupTwoConfigures
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServices.cs
index 31213c0c08..4c397fe8bd 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServices.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServices.cs
@@ -1,8 +1,8 @@
 using System;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupWithConfigureServices
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServicesNotResolved.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServicesNotResolved.cs
index fda5c8af5f..bff10f9442 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServicesNotResolved.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServicesNotResolved.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.Builder;
+using Microsoft.AspNetCore.Builder;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupWithConfigureServicesNotResolved
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithHostingEnvironment.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithHostingEnvironment.cs
index 9ddda3881c..c4a5776502 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithHostingEnvironment.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithHostingEnvironment.cs
@@ -1,7 +1,7 @@
-using System;
-using Microsoft.AspNet.Builder;
+using System;
+using Microsoft.AspNetCore.Builder;
 
-namespace Microsoft.AspNet.Hosting.Tests.Fakes
+namespace Microsoft.AspNetCore.Hosting.Tests.Fakes
 {
     public class StartupWithHostingEnvironment
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs
index 5a6df112ac..9390f4727f 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs
@@ -1,8 +1,8 @@
 using System;
-using Microsoft.AspNet.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupWithNullConfigureServices
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithServices.cs
index f24e3babfd..7056b37d68 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithServices.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithServices.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.Builder;
+using Microsoft.AspNetCore.Builder;
 
-namespace Microsoft.AspNet.Hosting.Fakes
+namespace Microsoft.AspNetCore.Hosting.Fakes
 {
     public class StartupWithServices
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/HostingEnvironmentExtensionsTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/HostingEnvironmentExtensionsTests.cs
index 709385fc66..d1f4d069a3 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/HostingEnvironmentExtensionsTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/HostingEnvironmentExtensionsTests.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.IO;
-using Microsoft.AspNet.Hosting.Internal;
+using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
 using Xunit;
 
-namespace Microsoft.AspNet.Hosting.Tests
+namespace Microsoft.AspNetCore.Hosting.Tests
 {
     public class HostingEnvironmentExtensionsTests
     {
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/StartupManagerTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/StartupManagerTests.cs
index 6c7f3dd5fc..cbff97ddfc 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/StartupManagerTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/StartupManagerTests.cs
@@ -4,16 +4,16 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Builder.Internal;
-using Microsoft.AspNet.Hosting.Fakes;
-using Microsoft.AspNet.Hosting.Internal;
-using Microsoft.AspNet.Hosting.Startup;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder.Internal;
+using Microsoft.AspNetCore.Hosting.Fakes;
+using Microsoft.AspNetCore.Hosting.Internal;
+using Microsoft.AspNetCore.Hosting.Startup;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit;
 
-namespace Microsoft.AspNet.Hosting.Tests
+namespace Microsoft.AspNetCore.Hosting.Tests
 {
     public class StartupManagerTests : IFakeStartupCallback
     {
@@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Hosting.Tests
             var diagnosticMessages = new List<string>();
             var hostingEnv = new HostingEnvironment { EnvironmentName = "WithServices" };
             var loader = new StartupLoader(services, hostingEnv);
-            var type = loader.FindStartupType("Microsoft.AspNet.Hosting.Tests", diagnosticMessages);
+            var type = loader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", diagnosticMessages);
             var startup = loader.LoadMethods(type, diagnosticMessages);
 
             var app = new ApplicationBuilder(services);
@@ -55,7 +55,7 @@ namespace Microsoft.AspNet.Hosting.Tests
             var diagnosticMessages = new List<string>();
             var hostingEnv = new HostingEnvironment { EnvironmentName = environment };
             var loader = new StartupLoader(services, hostingEnv);
-            var type = loader.FindStartupType("Microsoft.AspNet.Hosting.Tests", diagnosticMessages);
+            var type = loader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", diagnosticMessages);
             var startup = loader.LoadMethods(type, diagnosticMessages);
 
             var app = new ApplicationBuilder(services);
@@ -78,10 +78,10 @@ namespace Microsoft.AspNet.Hosting.Tests
             var diagnosticMessages = new List<string>();
             var hostingEnv = new HostingEnvironment { EnvironmentName = "Boom" };
             var loader = new StartupLoader(services, hostingEnv);
-            var type = loader.FindStartupType("Microsoft.AspNet.Hosting.Tests", diagnosticMessages);
+            var type = loader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", diagnosticMessages);
 
             var ex = Assert.Throws<InvalidOperationException>(() => loader.LoadMethods(type, diagnosticMessages));
-            Assert.Equal("A public method named 'ConfigureBoom' or 'Configure' could not be found in the 'Microsoft.AspNet.Hosting.Fakes.StartupBoom' type.", ex.Message);
+            Assert.Equal("A public method named 'ConfigureBoom' or 'Configure' could not be found in the 'Microsoft.AspNetCore.Hosting.Fakes.StartupBoom' type.", ex.Message);
         }
 
         [Fact]
@@ -94,7 +94,7 @@ namespace Microsoft.AspNet.Hosting.Tests
             var diagnosticMessages = new List<string>();
             var hostingEnv = new HostingEnvironment { EnvironmentName = "TwoConfigures" };
             var loader = new StartupLoader(services, hostingEnv);
-            var type = loader.FindStartupType("Microsoft.AspNet.Hosting.Tests", diagnosticMessages);
+            var type = loader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", diagnosticMessages);
 
             var ex = Assert.Throws<InvalidOperationException>(() => loader.LoadMethods(type, diagnosticMessages));
             Assert.Equal("Having multiple overloads of method 'Configure' is not supported.", ex.Message);
@@ -110,10 +110,10 @@ namespace Microsoft.AspNet.Hosting.Tests
             var diagnosticMessages = new List<string>();
             var hostingEnv = new HostingEnvironment { EnvironmentName = "PrivateConfigure" };
             var loader = new StartupLoader(services, hostingEnv);
-            var type = loader.FindStartupType("Microsoft.AspNet.Hosting.Tests", diagnosticMessages);
+            var type = loader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", diagnosticMessages);
 
             var ex = Assert.Throws<InvalidOperationException>(() => loader.LoadMethods(type, diagnosticMessages));
-            Assert.Equal("A public method named 'ConfigurePrivateConfigure' or 'Configure' could not be found in the 'Microsoft.AspNet.Hosting.Fakes.StartupPrivateConfigure' type.", ex.Message);
+            Assert.Equal("A public method named 'ConfigurePrivateConfigure' or 'Configure' could not be found in the 'Microsoft.AspNetCore.Hosting.Fakes.StartupPrivateConfigure' type.", ex.Message);
         }
 
         [Fact]
@@ -126,7 +126,7 @@ namespace Microsoft.AspNet.Hosting.Tests
             var diagnosticMessages = new List<string>();
             var hostingEnv = new HostingEnvironment { EnvironmentName = "TwoConfigureServices" };
             var loader = new StartupLoader(services, hostingEnv);
-            var type = loader.FindStartupType("Microsoft.AspNet.Hosting.Tests", diagnosticMessages);
+            var type = loader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", diagnosticMessages);
 
             var ex = Assert.Throws<InvalidOperationException>(() => loader.LoadMethods(type, diagnosticMessages));
             Assert.Equal("Having multiple overloads of method 'ConfigureServices' is not supported.", ex.Message);
@@ -141,7 +141,7 @@ namespace Microsoft.AspNet.Hosting.Tests
             var diagnosticMessages = new List<string>();
             var hostingEnv = new HostingEnvironment { EnvironmentName = "WithNullConfigureServices" };
             var loader = new StartupLoader(services, hostingEnv);
-            var type = loader.FindStartupType("Microsoft.AspNet.Hosting.Tests", diagnosticMessages);
+            var type = loader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", diagnosticMessages);
             var startup = loader.LoadMethods(type, diagnosticMessages);
 
             var app = new ApplicationBuilder(services);
@@ -160,7 +160,7 @@ namespace Microsoft.AspNet.Hosting.Tests
             var diagnosticMessages = new List<string>();
             var hostingEnv = new HostingEnvironment { EnvironmentName = "WithConfigureServices" };
             var loader = new StartupLoader(services, hostingEnv);
-            var type = loader.FindStartupType("Microsoft.AspNet.Hosting.Tests", diagnosticMessages);
+            var type = loader.FindStartupType("Microsoft.AspNetCore.Hosting.Tests", diagnosticMessages);
             var startup = loader.LoadMethods(type, diagnosticMessages);
 
             var app = new ApplicationBuilder(services);
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
index 01c5346c66..b468e52864 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
@@ -5,18 +5,18 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Hosting.Fakes;
-using Microsoft.AspNet.Hosting.Internal;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Hosting.Fakes;
+using Microsoft.AspNetCore.Hosting.Internal;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.PlatformAbstractions;
 using Xunit;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     public class WebHostBuilderTests
     {
@@ -143,7 +143,7 @@ namespace Microsoft.AspNet.Hosting
                 .UseStartup<StartupBoom>();
 
             var exception = Assert.Throws<InvalidOperationException>(() => hostBuilder.Build());
-            Assert.Equal("A public method named 'ConfigureProduction' or 'Configure' could not be found in the 'Microsoft.AspNet.Hosting.Fakes.StartupBoom' type.", exception.Message);
+            Assert.Equal("A public method named 'ConfigureProduction' or 'Configure' could not be found in the 'Microsoft.AspNetCore.Hosting.Fakes.StartupBoom' type.", exception.Message);
         }
 
         [Fact]
@@ -162,7 +162,7 @@ namespace Microsoft.AspNet.Hosting
                 .UseConfiguration(config)
                 .UseEnvironment(expected)
                 .UseServer(new TestServer())
-                .UseStartup("Microsoft.AspNet.Hosting.Tests")
+                .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
                 .Build();
 
             Assert.Equal(expected, host.Services.GetService<IHostingEnvironment>().EnvironmentName);
@@ -184,7 +184,7 @@ namespace Microsoft.AspNet.Hosting
                 .UseConfiguration(config)
                 .UseEnvironment(expected)
                 .UseServer(new TestServer())
-                .UseStartup("Microsoft.AspNet.Hosting.Tests")
+                .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
                 .Build();
 
             host.Dispose();
@@ -205,7 +205,7 @@ namespace Microsoft.AspNet.Hosting
                 .UseConfiguration(config)
                 .UseApplicationBasePath("/foo/bar")
                 .UseServer(new TestServer())
-                .UseStartup("Microsoft.AspNet.Hosting.Tests")
+                .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
                 .Build();
 
             Assert.Equal("/foo/bar", host.Services.GetService<IApplicationEnvironment>().ApplicationBasePath);
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostConfigurationsTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostConfigurationsTests.cs
index b88eb51dc9..2ef3c2a346 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostConfigurationsTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostConfigurationsTests.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.Hosting.Internal;
+using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.Extensions.Configuration;
 using Xunit;
 
-namespace Microsoft.AspNet.Hosting.Tests
+namespace Microsoft.AspNetCore.Hosting.Tests
 {
     public class WebHostConfigurationTests
     {
@@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Hosting.Tests
             var parameters = new Dictionary<string, string>()
             {
                 { "webroot", "wwwroot"},
-                { "server", "Microsoft.AspNet.Server.Kestrel"},
+                { "server", "Microsoft.AspNetCore.Server.Kestrel"},
                 { "application", "MyProjectReference"},
                 { "environment", "Development"},
                 { "detailederrors", "true"},
@@ -34,7 +34,7 @@ namespace Microsoft.AspNet.Hosting.Tests
             var config = new WebHostOptions(new ConfigurationBuilder().AddInMemoryCollection(parameters).Build());
 
             Assert.Equal("wwwroot", config.WebRoot);
-            Assert.Equal("Microsoft.AspNet.Server.Kestrel", config.ServerFactoryLocation);
+            Assert.Equal("Microsoft.AspNetCore.Server.Kestrel", config.ServerFactoryLocation);
             Assert.Equal("MyProjectReference", config.Application);
             Assert.Equal("Development", config.Environment);
             Assert.True(config.CaptureStartupErrors);
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
index 1526192d94..d34952b861 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
@@ -8,14 +8,14 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting.Fakes;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Hosting.Startup;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Server.Features;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting.Fakes;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Startup;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Server.Features;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -23,7 +23,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using Xunit;
 
-namespace Microsoft.AspNet.Hosting
+namespace Microsoft.AspNetCore.Hosting
 {
     public class WebHostTests : IServerFactory, IServer
     {
@@ -81,7 +81,7 @@ namespace Microsoft.AspNet.Hosting
         {
             var vals = new Dictionary<string, string>
             {
-                { "server", "Microsoft.AspNet.Hosting.Tests" }
+                { "server", "Microsoft.AspNetCore.Hosting.Tests" }
             };
 
             var builder = new ConfigurationBuilder()
@@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Hosting
         {
             var vals = new Dictionary<string, string>
             {
-                { "Server", "Microsoft.AspNet.Hosting.Tests" }
+                { "Server", "Microsoft.AspNetCore.Hosting.Tests" }
             };
 
             var builder = new ConfigurationBuilder()
@@ -113,7 +113,7 @@ namespace Microsoft.AspNet.Hosting
         {
             var vals = new Dictionary<string, string>
             {
-                { "Server", "Microsoft.AspNet.Hosting.Tests" }
+                { "Server", "Microsoft.AspNetCore.Hosting.Tests" }
             };
 
             var builder = new ConfigurationBuilder()
@@ -130,7 +130,7 @@ namespace Microsoft.AspNet.Hosting
         {
             var vals = new Dictionary<string, string>
             {
-                { "Server", "Microsoft.AspNet.Hosting.Tests" }
+                { "Server", "Microsoft.AspNetCore.Hosting.Tests" }
             };
 
             var builder = new ConfigurationBuilder()
@@ -140,7 +140,7 @@ namespace Microsoft.AspNet.Hosting
             host.Start();
             var hostingEnvironment = host.Services.GetService<IHostingEnvironment>();
             Assert.NotNull(hostingEnvironment.Configuration);
-            Assert.Equal("Microsoft.AspNet.Hosting.Tests", hostingEnvironment.Configuration["Server"]);
+            Assert.Equal("Microsoft.AspNetCore.Hosting.Tests", hostingEnvironment.Configuration["Server"]);
         }
 
         [Fact]
@@ -148,7 +148,7 @@ namespace Microsoft.AspNet.Hosting
         {
             var host = CreateBuilder()
                 .UseServer((IServerFactory)this)
-                .UseStartup("Microsoft.AspNet.Hosting.Tests")
+                .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
                 .Start();
 
             Assert.NotNull(host);
@@ -165,7 +165,7 @@ namespace Microsoft.AspNet.Hosting
         {
             var host = CreateBuilder()
                 .UseServer((IServerFactory)this)
-                .UseStartup("Microsoft.AspNet.Hosting.Tests")
+                .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
                 .Build();
 
             var lifetime = host.Services.GetRequiredService<IApplicationLifetime>();
@@ -198,7 +198,7 @@ namespace Microsoft.AspNet.Hosting
                     s.AddTransient<IFakeService, FakeService>();
                     s.AddSingleton<IFakeSingletonService, FakeService>();
                 })
-                .UseStartup("Microsoft.AspNet.Hosting.Tests")
+                .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
                 .Build();
 
             host.Start();
@@ -236,7 +236,7 @@ namespace Microsoft.AspNet.Hosting
         {
             var host = CreateBuilder()
                 .UseServer((IServerFactory)this)
-                .UseStartup("Microsoft.AspNet.Hosting.Tests")
+                .UseStartup("Microsoft.AspNetCore.Hosting.Tests")
                 .UseEnvironment("WithHostingEnvironment")
                 .Build();
 
@@ -257,7 +257,7 @@ namespace Microsoft.AspNet.Hosting
                     services.AddTransient<IStartupLoader, TestLoader>();
                 })
                 .UseServer((IServerFactory)this)
-                .UseStartup("Microsoft.AspNet.Hosting.Tests");
+                .UseStartup("Microsoft.AspNetCore.Hosting.Tests");
 
             Assert.Throws<NotImplementedException>(() => builder.Build());
         }
@@ -491,7 +491,7 @@ namespace Microsoft.AspNet.Hosting
 
         private IWebHostBuilder CreateBuilder(IConfiguration config = null)
         {
-            return new WebHostBuilder().UseConfiguration(config ?? new ConfigurationBuilder().Build()).UseStartup("Microsoft.AspNet.Hosting.Tests");
+            return new WebHostBuilder().UseConfiguration(config ?? new ConfigurationBuilder().Build()).UseStartup("Microsoft.AspNetCore.Hosting.Tests");
         }
 
         public void Start<TContext>(IHttpApplication<TContext> application)
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/project.json b/test/Microsoft.AspNetCore.Hosting.Tests/project.json
index 99ea348770..f9ad4c684e 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/project.json
@@ -7,9 +7,9 @@
     "testroot/**/*"  
   ],
   "dependencies": {
-    "Microsoft.AspNet.Hosting": "1.0.0-*",
-    "Microsoft.AspNet.Owin": "1.0.0-*",
-    "Microsoft.AspNet.Testing": "1.0.0-*",
+    "Microsoft.AspNetCore.Hosting": "1.0.0-*",
+    "Microsoft.AspNetCore.Owin": "1.0.0-*",
+    "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "Microsoft.Extensions.Options": "1.0.0-*",
     "Microsoft.Extensions.PlatformAbstractions": "1.0.0-*",
     "xunit": "2.1.0"
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs
index 06b570afb3..8e71b2840a 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs
@@ -8,20 +8,20 @@ using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Hosting.Internal;
-using Microsoft.AspNet.Hosting.Server;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Internal;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Internal;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Xunit;
-using Context = Microsoft.AspNet.Hosting.Internal.HostingApplication.Context;
+using Context = Microsoft.AspNetCore.Hosting.Internal.HostingApplication.Context;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     public class ClientHandlerTests
     {
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.AspNetCore.TestHost.Tests/Properties/AssemblyInfo.cs
index 8129ea73eb..f4acd98801 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/Properties/AssemblyInfo.cs
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/Properties/AssemblyInfo.cs
@@ -22,10 +22,10 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Microsoft.AspNet.TestHost.Tests")]
+[assembly: AssemblyTitle("Microsoft.AspNetCore.TestHost.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Microsoft.AspNet.TestHost.Tests")]
+[assembly: AssemblyProduct("Microsoft.AspNetCore.TestHost.Tests")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/RequestBuilderTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/RequestBuilderTests.cs
index 77b2e6e9b2..b8329ea26f 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/RequestBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/RequestBuilderTests.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.Hosting;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     public class RequestBuilderTests
     {
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/ResponseFeatureTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/ResponseFeatureTests.cs
index c3e4b85021..dc8831fc99 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/ResponseFeatureTests.cs
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/ResponseFeatureTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     public class ResponseFeatureTests
     {
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
index 4312836514..4007f9c00e 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
@@ -9,16 +9,16 @@ using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Hosting.Internal;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Internal;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Xunit;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     public class TestClientTests
     {
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/TestServerTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/TestServerTests.cs
index d544e1bf14..81f3b62ba7 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/TestServerTests.cs
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/TestServerTests.cs
@@ -7,18 +7,18 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Features.Internal;
-using Microsoft.AspNet.Http.Internal;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features.Internal;
+using Microsoft.AspNetCore.Http.Internal;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DiagnosticAdapter;
 using Xunit;
 
-namespace Microsoft.AspNet.TestHost
+namespace Microsoft.AspNetCore.TestHost
 {
     public class TestServerTests
     {
@@ -530,7 +530,7 @@ namespace Microsoft.AspNet.TestHost
 
             public OnBeginRequestEventData BeginRequest { get; set; }
 
-            [DiagnosticName("Microsoft.AspNet.Hosting.BeginRequest")]
+            [DiagnosticName("Microsoft.AspNetCore.Hosting.BeginRequest")]
             public virtual void OnBeginRequest(IProxyHttpContext httpContext)
             {
                 BeginRequest = new OnBeginRequestEventData()
@@ -546,7 +546,7 @@ namespace Microsoft.AspNet.TestHost
 
             public OnEndRequestEventData EndRequest { get; set; }
 
-            [DiagnosticName("Microsoft.AspNet.Hosting.EndRequest")]
+            [DiagnosticName("Microsoft.AspNetCore.Hosting.EndRequest")]
             public virtual void OnEndRequest(IProxyHttpContext httpContext)
             {
                 EndRequest = new OnEndRequestEventData()
@@ -563,7 +563,7 @@ namespace Microsoft.AspNet.TestHost
 
             public OnUnhandledExceptionEventData UnhandledException { get; set; }
 
-            [DiagnosticName("Microsoft.AspNet.Hosting.UnhandledException")]
+            [DiagnosticName("Microsoft.AspNetCore.Hosting.UnhandledException")]
             public virtual void OnUnhandledException(IProxyHttpContext httpContext, IProxyException exception)
             {
                 UnhandledException = new OnUnhandledExceptionEventData()
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/project.json b/test/Microsoft.AspNetCore.TestHost.Tests/project.json
index 58a862cb86..68502a7c9f 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/project.json
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/project.json
@@ -4,8 +4,8 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
-    "Microsoft.AspNet.Testing": "1.0.0-*",
-    "Microsoft.AspNet.TestHost": "1.0.0-*",
+    "Microsoft.AspNetCore.Testing": "1.0.0-*",
+    "Microsoft.AspNetCore.TestHost": "1.0.0-*",
     "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*",
     "xunit": "2.1.0"
   },