diff --git a/src/Microsoft.AspNet.Buffering/BufferingWriteStream.cs b/src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
similarity index 100%
rename from src/Microsoft.AspNet.Buffering/BufferingWriteStream.cs
rename to src/Microsoft.AspNetCore.Buffering/BufferingWriteStream.cs
diff --git a/src/Microsoft.AspNet.Buffering/HttpBufferingFeature.cs b/src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.Buffering/HttpBufferingFeature.cs
rename to src/Microsoft.AspNetCore.Buffering/HttpBufferingFeature.cs
diff --git a/src/Microsoft.AspNet.Buffering/Microsoft.AspNet.Buffering.xproj b/src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Buffering/Microsoft.AspNet.Buffering.xproj
rename to src/Microsoft.AspNetCore.Buffering/Microsoft.AspNetCore.Buffering.xproj
diff --git a/src/Microsoft.AspNet.Buffering/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Buffering/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Buffering/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Buffering/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Buffering/ResponseBufferingMiddleware.cs b/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.Buffering/ResponseBufferingMiddleware.cs
rename to src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddleware.cs
diff --git a/src/Microsoft.AspNet.Buffering/ResponseBufferingMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Buffering/ResponseBufferingMiddlewareExtensions.cs
rename to src/Microsoft.AspNetCore.Buffering/ResponseBufferingMiddlewareExtensions.cs
diff --git a/src/Microsoft.AspNet.Buffering/SendFileFeatureWrapper.cs b/src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Buffering/SendFileFeatureWrapper.cs
rename to src/Microsoft.AspNetCore.Buffering/SendFileFeatureWrapper.cs
diff --git a/src/Microsoft.AspNet.Buffering/project.json b/src/Microsoft.AspNetCore.Buffering/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Buffering/project.json
rename to src/Microsoft.AspNetCore.Buffering/project.json
diff --git a/src/Microsoft.AspNet.HttpOverrides/ForwardedHeaders.cs b/src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeaders.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/ForwardedHeaders.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/ForwardedHeaders.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/HttpMethodOverrideExtensions.cs b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/HttpMethodOverrideExtensions.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideExtensions.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/HttpMethodOverrideMiddleware.cs b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/HttpMethodOverrideMiddleware.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideMiddleware.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/HttpMethodOverrideOptions.cs b/src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/HttpMethodOverrideOptions.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/HttpMethodOverrideOptions.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/IPEndPointParser.cs b/src/Microsoft.AspNetCore.HttpOverrides/IPEndPointParser.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/IPEndPointParser.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/IPEndPointParser.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/Microsoft.AspNet.HttpOverrides.xproj b/src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.xproj
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/Microsoft.AspNet.HttpOverrides.xproj
rename to src/Microsoft.AspNetCore.HttpOverrides/Microsoft.AspNetCore.HttpOverrides.xproj
diff --git a/src/Microsoft.AspNet.HttpOverrides/OverrideHeaderExtensions.cs b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/OverrideHeaderExtensions.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderExtensions.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/OverrideHeaderMiddleware.cs b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/OverrideHeaderMiddleware.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderMiddleware.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/OverrideHeaderOptions.cs b/src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderOptions.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/OverrideHeaderOptions.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/OverrideHeaderOptions.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.HttpOverrides/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.HttpOverrides/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.HttpOverrides/project.json b/src/Microsoft.AspNetCore.HttpOverrides/project.json
similarity index 100%
rename from src/Microsoft.AspNet.HttpOverrides/project.json
rename to src/Microsoft.AspNetCore.HttpOverrides/project.json
diff --git a/test/Microsoft.AspNet.Buffering.Tests/Microsoft.AspNet.Buffering.Tests.xproj b/test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Buffering.Tests/Microsoft.AspNet.Buffering.Tests.xproj
rename to test/Microsoft.AspNetCore.Buffering.Tests/Microsoft.AspNetCore.Buffering.Tests.xproj
diff --git a/test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs b/test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
rename to test/Microsoft.AspNetCore.Buffering.Tests/ResponseBufferingMiddlewareTests.cs
diff --git a/test/Microsoft.AspNet.Buffering.Tests/project.json b/test/Microsoft.AspNetCore.Buffering.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Buffering.Tests/project.json
rename to test/Microsoft.AspNetCore.Buffering.Tests/project.json
diff --git a/test/Microsoft.AspNet.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs b/test/Microsoft.AspNetCore.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
rename to test/Microsoft.AspNetCore.HttpOverrides.Tests/HttpMethodOverrideMiddlewareTest.cs
diff --git a/test/Microsoft.AspNet.HttpOverrides.Tests/IPEndPointParserTest.cs b/test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.HttpOverrides.Tests/IPEndPointParserTest.cs
rename to test/Microsoft.AspNetCore.HttpOverrides.Tests/IPEndPointParserTest.cs
diff --git a/test/Microsoft.AspNet.HttpOverrides.Tests/Microsoft.AspNet.HttpOverrides.Tests.xproj b/test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.xproj
similarity index 100%
rename from test/Microsoft.AspNet.HttpOverrides.Tests/Microsoft.AspNet.HttpOverrides.Tests.xproj
rename to test/Microsoft.AspNetCore.HttpOverrides.Tests/Microsoft.AspNetCore.HttpOverrides.Tests.xproj
diff --git a/test/Microsoft.AspNet.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs b/test/Microsoft.AspNetCore.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs
rename to test/Microsoft.AspNetCore.HttpOverrides.Tests/OverrideHeaderMiddlewareTest.cs
diff --git a/test/Microsoft.AspNet.HttpOverrides.Tests/project.json b/test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json
similarity index 100%
rename from test/Microsoft.AspNet.HttpOverrides.Tests/project.json
rename to test/Microsoft.AspNetCore.HttpOverrides.Tests/project.json