diff --git a/HttpAbstractions.sln b/HttpAbstractions.sln
index e4bd7129..7a857f08 100644
--- a/HttpAbstractions.sln
+++ b/HttpAbstractions.sln
@@ -11,7 +11,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Core"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http", "src\Microsoft.AspNet.Http\Microsoft.AspNet.Http.kproj", "{22071333-15BA-4D16-A1D5-4D5B1A83FBDD}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.HttpFeature", "src\Microsoft.AspNet.HttpFeature\Microsoft.AspNet.HttpFeature.kproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Http.Interfaces", "src\Microsoft.AspNet.Http.Interfaces\Microsoft.AspNet.Http.Interfaces.kproj", "{D9128247-8F97-48B8-A863-F1F21A029FCE}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.FeatureModel", "src\Microsoft.AspNet.FeatureModel\Microsoft.AspNet.FeatureModel.kproj", "{32A4C918-30EE-41DB-8E26-8A3BB88ED231}"
 EndProject
diff --git a/src/Microsoft.AspNet.Http.Core/Collections/SessionCollection.cs b/src/Microsoft.AspNet.Http.Core/Collections/SessionCollection.cs
index 8d2c3b75..52ad9af6 100644
--- a/src/Microsoft.AspNet.Http.Core/Collections/SessionCollection.cs
+++ b/src/Microsoft.AspNet.Http.Core/Collections/SessionCollection.cs
@@ -5,7 +5,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 
 namespace Microsoft.AspNet.Http.Core.Collections
 {
diff --git a/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs
index 09915207..2de1680d 100644
--- a/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs
+++ b/src/Microsoft.AspNet.Http.Core/DefaultHttpContext.cs
@@ -12,8 +12,8 @@
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Infrastructure;
 using Microsoft.AspNet.Http.Security;
-using Microsoft.AspNet.HttpFeature;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces;
+using Microsoft.AspNet.Http.Interfaces.Security;
 using Microsoft.AspNet.Http.Core.Collections;
 using Microsoft.AspNet.Http.Core.Infrastructure;
 using Microsoft.AspNet.Http.Core.Security;
diff --git a/src/Microsoft.AspNet.Http.Core/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http.Core/DefaultHttpRequest.cs
index 28e8f280..46fa1907 100644
--- a/src/Microsoft.AspNet.Http.Core/DefaultHttpRequest.cs
+++ b/src/Microsoft.AspNet.Http.Core/DefaultHttpRequest.cs
@@ -8,7 +8,7 @@
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Infrastructure;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Microsoft.AspNet.Http.Core.Collections;
 using Microsoft.AspNet.Http.Core.Infrastructure;
 
diff --git a/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs
index 46358ad6..7e446147 100644
--- a/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs
+++ b/src/Microsoft.AspNet.Http.Core/DefaultHttpResponse.cs
@@ -12,8 +12,8 @@
 using Microsoft.AspNet.Http.Infrastructure;
 using Microsoft.AspNet.Http.Security;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.HttpFeature;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces;
+using Microsoft.AspNet.Http.Interfaces.Security;
 using Microsoft.AspNet.Http.Core.Collections;
 using Microsoft.AspNet.Http.Core.Infrastructure;
 using Microsoft.AspNet.Http.Core.Security;
diff --git a/src/Microsoft.AspNet.Http.Core/HttpRequestFeature.cs b/src/Microsoft.AspNet.Http.Core/HttpRequestFeature.cs
index 751b366e..ae9fb236 100644
--- a/src/Microsoft.AspNet.Http.Core/HttpRequestFeature.cs
+++ b/src/Microsoft.AspNet.Http.Core/HttpRequestFeature.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 
 namespace Microsoft.AspNet.Http.Core
 {
diff --git a/src/Microsoft.AspNet.Http.Core/HttpResponseFeature.cs b/src/Microsoft.AspNet.Http.Core/HttpResponseFeature.cs
index d4b52878..4a5c6c76 100644
--- a/src/Microsoft.AspNet.Http.Core/HttpResponseFeature.cs
+++ b/src/Microsoft.AspNet.Http.Core/HttpResponseFeature.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 
 namespace Microsoft.AspNet.Http.Core
 {
diff --git a/src/Microsoft.AspNet.Http.Core/QueryFeature.cs b/src/Microsoft.AspNet.Http.Core/QueryFeature.cs
index e1b05f6b..d9bfb764 100644
--- a/src/Microsoft.AspNet.Http.Core/QueryFeature.cs
+++ b/src/Microsoft.AspNet.Http.Core/QueryFeature.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Microsoft.AspNet.Http.Core.Collections;
 using Microsoft.AspNet.Http.Core.Infrastructure;
 using Microsoft.AspNet.WebUtilities;
diff --git a/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs
index e57ff741..ea0aa45c 100644
--- a/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs
+++ b/src/Microsoft.AspNet.Http.Core/RequestCookiesFeature.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Infrastructure;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Microsoft.AspNet.Http.Core.Collections;
 using Microsoft.AspNet.Http.Core.Infrastructure;
 
diff --git a/src/Microsoft.AspNet.Http.Core/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http.Core/ResponseCookiesFeature.cs
index 801d6d4b..d4bf2d18 100644
--- a/src/Microsoft.AspNet.Http.Core/ResponseCookiesFeature.cs
+++ b/src/Microsoft.AspNet.Http.Core/ResponseCookiesFeature.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Microsoft.AspNet.Http.Core.Collections;
 using Microsoft.AspNet.Http.Core.Infrastructure;
 
diff --git a/src/Microsoft.AspNet.Http.Core/Security/AuthTypeContext.cs b/src/Microsoft.AspNet.Http.Core/Security/AuthTypeContext.cs
index d9e516e7..df792fc7 100644
--- a/src/Microsoft.AspNet.Http.Core/Security/AuthTypeContext.cs
+++ b/src/Microsoft.AspNet.Http.Core/Security/AuthTypeContext.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http.Security;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces.Security;
 
 namespace Microsoft.AspNet.Http.Core.Security
 {
diff --git a/src/Microsoft.AspNet.Http.Core/Security/AuthenticateContext.cs b/src/Microsoft.AspNet.Http.Core/Security/AuthenticateContext.cs
index e04326b2..95dd14a8 100644
--- a/src/Microsoft.AspNet.Http.Core/Security/AuthenticateContext.cs
+++ b/src/Microsoft.AspNet.Http.Core/Security/AuthenticateContext.cs
@@ -8,7 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Security;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces.Security;
 
 namespace Microsoft.AspNet.Http.Core.Security
 {
diff --git a/src/Microsoft.AspNet.Http.Core/Security/ChallengeContext.cs b/src/Microsoft.AspNet.Http.Core/Security/ChallengeContext.cs
index 5c8b8ef7..aa9a424f 100644
--- a/src/Microsoft.AspNet.Http.Core/Security/ChallengeContext.cs
+++ b/src/Microsoft.AspNet.Http.Core/Security/ChallengeContext.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces.Security;
 
 namespace Microsoft.AspNet.Http.Core.Security
 {
diff --git a/src/Microsoft.AspNet.Http.Core/Security/HttpAuthenticationFeature.cs b/src/Microsoft.AspNet.Http.Core/Security/HttpAuthenticationFeature.cs
index 8e40287b..f0989c42 100644
--- a/src/Microsoft.AspNet.Http.Core/Security/HttpAuthenticationFeature.cs
+++ b/src/Microsoft.AspNet.Http.Core/Security/HttpAuthenticationFeature.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Security.Claims;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces.Security;
 
 namespace Microsoft.AspNet.Http.Core.Security
 {
diff --git a/src/Microsoft.AspNet.Http.Core/Security/SignInContext.cs b/src/Microsoft.AspNet.Http.Core/Security/SignInContext.cs
index 9856e7ee..0e9383e9 100644
--- a/src/Microsoft.AspNet.Http.Core/Security/SignInContext.cs
+++ b/src/Microsoft.AspNet.Http.Core/Security/SignInContext.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Security.Claims;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces.Security;
 
 namespace Microsoft.AspNet.Http.Core.Security
 {
diff --git a/src/Microsoft.AspNet.Http.Core/Security/SignOutContext.cs b/src/Microsoft.AspNet.Http.Core/Security/SignOutContext.cs
index 4ebde735..c2ed25f0 100644
--- a/src/Microsoft.AspNet.Http.Core/Security/SignOutContext.cs
+++ b/src/Microsoft.AspNet.Http.Core/Security/SignOutContext.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces.Security;
 
 namespace Microsoft.AspNet.Http.Core.Security
 {
diff --git a/src/Microsoft.AspNet.Http.Core/WebSocketAcceptContext.cs b/src/Microsoft.AspNet.Http.Core/WebSocketAcceptContext.cs
index 3c935b52..48e3cd7c 100644
--- a/src/Microsoft.AspNet.Http.Core/WebSocketAcceptContext.cs
+++ b/src/Microsoft.AspNet.Http.Core/WebSocketAcceptContext.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 
 namespace Microsoft.AspNet.Http.Core
 {
diff --git a/src/Microsoft.AspNet.Http.Core/project.json b/src/Microsoft.AspNet.Http.Core/project.json
index 8eaabc9a..91374fa6 100644
--- a/src/Microsoft.AspNet.Http.Core/project.json
+++ b/src/Microsoft.AspNet.Http.Core/project.json
@@ -5,7 +5,7 @@
   "dependencies": {
     "Microsoft.AspNet.FeatureModel": "1.0.0-*",
     "Microsoft.AspNet.Http": "1.0.0-*",
-    "Microsoft.AspNet.HttpFeature": "1.0.0-*",
+    "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
     "Microsoft.AspNet.WebUtilities": "1.0.0-*",
     "Microsoft.Net.Http.Headers": "1.0.0-*"
 
diff --git a/src/Microsoft.AspNet.HttpFeature/AssemblyNeutralAttribute.cs b/src/Microsoft.AspNet.Http.Interfaces/AssemblyNeutralAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.HttpFeature/AssemblyNeutralAttribute.cs
rename to src/Microsoft.AspNet.Http.Interfaces/AssemblyNeutralAttribute.cs
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpApplicationFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpApplicationFeature.cs
similarity index 91%
rename from src/Microsoft.AspNet.HttpFeature/IHttpApplicationFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpApplicationFeature.cs
index 344f8735..2a885ecb 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpApplicationFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpApplicationFeature.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpApplicationFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpBufferingFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs
similarity index 89%
rename from src/Microsoft.AspNet.HttpFeature/IHttpBufferingFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs
index 53b7fd98..83a6be21 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpBufferingFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpBufferingFeature.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpBufferingFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpClientCertificateFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpClientCertificateFeature.cs
similarity index 95%
rename from src/Microsoft.AspNet.HttpFeature/IHttpClientCertificateFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpClientCertificateFeature.cs
index b70fa027..556265c1 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpClientCertificateFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpClientCertificateFeature.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpClientCertificateFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpConnectionFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs
similarity index 92%
rename from src/Microsoft.AspNet.HttpFeature/IHttpConnectionFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs
index 7598c9ce..51940f37 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpConnectionFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpConnectionFeature.cs
@@ -4,7 +4,7 @@
 using System.Net;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpConnectionFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpRequestFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs
similarity index 94%
rename from src/Microsoft.AspNet.HttpFeature/IHttpRequestFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs
index 66b5c5fa..ca178a7d 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpRequestFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestFeature.cs
@@ -6,7 +6,7 @@
 using System.IO;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpRequestFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetimeFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs
similarity index 90%
rename from src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetimeFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs
index b6bcee9c..498463db 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetimeFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpRequestLifetimeFeature.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpRequestLifetimeFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpResponseFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs
similarity index 93%
rename from src/Microsoft.AspNet.HttpFeature/IHttpResponseFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs
index aa7603be..b28700df 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpResponseFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpResponseFeature.cs
@@ -6,7 +6,7 @@
 using System.IO;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpResponseFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpSendFileFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs
similarity index 91%
rename from src/Microsoft.AspNet.HttpFeature/IHttpSendFileFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs
index be42442a..dcb598e6 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpSendFileFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpSendFileFeature.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpSendFileFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpUpgradeFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs
similarity index 90%
rename from src/Microsoft.AspNet.HttpFeature/IHttpUpgradeFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs
index 3d3f924c..98d4e60c 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpUpgradeFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpUpgradeFeature.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpUpgradeFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpWebSocketFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs
similarity index 91%
rename from src/Microsoft.AspNet.HttpFeature/IHttpWebSocketFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs
index 3d87e86b..d3aeaae6 100644
--- a/src/Microsoft.AspNet.HttpFeature/IHttpWebSocketFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IHttpWebSocketFeature.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IHttpWebSocketFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/ISession.cs b/src/Microsoft.AspNet.Http.Interfaces/ISession.cs
similarity index 93%
rename from src/Microsoft.AspNet.HttpFeature/ISession.cs
rename to src/Microsoft.AspNet.Http.Interfaces/ISession.cs
index 6a0fe403..d18fca3e 100644
--- a/src/Microsoft.AspNet.HttpFeature/ISession.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/ISession.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface ISession
diff --git a/src/Microsoft.AspNet.HttpFeature/ISessionFactory.cs b/src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs
similarity index 89%
rename from src/Microsoft.AspNet.HttpFeature/ISessionFactory.cs
rename to src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs
index 11876967..e8917db7 100644
--- a/src/Microsoft.AspNet.HttpFeature/ISessionFactory.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/ISessionFactory.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface ISessionFactory
diff --git a/src/Microsoft.AspNet.HttpFeature/ISessionFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs
similarity index 91%
rename from src/Microsoft.AspNet.HttpFeature/ISessionFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs
index 400f365b..360e407c 100644
--- a/src/Microsoft.AspNet.HttpFeature/ISessionFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/ISessionFeature.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     // TODO: Is there any reason not to flatten the Factory down into the Feature?
     [AssemblyNeutral]
diff --git a/src/Microsoft.AspNet.HttpFeature/IWebSocketAcceptContext.cs b/src/Microsoft.AspNet.Http.Interfaces/IWebSocketAcceptContext.cs
similarity index 88%
rename from src/Microsoft.AspNet.HttpFeature/IWebSocketAcceptContext.cs
rename to src/Microsoft.AspNet.Http.Interfaces/IWebSocketAcceptContext.cs
index dbcc14c7..80becb58 100644
--- a/src/Microsoft.AspNet.HttpFeature/IWebSocketAcceptContext.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/IWebSocketAcceptContext.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature
+namespace Microsoft.AspNet.Http.Interfaces
 {
     [AssemblyNeutral]
     public interface IWebSocketAcceptContext
diff --git a/src/Microsoft.AspNet.HttpFeature/Microsoft.AspNet.HttpFeature.kproj b/src/Microsoft.AspNet.Http.Interfaces/Microsoft.AspNet.Http.Interfaces.kproj
similarity index 100%
rename from src/Microsoft.AspNet.HttpFeature/Microsoft.AspNet.HttpFeature.kproj
rename to src/Microsoft.AspNet.Http.Interfaces/Microsoft.AspNet.Http.Interfaces.kproj
diff --git a/src/Microsoft.AspNet.HttpFeature/Security/IAuthTypeContext.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthTypeContext.cs
similarity index 88%
rename from src/Microsoft.AspNet.HttpFeature/Security/IAuthTypeContext.cs
rename to src/Microsoft.AspNet.Http.Interfaces/Security/IAuthTypeContext.cs
index bf3627a3..d3308720 100644
--- a/src/Microsoft.AspNet.HttpFeature/Security/IAuthTypeContext.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthTypeContext.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature.Security
+namespace Microsoft.AspNet.Http.Interfaces.Security
 {
     [AssemblyNeutral]
     public interface IAuthTypeContext
diff --git a/src/Microsoft.AspNet.HttpFeature/Security/IAuthenticateContext.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticateContext.cs
similarity index 93%
rename from src/Microsoft.AspNet.HttpFeature/Security/IAuthenticateContext.cs
rename to src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticateContext.cs
index 333c044f..1e354a81 100644
--- a/src/Microsoft.AspNet.HttpFeature/Security/IAuthenticateContext.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticateContext.cs
@@ -5,7 +5,7 @@
 using System.Security.Claims;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature.Security
+namespace Microsoft.AspNet.Http.Interfaces.Security
 {
     [AssemblyNeutral]
     public interface IAuthenticateContext
diff --git a/src/Microsoft.AspNet.HttpFeature/Security/IAuthenticationHandler.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticationHandler.cs
similarity index 92%
rename from src/Microsoft.AspNet.HttpFeature/Security/IAuthenticationHandler.cs
rename to src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticationHandler.cs
index f081744b..ca68c406 100644
--- a/src/Microsoft.AspNet.HttpFeature/Security/IAuthenticationHandler.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IAuthenticationHandler.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature.Security
+namespace Microsoft.AspNet.Http.Interfaces.Security
 {
     [AssemblyNeutral]
     public interface IAuthenticationHandler
diff --git a/src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IChallengeContext.cs
similarity index 91%
rename from src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext.cs
rename to src/Microsoft.AspNet.Http.Interfaces/Security/IChallengeContext.cs
index 5f32f318..94d64b62 100644
--- a/src/Microsoft.AspNet.HttpFeature/Security/IChallengeContext.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IChallengeContext.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature.Security
+namespace Microsoft.AspNet.Http.Interfaces.Security
 {
     [AssemblyNeutral]
     public interface IChallengeContext
diff --git a/src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthenticationFeature.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/IHttpAuthenticationFeature.cs
similarity index 89%
rename from src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthenticationFeature.cs
rename to src/Microsoft.AspNet.Http.Interfaces/Security/IHttpAuthenticationFeature.cs
index 4ee676b0..74605995 100644
--- a/src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthenticationFeature.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/Security/IHttpAuthenticationFeature.cs
@@ -4,7 +4,7 @@
 using System.Security.Claims;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature.Security
+namespace Microsoft.AspNet.Http.Interfaces.Security
 {
     [AssemblyNeutral]
     public interface IHttpAuthenticationFeature
diff --git a/src/Microsoft.AspNet.HttpFeature/Security/ISignInContext.cs b/src/Microsoft.AspNet.Http.Interfaces/Security/ISignInContext.cs
similarity index 91%
rename from src/Microsoft.AspNet.HttpFeature/Security/ISignInContext.cs
rename to src/Microsoft.AspNet.Http.Interfaces/Security/ISignInContext.cs
index 694ece38..eea09aa0 100644
--- a/src/Microsoft.AspNet.HttpFeature/Security/ISignInContext.cs
+++ b/src/Microsoft.AspNet.Http.Interfaces/Security/ISignInContext.cs
@@ -5,7 +5,7 @@
 using System.Security.Claims;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature.Security
+namespace Microsoft.AspNet.Http.Interfaces.Security
 {
     [AssemblyNeutral]
     public interface ISignInContext
diff --git a/src/Microsoft.AspNet.HttpFeature/Security/ISignOutContext .cs b/src/Microsoft.AspNet.Http.Interfaces/Security/ISignOutContext .cs
similarity index 90%
rename from src/Microsoft.AspNet.HttpFeature/Security/ISignOutContext .cs
rename to src/Microsoft.AspNet.Http.Interfaces/Security/ISignOutContext .cs
index 232db13a..fd4fe89b 100644
--- a/src/Microsoft.AspNet.HttpFeature/Security/ISignOutContext .cs	
+++ b/src/Microsoft.AspNet.Http.Interfaces/Security/ISignOutContext .cs	
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.HttpFeature.Security
+namespace Microsoft.AspNet.Http.Interfaces.Security
 {
     [AssemblyNeutral]
     public interface ISignOutContext 
diff --git a/src/Microsoft.AspNet.HttpFeature/project.json b/src/Microsoft.AspNet.Http.Interfaces/project.json
similarity index 100%
rename from src/Microsoft.AspNet.HttpFeature/project.json
rename to src/Microsoft.AspNet.Http.Interfaces/project.json
diff --git a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs
index 9ff85950..4a97095e 100644
--- a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs
+++ b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs
@@ -14,8 +14,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.HttpFeature;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces;
+using Microsoft.AspNet.Http.Interfaces.Security;
 using Microsoft.AspNet.Http.Core.Security;
 
 namespace Microsoft.AspNet.Owin
diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs
index 3332221b..469933cf 100644
--- a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs
+++ b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs
@@ -15,8 +15,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.HttpFeature;
-using Microsoft.AspNet.HttpFeature.Security;
+using Microsoft.AspNet.Http.Interfaces;
+using Microsoft.AspNet.Http.Interfaces.Security;
 
 namespace Microsoft.AspNet.Owin
 {
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs b/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
index 15ec0a01..20e73c29 100644
--- a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
+++ b/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptAdapter.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Net.WebSockets;
 using System.Threading.Tasks;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 
 namespace Microsoft.AspNet.Owin
 {
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs b/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs
index 1e847e62..063f43ee 100644
--- a/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs
+++ b/src/Microsoft.AspNet.Owin/WebSockets/OwinWebSocketAcceptContext.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 
 namespace Microsoft.AspNet.Owin
 {
diff --git a/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs b/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs
index 9660a5d0..1d43a8a8 100644
--- a/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs
+++ b/src/Microsoft.AspNet.Owin/WebSockets/WebSocketAcceptAdapter.cs
@@ -6,7 +6,7 @@
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 
 namespace Microsoft.AspNet.Owin
 {
diff --git a/src/Microsoft.AspNet.Owin/project.json b/src/Microsoft.AspNet.Owin/project.json
index ce8c5b30..ffa82b3a 100644
--- a/src/Microsoft.AspNet.Owin/project.json
+++ b/src/Microsoft.AspNet.Owin/project.json
@@ -5,7 +5,7 @@
         "Microsoft.AspNet.Http": "1.0.0-*",
         "Microsoft.AspNet.FeatureModel": "1.0.0-*",
         "Microsoft.AspNet.Http.Core": "1.0.0-*",
-        "Microsoft.AspNet.HttpFeature": { "version": "1.0.0-*", "type": "build" }
+        "Microsoft.AspNet.Http.Interfaces": { "version": "1.0.0-*", "type": "build" }
     },
     "frameworks": {
         "aspnet50": { },
diff --git a/test/Microsoft.AspNet.FeatureModel.Tests/project.json b/test/Microsoft.AspNet.FeatureModel.Tests/project.json
index 867e8889..6dfc567e 100644
--- a/test/Microsoft.AspNet.FeatureModel.Tests/project.json
+++ b/test/Microsoft.AspNet.FeatureModel.Tests/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "Microsoft.AspNet.FeatureModel": "1.0.0-*",
     "Microsoft.AspNet.Http": "1.0.0-*",
-    "Microsoft.AspNet.HttpFeature": "1.0.0-*",
+    "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
     "xunit.runner.kre": "1.0.0-*"
   },
   "commands": {
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpContextTests.cs
index 2b04823c..146967c1 100644
--- a/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpContextTests.cs
+++ b/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpContextTests.cs
@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Xunit;
 
 namespace Microsoft.AspNet.Http.Core.Tests
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpRequestTests.cs b/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpRequestTests.cs
index e2518fd1..7c5557bb 100644
--- a/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpRequestTests.cs
+++ b/test/Microsoft.AspNet.Http.Core.Tests/DefaultHttpRequestTests.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Xunit;
 
 namespace Microsoft.AspNet.Http.Core.Tests
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/QueryFeatureTests.cs b/test/Microsoft.AspNet.Http.Core.Tests/QueryFeatureTests.cs
index f76fdb25..91846bc0 100644
--- a/test/Microsoft.AspNet.Http.Core.Tests/QueryFeatureTests.cs
+++ b/test/Microsoft.AspNet.Http.Core.Tests/QueryFeatureTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Moq;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Http.Core.Tests/project.json b/test/Microsoft.AspNet.Http.Core.Tests/project.json
index 3d6bee5e..df6823dc 100644
--- a/test/Microsoft.AspNet.Http.Core.Tests/project.json
+++ b/test/Microsoft.AspNet.Http.Core.Tests/project.json
@@ -2,7 +2,7 @@
     "dependencies": {
         "Microsoft.AspNet.FeatureModel": "1.0.0-*",
         "Microsoft.AspNet.Http": "1.0.0-*",
-        "Microsoft.AspNet.HttpFeature": "1.0.0-*",
+        "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
         "Microsoft.AspNet.Http.Core": "1.0.0-*",
         "xunit.runner.kre": "1.0.0-*"
     },
diff --git a/test/Microsoft.AspNet.Http.Extensions.Tests/project.json b/test/Microsoft.AspNet.Http.Extensions.Tests/project.json
index 55f53f5f..ddf07a38 100644
--- a/test/Microsoft.AspNet.Http.Extensions.Tests/project.json
+++ b/test/Microsoft.AspNet.Http.Extensions.Tests/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
-    "Microsoft.AspNet.HttpFeature": "1.0.0-*",
+    "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
     "Microsoft.AspNet.Http.Core": "1.0.0-*",
     "xunit.runner.kre": "1.0.0-*"
   },
diff --git a/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs
index e49637ed..ae1a7c59 100644
--- a/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Microsoft.AspNet.Http.Core;
 using Shouldly;
 using Xunit;
diff --git a/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs
index b0ef791a..bc94b571 100644
--- a/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Microsoft.AspNet.Http.Core;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Http.Tests/project.json b/test/Microsoft.AspNet.Http.Tests/project.json
index 134db2ae..f6549fc7 100644
--- a/test/Microsoft.AspNet.Http.Tests/project.json
+++ b/test/Microsoft.AspNet.Http.Tests/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
-    "Microsoft.AspNet.HttpFeature": "1.0.0-*",
+    "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
     "Microsoft.AspNet.Http.Core": "1.0.0-*",
     "Microsoft.AspNet.Testing": "1.0.0-*",
     "xunit.runner.kre": "1.0.0-*"
diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs
index 66397215..93becf8a 100644
--- a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs
+++ b/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.HttpFeature;
+using Microsoft.AspNet.Http.Interfaces;
 using Xunit;
 
 namespace Microsoft.AspNet.Owin
diff --git a/test/Microsoft.AspNet.Owin.Tests/project.json b/test/Microsoft.AspNet.Owin.Tests/project.json
index 4725d69b..f0caf021 100644
--- a/test/Microsoft.AspNet.Owin.Tests/project.json
+++ b/test/Microsoft.AspNet.Owin.Tests/project.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "Microsoft.AspNet.FeatureModel": "1.0.0-*",
     "Microsoft.AspNet.Http": "1.0.0-*",
-    "Microsoft.AspNet.HttpFeature": "1.0.0-*",
+    "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
     "Microsoft.AspNet.Owin": "1.0.0-*",
     "Microsoft.AspNet.Http.Core": "1.0.0-*",
     "xunit.runner.kre": "1.0.0-*"