diff --git a/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs b/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs
index 4507d384cf..59b5cbd8fa 100644
--- a/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs
+++ b/src/Microsoft.AspNet.Hosting/HttpContextAccessor.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Hosting
 #if ASPNET50
         private const string LogicalDataKey = "__HttpContext_Current__";
 
-        public HttpContext Value
+        public HttpContext HttpContext
         {
             get
             {
@@ -32,7 +32,7 @@ namespace Microsoft.AspNet.Hosting
 
 #elif ASPNETCORE50
         private AsyncLocal<HttpContext> _httpContextCurrent = new AsyncLocal<HttpContext>();
-        public HttpContext Value
+        public HttpContext HttpContext
         {
             get
             {
diff --git a/src/Microsoft.AspNet.Hosting/IHttpContextAccessor.cs b/src/Microsoft.AspNet.Hosting/IHttpContextAccessor.cs
index 563808d7f8..8b1719880b 100644
--- a/src/Microsoft.AspNet.Hosting/IHttpContextAccessor.cs
+++ b/src/Microsoft.AspNet.Hosting/IHttpContextAccessor.cs
@@ -7,6 +7,6 @@ namespace Microsoft.AspNet.Hosting
 {
     public interface IHttpContextAccessor
     {
-        HttpContext Value { get; set; }
+        HttpContext HttpContext { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNet.Hosting/Internal/PipelineInstance.cs b/src/Microsoft.AspNet.Hosting/Internal/PipelineInstance.cs
index 9b8a84ca4b..b2f67c2eca 100644
--- a/src/Microsoft.AspNet.Hosting/Internal/PipelineInstance.cs
+++ b/src/Microsoft.AspNet.Hosting/Internal/PipelineInstance.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Hosting.Internal
         public Task Invoke(IFeatureCollection featureCollection)
         {
             var httpContext = _httpContextFactory.CreateHttpContext(featureCollection);
-            _contextAccessor.Value = httpContext;
+            _contextAccessor.HttpContext = httpContext;
             return _requestDelegate(httpContext);
         }
 
diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs
index 8d52493b27..9838e1d0b3 100644
--- a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs
+++ b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs
@@ -46,7 +46,7 @@ namespace Microsoft.AspNet.TestHost
                 app.Run(context =>
                 {
                     var accessor = app.ApplicationServices.GetRequiredService<IHttpContextAccessor>();
-                    return context.Response.WriteAsync("HasContext:"+(accessor.Value != null));
+                    return context.Response.WriteAsync("HasContext:"+(accessor.HttpContext != null));
                 });
             });