diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 493a734cad..0e6d309476 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -9,7 +9,7 @@
             "StrictSemanticVersionValidationRule"
         ],
         "packages": {
-            "Microsoft.AspNet.StaticFiles": { }
+            "Microsoft.AspNetCore.StaticFiles": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.
diff --git a/StaticFiles.sln b/StaticFiles.sln
index 5cda2caa18..1b8c1e67b7 100644
--- a/StaticFiles.sln
+++ b/StaticFiles.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.21916.0
@@ -7,13 +7,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{40EE0889-960
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8B21A3A9-9CA6-4857-A6E0-1A3203404B60}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.StaticFiles", "src\Microsoft.AspNet.StaticFiles\Microsoft.AspNet.StaticFiles.xproj", "{8D7BC5A4-F19C-4184-8338-A6B42997218C}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.StaticFiles", "src\Microsoft.AspNetCore.StaticFiles\Microsoft.AspNetCore.StaticFiles.xproj", "{8D7BC5A4-F19C-4184-8338-A6B42997218C}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "StaticFileSample", "samples\StaticFileSample\StaticFileSample.xproj", "{092141D9-305A-4FC5-AE74-CB23982CA8D4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF02AFE8-7C15-4DDB-8B2C-58A676112A98}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.StaticFiles.Tests", "test\Microsoft.AspNet.StaticFiles.Tests\Microsoft.AspNet.StaticFiles.Tests.xproj", "{CC87FE7D-8F42-4BE9-A152-9625E837C1E5}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.StaticFiles.Tests", "test\Microsoft.AspNetCore.StaticFiles.Tests\Microsoft.AspNetCore.StaticFiles.Tests.xproj", "{CC87FE7D-8F42-4BE9-A152-9625E837C1E5}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5EE39BF7-6457-432B-B26B-53B77A1C03D9}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
index 3e8f7c3a66..17458c8872 100644
--- a/samples/StaticFileSample/Startup.cs
+++ b/samples/StaticFileSample/Startup.cs
@@ -1,5 +1,5 @@
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
diff --git a/samples/StaticFileSample/hosting.json b/samples/StaticFileSample/hosting.json
index f8ef14574d..6a93dbafa8 100644
--- a/samples/StaticFileSample/hosting.json
+++ b/samples/StaticFileSample/hosting.json
@@ -1,3 +1,3 @@
-{
-  "server": "Microsoft.AspNet.Server.Kestrel"
+{
+  "server": "Microsoft.AspNetCore.Server.Kestrel"
 }
diff --git a/samples/StaticFileSample/project.json b/samples/StaticFileSample/project.json
index 0544374383..fc438ef086 100644
--- a/samples/StaticFileSample/project.json
+++ b/samples/StaticFileSample/project.json
@@ -6,9 +6,9 @@
     "web": "StaticFileSample"
   },
   "dependencies": {
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-*",
+    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
   "frameworks": {
diff --git a/src/Microsoft.AspNetCore.StaticFiles/AssemblyInfo.cs b/src/Microsoft.AspNetCore.StaticFiles/AssemblyInfo.cs
index 041416861b..3af9731ac7 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/AssemblyInfo.cs
@@ -3,4 +3,4 @@
 
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Microsoft.AspNet.StaticFiles.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.StaticFiles.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/Microsoft.AspNetCore.StaticFiles/Constants.cs b/src/Microsoft.AspNetCore.StaticFiles/Constants.cs
index 799172d2a1..318bd4cb99 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/Constants.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/Constants.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     internal static class Constants
     {
diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs
index f765da989d..2e8bea6977 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesExtensions.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.StaticFiles;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Extension methods for the DefaultFilesMiddleware
diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs
index 070d8b170c..077f7e8199 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesMiddleware.cs
@@ -3,13 +3,13 @@
 
 using System;
 using System.Threading.Tasks;
-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.Options;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// This examines a directory path and determines if there is a default file present.
diff --git a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs
index bcce33740e..6019c77971 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DefaultFilesOptions.cs
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.StaticFiles.Infrastructure;
+using Microsoft.AspNetCore.StaticFiles.Infrastructure;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Options for selecting default file names.
diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs
index 29bb9ad8e6..dce00489f1 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserExtensions.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.StaticFiles;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Extension methods for the DirectoryBrowserMiddleware
diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs
index 1761b2ebee..e40926cc39 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserMiddleware.cs
@@ -3,14 +3,14 @@
 
 using System;
 using System.Threading.Tasks;
-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.FileProviders;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// Enables directory browsing
diff --git a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs
index 7e5460d5d3..f3a33d3fc9 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/DirectoryBrowserOptions.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.StaticFiles;
-using Microsoft.AspNet.StaticFiles.Infrastructure;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.AspNetCore.StaticFiles.Infrastructure;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Directory browsing options
diff --git a/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs b/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs
index a4c806bf4e..a41ffe3488 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/FileExtensionContentTypeProvider.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// Provides a mapping between file extensions and MIME types.
diff --git a/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs
index 41f0c04325..c9eb06e4c3 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/FileServerExtensions.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;
-using Microsoft.AspNet.StaticFiles;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Extension methods that combine all of the static file middleware components:
diff --git a/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs
index 890fc1be9b..b533a2a2ef 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/FileServerOptions.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.StaticFiles.Infrastructure;
+using Microsoft.AspNetCore.StaticFiles.Infrastructure;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Options for all of the static file middleware components
diff --git a/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs b/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs
index 5b6306b51f..6124d55a3c 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/Helpers.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/Helpers.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.Http;
+using Microsoft.AspNetCore.Http;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     internal static class Helpers
     {
diff --git a/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs b/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs
index 2b769d9031..0064a2600b 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/HtmlDirectoryFormatter.cs
@@ -8,11 +8,11 @@ using System.Linq;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// Generates an HTML view for a directory.
diff --git a/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs b/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs
index 885ccb476e..ba5065df03 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/IContentTypeProvider.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.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// Used to look up MIME types given a file path
diff --git a/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs b/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs
index 8c43063878..6f379dea98 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/IDirectoryFormatter.cs
@@ -3,10 +3,10 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// Generates the view for a directory
diff --git a/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/RangeHelpers.cs b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/RangeHelpers.cs
index 05a1b35e7b..e6cf50e025 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/RangeHelpers.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/RangeHelpers.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.StaticFiles.Infrastructure
+namespace Microsoft.AspNetCore.StaticFiles.Infrastructure
 {
     internal static class RangeHelpers
     {
diff --git a/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs
index c6839268f7..1c1cc80ad5 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptions.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;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNet.StaticFiles.Infrastructure
+namespace Microsoft.AspNetCore.StaticFiles.Infrastructure
 {
     /// <summary>
     /// Options common to several middleware components
diff --git a/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs
index 5fce4fed15..abff959072 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/Infrastructure/SharedOptionsBase.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.Hosting;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNet.StaticFiles.Infrastructure
+namespace Microsoft.AspNetCore.StaticFiles.Infrastructure
 {
     /// <summary>
     /// Options common to several middleware components
diff --git a/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs
index 026b7703ba..b022ddd39b 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/LoggerExtensions.cs
@@ -1,11 +1,11 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// Defines *all* the logger messages produced by static files
diff --git a/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs b/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs
index dd2bc337ec..ca7d5222cb 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/Resources.Designer.cs
@@ -1,5 +1,5 @@
 // <auto-generated />
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     using System.Globalization;
     using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.StaticFiles
     internal static class Resources
     {
         private static readonly ResourceManager _resourceManager
-            = new ResourceManager("Microsoft.AspNet.StaticFiles.Resources", typeof(Resources).GetTypeInfo().Assembly);
+            = new ResourceManager("Microsoft.AspNetCore.StaticFiles.Resources", typeof(Resources).GetTypeInfo().Assembly);
 
         /// <summary>
         /// No IContentTypeProvider was specified.
diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
index d54032af2a..5bee24969e 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/StaticFileContext.cs
@@ -7,17 +7,17 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Extensions;
-using Microsoft.AspNet.Http.Features;
-using Microsoft.AspNet.Http.Headers;
-using Microsoft.AspNet.StaticFiles.Infrastructure;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.Headers;
+using Microsoft.AspNetCore.StaticFiles.Infrastructure;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     internal struct StaticFileContext
     {
diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs
index 70353b1582..1f9270a432 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/StaticFileExtensions.cs
@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.StaticFiles;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Extension methods for the StaticFileMiddleware
diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs
index b7dd7a610d..cfbb6cc77d 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/StaticFileMiddleware.cs
@@ -4,13 +4,13 @@
 using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-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.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// Enables serving static files for a given request path
diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs
index 815c0a221d..1dcfa6a783 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/StaticFileOptions.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.StaticFiles;
-using Microsoft.AspNet.StaticFiles.Infrastructure;
+using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.AspNetCore.StaticFiles.Infrastructure;
 
-namespace Microsoft.AspNet.Builder
+namespace Microsoft.AspNetCore.Builder
 {
     /// <summary>
     /// Options for serving static files
diff --git a/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs b/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs
index d67d4906cd..72b25c8259 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.cs
+++ b/src/Microsoft.AspNetCore.StaticFiles/StaticFileResponseContext.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.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     /// <summary>
     /// Contains information about the request and the file that will be served in response.
diff --git a/src/Microsoft.AspNetCore.StaticFiles/project.json b/src/Microsoft.AspNetCore.StaticFiles/project.json
index 58e6629adc..795af04383 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/project.json
+++ b/src/Microsoft.AspNetCore.StaticFiles/project.json
@@ -10,8 +10,8 @@
     "url": "git://github.com/aspnet/staticfiles"
   },
   "dependencies": {
-    "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
-    "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*",
+    "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
+    "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.FileProviders.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
     "Microsoft.Extensions.WebEncoders": "1.0.0-*"
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
index 781ef8f044..1d5b200511 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/CacheHeaderTests.cs
@@ -5,11 +5,11 @@ using System;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.TestHost;
 using Xunit;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     public class CacheHeaderTests
     {
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
index b56ec0ba29..1095b64350 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultContentTypeProviderTests.cs
@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     public class DefaultContentTypeProviderTests
     {
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
index e8976d6ddd..040e7cc22f 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DefaultFilesMiddlewareTests.cs
@@ -6,14 +6,14 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.TestHost;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.FileProviders;
 using Xunit;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     public class DefaultFilesMiddlewareTests
     {
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
index 74480d2002..01be82e080 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/DirectoryBrowserMiddlewareTests.cs
@@ -7,15 +7,15 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.TestHost;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Xunit;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     public class DirectoryBrowserMiddlewareTests
     {
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs
index d1f92990be..16ad4143ff 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/RangeHeaderTests.cs
@@ -5,11 +5,11 @@ using System;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.TestHost;
 using Xunit;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     public class RangeHeaderTests
     {
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs
index 4666486f46..ac31dba62a 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileContextTest.cs
@@ -4,15 +4,15 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Internal;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging.Testing;
 using Microsoft.Extensions.Primitives;
 using Xunit;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     public class StaticFileContextTest
     {
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
index c6735c5b17..d10e854f0d 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFileMiddlewareTests.cs
@@ -5,15 +5,15 @@ using System;
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.TestHost;
-using Microsoft.AspNet.Testing.xunit;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.TestHost;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.FileProviders;
 using Xunit;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     public class StaticFileMiddlewareTests
     {
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
index 927b95d6ff..93abc8333f 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
@@ -3,13 +3,13 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.TestHost;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.StaticFiles
+namespace Microsoft.AspNetCore.StaticFiles
 {
     public static class StaticFilesTestServer
     {
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json b/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json
index a6fbbe9d44..3eb3b5bdce 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/project.json
@@ -8,9 +8,9 @@
       "TestDocument.txt"
   ],
   "dependencies": {
-      "Microsoft.AspNet.StaticFiles": "1.0.0-*",
-      "Microsoft.AspNet.TestHost": "1.0.0-*",
-      "Microsoft.AspNet.Testing": "1.0.0-*",
+      "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
+      "Microsoft.AspNetCore.TestHost": "1.0.0-*",
+      "Microsoft.AspNetCore.Testing": "1.0.0-*",
       "Microsoft.Extensions.Logging.Testing": "1.0.0-*",
       "xunit": "2.1.0"
   },