diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs
index 49911c71c..cadd57471 100644
--- a/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs
+++ b/src/Microsoft.AspNetCore.Server.Kestrel/Http/Frame.Generated.cs
@@ -2,22 +2,22 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Http 
+namespace Microsoft.AspNetCore.Server.Kestrel.Http
 {
     public partial class Frame
     {
         private static readonly Type IHttpRequestFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestFeature);
         private static readonly Type IHttpResponseFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpResponseFeature);
         private static readonly Type IHttpRequestIdentifierFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestIdentifierFeature);
-        private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature);
+        private static readonly Type IServiceProvidersFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature);
         private static readonly Type IHttpRequestLifetimeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpRequestLifetimeFeature);
         private static readonly Type IHttpConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpConnectionFeature);
         private static readonly Type IHttpAuthenticationFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Authentication.IHttpAuthenticationFeature);
-        private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature);
-        private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature);
+        private static readonly Type IQueryFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature);
+        private static readonly Type IFormFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature);
         private static readonly Type IHttpUpgradeFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpUpgradeFeature);
-        private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature);
-        private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature);
+        private static readonly Type IResponseCookiesFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature);
+        private static readonly Type IItemsFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature);
         private static readonly Type ITlsConnectionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ITlsConnectionFeature);
         private static readonly Type IHttpWebSocketFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.IHttpWebSocketFeature);
         private static readonly Type ISessionFeatureType = typeof(global::Microsoft.AspNetCore.Http.Features.ISessionFeature);
@@ -75,7 +75,7 @@ private object FastFeatureGet(Type key)
             {
                 return _currentIHttpRequestIdentifierFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature))
             {
                 return _currentIServiceProvidersFeature;
             }
@@ -91,11 +91,11 @@ private object FastFeatureGet(Type key)
             {
                 return _currentIHttpAuthenticationFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature))
             {
                 return _currentIQueryFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature))
             {
                 return _currentIFormFeature;
             }
@@ -103,11 +103,11 @@ private object FastFeatureGet(Type key)
             {
                 return _currentIHttpUpgradeFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature))
             {
                 return _currentIResponseCookiesFeature;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature))
             {
                 return _currentIItemsFeature;
             }
@@ -149,7 +149,7 @@ private void FastFeatureSet(Type key, object feature)
                 _currentIHttpRequestIdentifierFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature))
             {
                 _currentIServiceProvidersFeature = feature;
                 return;
@@ -169,12 +169,12 @@ private void FastFeatureSet(Type key, object feature)
                 _currentIHttpAuthenticationFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IQueryFeature))
             {
                 _currentIQueryFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IFormFeature))
             {
                 _currentIFormFeature = feature;
                 return;
@@ -184,12 +184,12 @@ private void FastFeatureSet(Type key, object feature)
                 _currentIHttpUpgradeFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature))
             {
                 _currentIResponseCookiesFeature = feature;
                 return;
             }
-            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature))
+            if (key == typeof(global::Microsoft.AspNetCore.Http.Features.IItemsFeature))
             {
                 _currentIItemsFeature = feature;
                 return;
@@ -233,7 +233,7 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
             }
             if (_currentIServiceProvidersFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IServiceProvidersFeature);
+                yield return new KeyValuePair<Type, object>(IServiceProvidersFeatureType, _currentIServiceProvidersFeature as global::Microsoft.AspNetCore.Http.Features.IServiceProvidersFeature);
             }
             if (_currentIHttpRequestLifetimeFeature != null)
             {
@@ -249,11 +249,11 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
             }
             if (_currentIQueryFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IQueryFeature);
+                yield return new KeyValuePair<Type, object>(IQueryFeatureType, _currentIQueryFeature as global::Microsoft.AspNetCore.Http.Features.IQueryFeature);
             }
             if (_currentIFormFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IFormFeature);
+                yield return new KeyValuePair<Type, object>(IFormFeatureType, _currentIFormFeature as global::Microsoft.AspNetCore.Http.Features.IFormFeature);
             }
             if (_currentIHttpUpgradeFeature != null)
             {
@@ -261,11 +261,11 @@ private IEnumerable<KeyValuePair<Type, object>> FastEnumerable()
             }
             if (_currentIResponseCookiesFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IResponseCookiesFeature);
+                yield return new KeyValuePair<Type, object>(IResponseCookiesFeatureType, _currentIResponseCookiesFeature as global::Microsoft.AspNetCore.Http.Features.IResponseCookiesFeature);
             }
             if (_currentIItemsFeature != null)
             {
-                yield return new KeyValuePair<Type, object>(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.Internal.IItemsFeature);
+                yield return new KeyValuePair<Type, object>(IItemsFeatureType, _currentIItemsFeature as global::Microsoft.AspNetCore.Http.Features.IItemsFeature);
             }
             if (_currentITlsConnectionFeature != null)
             {
diff --git a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
index d4504cc9c..33e1e083d 100644
--- a/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
+++ b/tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/FrameFeatureCollection.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Http.Features.Internal;
 using Microsoft.AspNetCore.Http.Features.Authentication;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.GeneratedCode
@@ -67,7 +66,7 @@ public static string GeneratedFile()
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Server.Kestrel.Http 
+namespace Microsoft.AspNetCore.Server.Kestrel.Http
 {{
     public partial class Frame
     {{{Each(allFeatures, feature => $@"