diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorEngineFeatureBase.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorEngineFeatureBase.cs
index d4186af69f..d19d8ae489 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/RazorEngineFeatureBase.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/RazorEngineFeatureBase.cs
@@ -25,15 +25,15 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
-        protected T GetRequiredFeature<T>() where T : IRazorEngineFeature
+        protected TFeature GetRequiredFeature<TFeature>() where TFeature : IRazorEngineFeature
         {
             if (Engine == null)
             {
                 throw new InvalidOperationException(Resources.FormatFeatureMustBeInitialized(nameof(Engine)));
             }
 
-            var feature = Engine.Features.OfType<T>().FirstOrDefault();
-            ThrowForMissingEngineDependency<T>(feature);
+            var feature = Engine.Features.OfType<TFeature>().FirstOrDefault();
+            ThrowForMissingFeatureDependency<TFeature>(feature);
 
             return feature;
         }
@@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
-        protected void ThrowForMissingEngineDependency<TEngineDependency>(TEngineDependency value)
+        protected void ThrowForMissingFeatureDependency<TEngineDependency>(TEngineDependency value)
         {
             if (value == null)
             {
diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorEnginePhaseBase.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorEnginePhaseBase.cs
index fd87a1a3d1..460e3367d9 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/RazorEnginePhaseBase.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/RazorEnginePhaseBase.cs
@@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
 
             var feature = Engine.Features.OfType<T>().FirstOrDefault();
-            ThrowForMissingEngineDependency<T>(feature);
+            ThrowForMissingFeatureDependency<T>(feature);
 
             return feature;
         }
@@ -65,7 +65,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             }
         }
 
-        protected void ThrowForMissingEngineDependency<TEngineDependency>(TEngineDependency value)
+        protected void ThrowForMissingFeatureDependency<TEngineDependency>(TEngineDependency value)
         {
             if (value == null)
             {