diff --git a/samples/RoutingSample.Web/HelloExtension/EndpointDataSourceBuilderExtensions.cs b/samples/RoutingSample.Web/HelloExtension/EndpointDataSourceBuilderExtensions.cs
index 6c2a4639a5..3d1f53673a 100644
--- a/samples/RoutingSample.Web/HelloExtension/EndpointDataSourceBuilderExtensions.cs
+++ b/samples/RoutingSample.Web/HelloExtension/EndpointDataSourceBuilderExtensions.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Builder
                .Build();
 
             return builder.MapEndpoint(
-                (next) => pipeline,
+                pipeline,
                 template,
                 "Hello");
         }
diff --git a/src/Microsoft.AspNetCore.Routing/Builder/MapEndpointEndpointDataSourceBuilderExtensions.cs b/src/Microsoft.AspNetCore.Routing/Builder/MapEndpointEndpointDataSourceBuilderExtensions.cs
index 2a47a1b87b..f1e73ffde1 100644
--- a/src/Microsoft.AspNetCore.Routing/Builder/MapEndpointEndpointDataSourceBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.Routing/Builder/MapEndpointEndpointDataSourceBuilderExtensions.cs
@@ -14,35 +14,35 @@ namespace Microsoft.AspNetCore.Builder
     {
         public static MatcherEndpointBuilder MapEndpoint(
             this EndpointDataSourceBuilder builder,
-            Func<RequestDelegate, RequestDelegate> invoker,
+            RequestDelegate requestDelegate,
             string pattern,
             string displayName)
         {
-            return MapEndpoint(builder, invoker, pattern, displayName, metadata: null);
+            return MapEndpoint(builder, requestDelegate, pattern, displayName, metadata: null);
         }
 
         public static MatcherEndpointBuilder MapEndpoint(
             this EndpointDataSourceBuilder builder,
-            Func<RequestDelegate, RequestDelegate> invoker,
+            RequestDelegate requestDelegate,
             RoutePattern pattern,
             string displayName)
         {
-            return MapEndpoint(builder, invoker, pattern, displayName, metadata: null);
+            return MapEndpoint(builder, requestDelegate, pattern, displayName, metadata: null);
         }
 
         public static MatcherEndpointBuilder MapEndpoint(
             this EndpointDataSourceBuilder builder,
-            Func<RequestDelegate, RequestDelegate> invoker,
+            RequestDelegate requestDelegate,
             string pattern,
             string displayName,
             IList<object> metadata)
         {
-            return MapEndpoint(builder, invoker, RoutePatternFactory.Parse(pattern), displayName, metadata);
+            return MapEndpoint(builder, requestDelegate, RoutePatternFactory.Parse(pattern), displayName, metadata);
         }
 
         public static MatcherEndpointBuilder MapEndpoint(
             this EndpointDataSourceBuilder builder,
-            Func<RequestDelegate, RequestDelegate> invoker,
+            RequestDelegate requestDelegate,
             RoutePattern pattern,
             string displayName,
             IList<object> metadata)
@@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Builder
             const int defaultOrder = 0;
 
             var endpointBuilder = new MatcherEndpointBuilder(
-               invoker,
+               requestDelegate,
                pattern,
                defaultOrder);
             endpointBuilder.DisplayName = displayName;
diff --git a/src/Microsoft.AspNetCore.Routing/BuilderEndpointDataSource.cs b/src/Microsoft.AspNetCore.Routing/BuilderEndpointDataSource.cs
index bf66ab8719..d119f80ed2 100644
--- a/src/Microsoft.AspNetCore.Routing/BuilderEndpointDataSource.cs
+++ b/src/Microsoft.AspNetCore.Routing/BuilderEndpointDataSource.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Primitives;
 
diff --git a/src/Microsoft.AspNetCore.Routing/EndpointBuilder.cs b/src/Microsoft.AspNetCore.Routing/EndpointBuilder.cs
index 2187e387a3..283c8a7cb6 100644
--- a/src/Microsoft.AspNetCore.Routing/EndpointBuilder.cs
+++ b/src/Microsoft.AspNetCore.Routing/EndpointBuilder.cs
@@ -2,6 +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.AspNetCore.Http;
 
 namespace Microsoft.AspNetCore.Routing
 {
diff --git a/src/Microsoft.AspNetCore.Routing/Matching/MatcherEndpointBuilder.cs b/src/Microsoft.AspNetCore.Routing/Matching/MatcherEndpointBuilder.cs
index c53112fea5..c351aeb4da 100644
--- a/src/Microsoft.AspNetCore.Routing/Matching/MatcherEndpointBuilder.cs
+++ b/src/Microsoft.AspNetCore.Routing/Matching/MatcherEndpointBuilder.cs
@@ -10,26 +10,26 @@ namespace Microsoft.AspNetCore.Routing.Matching
 {
     public sealed class MatcherEndpointBuilder : EndpointBuilder
     {
-        public Func<RequestDelegate, RequestDelegate> Invoker { get; set; }
+        public RequestDelegate RequestDelegate { get; set; }
 
         public RoutePattern RoutePattern { get; set; }
 
         public int Order { get; set; }
 
         public MatcherEndpointBuilder(
-           Func<RequestDelegate, RequestDelegate> invoker,
+           RequestDelegate requestDelegate,
            RoutePattern routePattern,
            int order)
         {
-            Invoker = invoker;
+            RequestDelegate = requestDelegate;
             RoutePattern = routePattern;
             Order = order;
         }
 
         public override Endpoint Build()
         {
-            var matcherEndpoint = new MatcherEndpoint(
-                Invoker,
+            var matcherEndpoint = new RouteEndpoint(
+                RequestDelegate,
                 RoutePattern,
                 Order,
                 new EndpointMetadataCollection(Metadata),
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Builder/MapEndpointEndpointDataSourceBuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Builder/MapEndpointEndpointDataSourceBuilderExtensionsTest.cs
index e854851fc8..5a425c3075 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Builder/MapEndpointEndpointDataSourceBuilderExtensionsTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Builder/MapEndpointEndpointDataSourceBuilderExtensionsTest.cs
@@ -19,14 +19,14 @@ namespace Microsoft.AspNetCore.Builder
         {
             // Arrange
             var builder = new DefaultEndpointDataSourceBuilder();
-            Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
+            RequestDelegate requestDelegate = (d) => null;
 
             // Act
-            var endpointBuilder = builder.MapEndpoint(invoker, "/", "Display name!");
+            var endpointBuilder = builder.MapEndpoint(requestDelegate, "/", "Display name!");
 
             // Assert
             Assert.Equal(endpointBuilder, Assert.Single(builder.Endpoints));
-            Assert.Equal(invoker, endpointBuilder.Invoker);
+            Assert.Equal(requestDelegate, endpointBuilder.RequestDelegate);
             Assert.Equal("Display name!", endpointBuilder.DisplayName);
             Assert.Equal("/", endpointBuilder.RoutePattern.RawText);
         }
@@ -36,14 +36,14 @@ namespace Microsoft.AspNetCore.Builder
         {
             // Arrange
             var builder = new DefaultEndpointDataSourceBuilder();
-            Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
+            RequestDelegate requestDelegate = (d) => null;
 
             // Act
-            var endpointBuilder = builder.MapEndpoint(invoker, RoutePatternFactory.Parse("/"), "Display name!");
+            var endpointBuilder = builder.MapEndpoint(requestDelegate, RoutePatternFactory.Parse("/"), "Display name!");
 
             // Assert
             Assert.Equal(endpointBuilder, Assert.Single(builder.Endpoints));
-            Assert.Equal(invoker, endpointBuilder.Invoker);
+            Assert.Equal(requestDelegate, endpointBuilder.RequestDelegate);
             Assert.Equal("Display name!", endpointBuilder.DisplayName);
             Assert.Equal("/", endpointBuilder.RoutePattern.RawText);
         }
@@ -54,14 +54,14 @@ namespace Microsoft.AspNetCore.Builder
             // Arrange
             var metadata = new object();
             var builder = new DefaultEndpointDataSourceBuilder();
-            Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
+            RequestDelegate requestDelegate = (d) => null;
 
             // Act
-            var endpointBuilder = builder.MapEndpoint(invoker, "/", "Display name!", new[] { metadata });
+            var endpointBuilder = builder.MapEndpoint(requestDelegate, "/", "Display name!", new[] { metadata });
 
             // Assert
             Assert.Equal(endpointBuilder, Assert.Single(builder.Endpoints));
-            Assert.Equal(invoker, endpointBuilder.Invoker);
+            Assert.Equal(requestDelegate, endpointBuilder.RequestDelegate);
             Assert.Equal("Display name!", endpointBuilder.DisplayName);
             Assert.Equal("/", endpointBuilder.RoutePattern.RawText);
             Assert.Equal(metadata, Assert.Single(endpointBuilder.Metadata));
@@ -73,14 +73,14 @@ namespace Microsoft.AspNetCore.Builder
             // Arrange
             var metadata = new object();
             var builder = new DefaultEndpointDataSourceBuilder();
-            Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
+            RequestDelegate requestDelegate = (d) => null;
 
             // Act
-            var endpointBuilder = builder.MapEndpoint(invoker, RoutePatternFactory.Parse("/"), "Display name!", new[] { metadata });
+            var endpointBuilder = builder.MapEndpoint(requestDelegate, RoutePatternFactory.Parse("/"), "Display name!", new[] { metadata });
 
             // Assert
             Assert.Equal(endpointBuilder, Assert.Single(builder.Endpoints));
-            Assert.Equal(invoker, endpointBuilder.Invoker);
+            Assert.Equal(requestDelegate, endpointBuilder.RequestDelegate);
             Assert.Equal("Display name!", endpointBuilder.DisplayName);
             Assert.Equal("/", endpointBuilder.RoutePattern.RawText);
             Assert.Equal(metadata, Assert.Single(endpointBuilder.Metadata));
diff --git a/test/Microsoft.AspNetCore.Routing.Tests/Matching/MatcherEndpointBuilderTest.cs b/test/Microsoft.AspNetCore.Routing.Tests/Matching/MatcherEndpointBuilderTest.cs
index acfc096914..3d6e44160b 100644
--- a/test/Microsoft.AspNetCore.Routing.Tests/Matching/MatcherEndpointBuilderTest.cs
+++ b/test/Microsoft.AspNetCore.Routing.Tests/Matching/MatcherEndpointBuilderTest.cs
@@ -17,18 +17,18 @@ namespace Microsoft.AspNetCore.Routing.Matching
         {
             const int defaultOrder = 0;
             object metadata = new object();
-            Func<RequestDelegate, RequestDelegate> invoker = (d) => null;
+            RequestDelegate requestDelegate = (d) => null;
 
-            var builder = new MatcherEndpointBuilder(invoker, RoutePatternFactory.Parse("/"), defaultOrder)
+            var builder = new MatcherEndpointBuilder(requestDelegate, RoutePatternFactory.Parse("/"), defaultOrder)
             {
                 DisplayName = "Display name!",
                 Metadata = { metadata }
             };
 
-            var endpoint = Assert.IsType<MatcherEndpoint>(builder.Build());
+            var endpoint = Assert.IsType<RouteEndpoint>(builder.Build());
             Assert.Equal("Display name!", endpoint.DisplayName);
             Assert.Equal(defaultOrder, endpoint.Order);
-            Assert.Equal(invoker, endpoint.Invoker);
+            Assert.Equal(requestDelegate, endpoint.RequestDelegate);
             Assert.Equal("/", endpoint.RoutePattern.RawText);
             Assert.Equal(metadata, Assert.Single(endpoint.Metadata));
         }