diff --git a/src/Microsoft.AspNetCore.Http.Abstractions/Routing/EndpointHttpContextExtensions.cs b/src/Microsoft.AspNetCore.Http.Abstractions/Routing/EndpointHttpContextExtensions.cs
index bf4a5ed046..642af5f4d5 100644
--- a/src/Microsoft.AspNetCore.Http.Abstractions/Routing/EndpointHttpContextExtensions.cs
+++ b/src/Microsoft.AspNetCore.Http.Abstractions/Routing/EndpointHttpContextExtensions.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.AspNetCore.Http.Features;
 
-namespace Microsoft.AspNetCore.Http
+namespace Microsoft.AspNetCore.Http.Endpoints
 {
     /// <summary>
     /// Extension methods to expose Endpoint on HttpContext.
diff --git a/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs b/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs
index 291ccc3893..8c7e5d1a50 100644
--- a/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs
+++ b/src/Microsoft.AspNetCore.Http/Internal/ApplicationBuilder.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Endpoints;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Internal;
diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/EndpointHttpContextExtensionsTests.cs b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/EndpointHttpContextExtensionsTests.cs
index c34f06f380..b65af91f4f 100644
--- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/EndpointHttpContextExtensionsTests.cs
+++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/EndpointHttpContextExtensionsTests.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http.Endpoints;
 using Microsoft.AspNetCore.Http.Features;
 using Xunit;
 
diff --git a/test/Microsoft.AspNetCore.Http.Tests/Internal/ApplicationBuilderTests.cs b/test/Microsoft.AspNetCore.Http.Tests/Internal/ApplicationBuilderTests.cs
index cee2042aae..2c57489f91 100644
--- a/test/Microsoft.AspNetCore.Http.Tests/Internal/ApplicationBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.Http.Tests/Internal/ApplicationBuilderTests.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Http.Endpoints;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Builder.Internal