diff --git a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
index 4f9777011b..9a5023f9b2 100644
--- a/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/FeatureContext.cs
@@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Server.WebListener
         IHttpRequestLifetimeFeature,
         IHttpWebSocketFeature,
         IHttpAuthenticationFeature,
-        IHttpOpaqueUpgradeFeature
+        IHttpUpgradeFeature
     {
         private RequestContext _requestContext;
         private FeatureCollection _features;
@@ -106,7 +106,7 @@ namespace Microsoft.AspNet.Server.WebListener
             // Win8+
             if (WebSocketHelpers.AreWebSocketsSupported)
             {
-                _features.Add(typeof(IHttpOpaqueUpgradeFeature), this);
+                _features.Add(typeof(IHttpUpgradeFeature), this);
                 _features.Add(typeof(IHttpWebSocketFeature), this);
             }
 
@@ -380,12 +380,12 @@ namespace Microsoft.AspNet.Server.WebListener
             _requestContext.Abort();
         }
 
-        bool IHttpOpaqueUpgradeFeature.IsUpgradableRequest
+        bool IHttpUpgradeFeature.IsUpgradableRequest
         {
             get { return _requestContext.IsUpgradableRequest; }
         }
 
-        Task<Stream> IHttpOpaqueUpgradeFeature.UpgradeAsync()
+        Task<Stream> IHttpUpgradeFeature.UpgradeAsync()
         {
             return _requestContext.UpgradeAsync();
         }
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
index 6a72bffb2c..48c6e25f1d 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
@@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Server.WebListener
                 var httpContext = new DefaultHttpContext((IFeatureCollection)env);
                 try
                 {
-                    var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>();
+                    var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
                     Assert.NotNull(opaqueFeature);
                 }
                 catch (Exception ex)
@@ -70,7 +70,7 @@ namespace Microsoft.AspNet.Server.WebListener
                 await httpContext.Response.WriteAsync("Hello World");
                 try
                 {
-                    var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>();
+                    var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
                     Assert.NotNull(opaqueFeature);
                     await opaqueFeature.UpgradeAsync();
                     upgradeThrew = false;
@@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Server.WebListener
             {
                 var httpContext = new DefaultHttpContext((IFeatureCollection)env);
                 httpContext.Response.Headers["Upgrade"] = "websocket"; // Win8.1 blocks anything but WebSockets
-                var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>();
+                var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
                 Assert.NotNull(opaqueFeature);
                 Assert.True(opaqueFeature.IsUpgradableRequest);
                 await opaqueFeature.UpgradeAsync();
@@ -145,7 +145,7 @@ namespace Microsoft.AspNet.Server.WebListener
                 try
                 {
                     httpContext.Response.Headers["Upgrade"] = "websocket"; // Win8.1 blocks anything but WebSockets
-                    var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>();
+                    var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
                     Assert.NotNull(opaqueFeature);
                     Assert.True(opaqueFeature.IsUpgradableRequest);
                     var opaqueStream = await opaqueFeature.UpgradeAsync();
@@ -186,7 +186,7 @@ namespace Microsoft.AspNet.Server.WebListener
                 var httpContext = new DefaultHttpContext((IFeatureCollection)env);
                 try
                 {
-                    var opaqueFeature = httpContext.GetFeature<IHttpOpaqueUpgradeFeature>();
+                    var opaqueFeature = httpContext.GetFeature<IHttpUpgradeFeature>();
                     Assert.NotNull(opaqueFeature);
                     Assert.False(opaqueFeature.IsUpgradableRequest);
                 }