diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
index 81c5c296f3..e33e75dcb0 100644
--- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
+++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs
@@ -394,7 +394,7 @@ namespace Microsoft.AspNet.Mvc
             var disposableValue = data as IDisposable;
             if (disposableValue != null)
             {
-                Response.OnCompletedDispose(disposableValue);
+                Response.RegisterForDispose(disposableValue);
             }
 
             return new JsonResult(data);
@@ -417,7 +417,7 @@ namespace Microsoft.AspNet.Mvc
             var disposableValue = data as IDisposable;
             if (disposableValue != null)
             {
-                Response.OnCompletedDispose(disposableValue);
+                Response.RegisterForDispose(disposableValue);
             }
 
             return new JsonResult(data, serializerSettings);
@@ -705,7 +705,7 @@ namespace Microsoft.AspNet.Mvc
         {
             if (fileStream != null)
             {
-                Response.OnCompletedDispose(fileStream);
+                Response.RegisterForDispose(fileStream);
             }
 
             return new FileStreamResult(fileStream, contentType) { FileDownloadName = fileDownloadName };
@@ -769,7 +769,7 @@ namespace Microsoft.AspNet.Mvc
             var disposableValue = value as IDisposable;
             if (disposableValue != null)
             {
-                Response.OnCompletedDispose(disposableValue);
+                Response.RegisterForDispose(disposableValue);
             }
 
             return new HttpNotFoundObjectResult(value);
@@ -795,7 +795,7 @@ namespace Microsoft.AspNet.Mvc
             var disposableValue = error as IDisposable;
             if (disposableValue != null)
             {
-                Response.OnCompletedDispose(disposableValue);
+                Response.RegisterForDispose(disposableValue);
             }
 
             return new BadRequestObjectResult(error);
@@ -823,7 +823,7 @@ namespace Microsoft.AspNet.Mvc
             var disposableValue = value as IDisposable;
             if (disposableValue != null)
             {
-                Response.OnCompletedDispose(disposableValue);
+                Response.RegisterForDispose(disposableValue);
             }
 
             return new CreatedResult(uri, value);
@@ -893,7 +893,7 @@ namespace Microsoft.AspNet.Mvc
             var disposableValue = value as IDisposable;
             if (disposableValue != null)
             {
-                Response.OnCompletedDispose(disposableValue);
+                Response.RegisterForDispose(disposableValue);
             }
 
             return new CreatedAtActionResult(actionName, controllerName, routeValues, value);
@@ -936,7 +936,7 @@ namespace Microsoft.AspNet.Mvc
             var disposableValue = value as IDisposable;
             if (disposableValue != null)
             {
-                Response.OnCompletedDispose(disposableValue);
+                Response.RegisterForDispose(disposableValue);
             }
 
             return new CreatedAtRouteResult(routeName, routeValues, value);
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs
index 8d9d12df29..acfbcf3044 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs
@@ -429,7 +429,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
             var uri = new Uri("/test/url", UriKind.Relative);
 
             var controller = new TestableController()
@@ -447,7 +447,7 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.Equal(uri.OriginalString, result.Location);
             Assert.Same(input, result.Value);
             mockHttpContext.Verify(
-                x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()),
+                x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()),
                 Times.Once());
         }
 
@@ -516,7 +516,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
 
             var controller = new TestableController()
             {
@@ -533,7 +533,7 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.Equal("SampleAction", result.ActionName);
             Assert.Same(input, result.Value);
             mockHttpContext.Verify(
-                x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()),
+                x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()),
                 Times.Once());
         }
 
@@ -599,7 +599,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
 
             var controller = new TestableController()
             {
@@ -616,7 +616,7 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.Equal("SampleRoute", result.RouteName);
             Assert.Same(input, result.Value);
             mockHttpContext.Verify(
-                x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()),
+                x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()),
                 Times.Once());
         }
 
@@ -693,7 +693,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
             var controller = new TestableController()
             {
                 ActionContext = new ActionContext(mockHttpContext.Object, new RouteData(), new ActionDescriptor())
@@ -715,7 +715,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
 
             var controller = new TestableController()
             {
@@ -732,7 +732,7 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.Equal("application/pdf", result.ContentType.ToString());
             Assert.Equal("someDownloadName", result.FileDownloadName);
             mockHttpContext.Verify(
-                x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()),
+                x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()),
                 Times.Once());
         }
 
@@ -784,7 +784,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
 
             var controller = new TestableController()
             {
@@ -800,7 +800,7 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode);
             Assert.Same(input, result.Value);
             mockHttpContext.Verify(
-                x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()),
+                x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()),
                 Times.Once());
         }
 
@@ -839,7 +839,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
 
             var controller = new TestableController()
             {
@@ -855,7 +855,7 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.Equal(StatusCodes.Status400BadRequest, result.StatusCode);
             Assert.Same(input, result.Value);
             mockHttpContext.Verify(
-                x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()),
+                x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()),
                 Times.Once());
         }
 
@@ -1052,7 +1052,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
 
             var controller = new TestableController()
             {
@@ -1067,7 +1067,7 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.IsType<JsonResult>(result);
             Assert.Same(input, result.Value);
             mockHttpContext.Verify(
-                x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()),
+                x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()),
                 Times.Once());
         }
 
@@ -1076,7 +1076,7 @@ namespace Microsoft.AspNet.Mvc.Test
         {
             // Arrange
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
 
             var controller = new TestableController()
             {
@@ -1092,7 +1092,7 @@ namespace Microsoft.AspNet.Mvc.Test
             Assert.IsType<JsonResult>(result);
             Assert.Same(input, result.Value);
             mockHttpContext.Verify(
-                x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()),
+                x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()),
                 Times.Once());
         }
 
diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
index a4bbd1673e..32341cbf72 100644
--- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
+++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
@@ -149,7 +149,7 @@ namespace Microsoft.AspNet.Mvc
             var contentType = "text/html";
             var fileName = "Created.html";
             var mockHttpContext = new Mock<DefaultHttpContext>();
-            mockHttpContext.Setup(x => x.Response.OnCompletedDispose(It.IsAny<IDisposable>()));
+            mockHttpContext.Setup(x => x.Response.RegisterForDispose(It.IsAny<IDisposable>()));
             var controller = new TestabilityController()
             {
                 ActionContext = new ActionContext(mockHttpContext.Object, new RouteData(), new ActionDescriptor())